PIM-3367 : normalize group type saving and removing