Fixed redirect url issues