Improve request generation and viewing [PD-897]

All tests pass.
We use it for OfflinePurchase as well