PIM-2906: Fix history grids for ODM support