Refactor to wrap filter options into query's filter param.