We have agreed to improve the Organisation Standard's handling of country-related data, but not how. 

The simplest would be to ensure that all relevant data (eg documents) contain a country code.

Alternatively we could create a country section and nest data by country.