Finished rework of basemap selection (subject to final decision later)