Issues with default filtering resolved.
Merge pull request #695 from ssushma/dev-branch

Issues with default filtering resolved.