Fixed up issue with grid not updating