[WIP] Refactored data grid for new query builder