Next redirect is now working.
Need to clean up these changes