Redirect_link refactoring