Some updates to how url redirection works
merge branch 'develop'