Filter refactoring started