fixed country null and city null