Fix broken drag&drop groups