added url encode
Finish urlencode-fix