Add city and country to cmtg