Tweak to make redirects, form action work as intended