diff --git a/website/static/js/jquery.atwho.js b/website/static/js/jquery.atwho.js
index 6e8c261de..cb21f1034 100644
--- a/website/static/js/jquery.atwho.js
+++ b/website/static/js/jquery.atwho.js
@@ -50,7 +50,7 @@
             _a = decodeURI("%C3%80");
             _y = decodeURI("%C3%BF");
             space = acceptSpaceBar ? "\ " : "";
-            regexp = new RegExp(flag + "([A-Za-z" + _a + "-" + _y + "0-9_" + space + '\'\.\+\-]*)$|' + flag + "([^\\x00-\\xff]*)$", 'gi');
+            regexp = new RegExp(flag + "([A-Za-z" + _a + "\\-" + _y + "0-9_" + space + '\'\.\+\\-]*)$|' + flag + "([^\\x00-\\xff]*)$", 'gi');
             match = regexp.exec(subtext);
             if (match) {
                 return match[2] || match[1];
diff --git a/website/templates/report.html b/website/templates/report.html
index 65a5c6d6d..8ca55810e 100644
--- a/website/templates/report.html
+++ b/website/templates/report.html
@@ -414,7 +414,7 @@ <h2 class="text-2xl font-semibold leading-7 text-gray-900">
         $(".duplicates").click(async () => {
             var uri = $("input[name='url']").val();
 
-            $("#view_all").attr("href", `/search/?query=${uri}`);
+            $("#view_all").attr("href", `/search/?query=${encodeURIComponent(uri)}`);
 
             let resp = await fetch("/api/v1/urlcheck/", {
                 method: "POST",