Refactor filter queries to use cls.model_cls