reduce redundant filter & without syntax
Merge pull request #934 from pgilad/patch-1

reduce redundant filter & without syntax