Fix duplicate groups showing but without name
Merge branch 'pr/n4_fadillzzz'