added more safety to aggregator and fixed actor country code index