Filters refactoring.