Updated map's overlays
Merged