Added check to convert under_score include/exclude params to camelCase + bug fix