DIR-97 Fix redirect issues.