restore missing filter functionality, add more tests
3.0.2