Fix global aggregation type
Use correct aggregation key