Fix for solr formatting of queries