Simplified and removed complete reset of map when map type is changed