#10: Fixed the bug with reloading of grid, improved performance for larger data sets