add city and country extraction