Improved map selection