Filter changes
Merged changes for filter