Geomap enhancements

This is a cleanup of #5535