Search fixes

Corrected issue where certain characters would cause searches to fail.