SWAR hierarchy fixing for group/groups