fix country code vs name usage, close #38