fixed grouping for week, month, year