Avoid losing `locale` in redirects

Closes #453 and #466