small filter updates
Merge pull request #293 from shutter111/master

Fixed filter error. Many other small updates