Refactored filters, but they're not quite working yet