Move to using stream from batchQuery.