fix grouping by week