A touch of clean up
Tweak search mapping