refactored the filters