Allow map selection and improve natural sort.