Removed waiting in name2struc. Replaced with retry.
Added group_correct