reduce redundant filter & without syntax
Merge pull request #938 from pgilad/patch-4

reduce redundant filter & without syntax