Fixes grouping
Fixes double appearing events