Re-fix overly broad cluster, events need to be sorted correctly