Buckets/BatchQuery to Buckets/Items/BatchQuery