refactor remaining filters