Fix bugs: country name upper case