Fix/4115 broken redirects