misc map-overlay improvements