Move the query into SearchQueryBuilder