Filter refactoring.