[fix] county -> country
[fix] ensure the phone number is carried over