Changes for map search