SolrQuery code cleanup