Fix search highlighting
Rename search objects to revert to old search