Final adjustments for map v2 data