changed mapping of country code to uppercase