JK: Fixing the calendar grouping logic.