Revert "replace uri_encode with uri_escape"

This reverts commit ce5396f4eac523f6c047bc47a1109aa869c26f34.