reverted change to solrquery service and added some more