Switch over to aggregating by iso code