FilterHelper refactoring