Total filters refactoring