*8787* Initial backport
*8872* Fix editor searching with clean titles