Move the query creation to the Search model from the DataCatalogView