redirection Handler fixes