Fix and use the new setting: country. International mapping can now be okay...

Fix and use the new setting: country. International mapping can now be okay and will remove duplicates. We need a little more fix"