Fix issues with grouped events.