add support for QueryOptions/batchSize