Updated column names in aggregates query for consistency with cognicity-schema