Improve country parsing, as data quality on Hubject is low...