Improved map switching and current map detection