PIM-3364 : normalize group type and group handlers