CountryID message improvement