PIM-1573 : simplify grid, no need to deal with flexible entity case