Fix bug with grouping by country

This update fixes a bug in the KPI route where we grouped incorrectly on country breakdowns.