Geomap: fix legend issues (2669, 2671)