Improve redirected from behavior.