try to fix hierarchy grouping, again