Fix the url encoding issue

Here we go, we were encoding everything twice, etc.