Fix to urlencode