Fixed Filters

Filters now work, but interface needs to be improved.