Issues/741 map search changes

Closes #741