RequestBuilder tested and fixed