Changing country fields to picklists