Should this have `encodeURIComponent` also?