Fixed Batch/Subscription + Batch/Bulk uri generation.