Fixing filter types.
Merge pull request #1 from cwilso/master

Fixing filter types to new style.