PIM-1323 : Add group types to the query