Make map selection work