fixes #158

This allows the filters to work.

The way I am splitting things out again isn't the cleanest.
If you have a better suggestion on how to do this please say so.