Removing urlencode/decode to put in a separate pr