Fixed batch request builder (broken since last refactoring)