diff --git a/Cargo.lock b/Cargo.lock
index 6a24bb6..5efe92b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -382,6 +382,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "html-escape"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476"
+dependencies = [
+ "utf8-width",
+]
+
 [[package]]
 name = "http"
 version = "0.2.7"
@@ -1116,12 +1125,24 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9"
+
 [[package]]
 name = "utf-8"
 version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf8-width"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -1196,6 +1217,7 @@ dependencies = [
  "custom_error",
  "env_logger",
  "futures",
+ "html-escape",
  "http",
  "hyper",
  "log",
@@ -1203,6 +1225,7 @@ dependencies = [
  "pin-project",
  "tokio",
  "tokio-util 0.7.2",
+ "urlencoding",
  "warp",
  "weak-table",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 2789dbd..319ec3f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,11 +12,13 @@ custom_error = "^1.7"
 env_logger = "^0.9"
 futures = "^0.3"
 http = "^0.2"
+html-escape = "0.2.13"
 hyper = "^0.14"
 log = "^0.4.8"
 matches = "^0.1"
 pin-project = "1"
 tokio = { version="^1.18", features = ["io-std", "macros", "net", "rt", "rt-multi-thread", "time"] }
 tokio-util = { version="^0.7", features=["codec"] }
+urlencoding = "2.1.2"
 warp = "^0.3"
 weak-table = "^0.3"