Multiple map controls and layers fixes.