Re-amp filtering and split up Filterer from SQLA
Actually needs to set the query