sanitise search string in validator to prevent solr errors.
Merge remote-tracking branch 'origin/master'