Fix grouping on reports and add chart