Further group update edge case handling