Improved logic for country and company not available for all data sources.