map switch enhancements