improve detection of country codes within the national number