Use EscapeUriString() for URL escape instead of EscapeHtml.

before: 14 tests failed, after: 9 tests failed.