Alter form to make single value fields for country refs #2321