added map-switch-control