Update country name for China, sort answers properly