refs #1965 - Updated fields field_country and field_region