Refactor from  to solr_query