Add proper repopulation of groups
Fix incorrect group totals when repopulating from small groups