PIM-1845 : optimize the grid to link group to product