Fix map selection order