Add a temporal fix to retrieve country using iso code instead of country name.
This fix should be extended in the future to replace the countries name with this code in dictionnaries