Conditionalize the query filters to avoid extra function calls.
Merge pull request #63 from fedora-infra/feature/conditionalize-query-filters

Conditionalize the query filters to avoid extra function calls.