added country code to phone; city first