Fix and rationalise the country/state count
Bug fix on text when switching between views