Support for redirects and simple copy paste fix