Tweaks to searcheditor
Escape the calsses
Merge pull request #57 from Camwyn/4216-searcheditor

Tweaks to searcheditor