Filters

Fixed the filters once and for all, hopefully.