Filters refactor shared