fixes for map suggestion