#36: Fix escaping of keywords before sending them to solr