add redirect handling

[#63744816]