Improved use of grids in choOrgData.