Upgrade MapDataInput to use PopupSelection instead of string fields