Review and refactor filters