In fact, with `encodeURIComponent` above, I'm not sure there is anything to change here at all.