Fixed filters
Merge pull request #95 from ateich/master

Fixed filters