Add state and country to zip code