fixes to inconsistent behaviour on country

Change-Id: Ic44ce1211c639fefba9108584e613d353e8a8f93