Add aggregation by categories
Fix bug