Improve support for grid with fixed columns