returnUrl fixing