Story 48192365: refactoring filters