Some updates to how url redirection works