misc fix
Fixed logic to search editor
Merge branch 'misc'