Fix empty batches/queries in `batch.add()`