Bit of optimizing
Merge pull request #1295 from diizy/filters

Bit of optimizing