More filter optimizations
Oops
Oops again
Oops #3...
Merge pull request #1302 from diizy/master

More filter stuff