Fix batch request and request builder