Fixed Label + Popup Issue for Map.

Fixed Label + Popup Issue for Map.