Refactored Solr search to take a query object to encapsulate all options