More filter refactoring