Correctly format shipping addresses in checkout step (#1278)