-various mapsearch related changes