Refactor the filters