Fixed Map Bug

If we have data, use the country name from the data; otherwise, default to the names supplied by the map.