Add DataQuery and replace getting via String.
Remove unecessary override in ChunkIterator.