Make filtering work.
Merge pull request #53 from johnb30/mods

Make filtering work.