PIM-2906: Fix history grids
PIM-2902: Fix import/export grids