added grouping for calendars