Change the way order review data is appended to checkout to reduce likelihood of error

Fixes #5332