Add batchsize option to query