Fix bug related to country map name vs state name