reduce redundant filter & without syntax
Merge pull request #937 from pgilad/patch-3

reduce redundant filter & without syntax