Handle underscores more sanely on redirects
Add test