Fixed back navigation bug on CountrySelect