Make filters more DRY
Merge pull request #2 from molenzwiebel/master

Make filters more DRY
Merge remote-tracking branch 'upstream/master'