[Tom/Remo] [unicef_ejrf/#528] now reordering after deleting empty groups