refactoring data filters