Fix ordering of SOLR query parameters