Group generation now doesn't contain empty teams