Fixed a grouping bug in scheduled > upcoming