repair SOLR raw and hl queries.