geomap fix from denis and related changes