update returnUrl to match new url structure