made some filter refactorings