diff --git a/mwdb/web/src/commons/helpers/renderTokens.tsx b/mwdb/web/src/commons/helpers/renderTokens.tsx
index df01c124f..199e4a526 100644
--- a/mwdb/web/src/commons/helpers/renderTokens.tsx
+++ b/mwdb/web/src/commons/helpers/renderTokens.tsx
@@ -92,7 +92,10 @@ export function renderTokens(tokens: Token[], options?: Option): any {
             if (token.href && token.href.startsWith("search#")) {
                 const query = token.href.slice("search#".length);
                 const search =
-                    "?" + new URLSearchParams({ q: query }).toString();
+                    "?" +
+                    new URLSearchParams({
+                        q: decodeURIComponent(query),
+                    }).toString();
                 return (
                     <Link
                         key={uniqueId()}
diff --git a/mwdb/web/src/components/RichAttribute/MarkedMustache.tsx b/mwdb/web/src/components/RichAttribute/MarkedMustache.tsx
index 5af5aeec0..d8da0e8ee 100644
--- a/mwdb/web/src/components/RichAttribute/MarkedMustache.tsx
+++ b/mwdb/web/src/components/RichAttribute/MarkedMustache.tsx
@@ -64,7 +64,7 @@ class SearchReference {
 
     toMarkdown() {
         return `[${escapeMarkdown(this.value)}](search#${escapeMarkdown(
-            this.query
+            encodeURIComponent(this.query)
         )})`;
     }
 }
@@ -218,5 +218,6 @@ export function renderValue(template: string, value: Object, options: Option) {
         ...marked.defaults,
         tokenizer: markedTokenizer,
     }) as Token[];
+    console.log(tokens);
     return <div>{renderTokens(tokens, options)}</div>;
 }