filters refactoring