Filter improvements
Merge pull request #1020 from andrerod/dev

Improve filter support
Merge remote-tracking branch 'upstream/dev' into dev