rejig the filter service to simplify again