Bug fixes and simplification of request creation logic. [fixes #47367065]