add no-redirect support