- finish query grid implementation