diff --git a/webapp/CHANGELOG.md b/webapp/CHANGELOG.md
index 921ef72..8e603ba 100644
--- a/webapp/CHANGELOG.md
+++ b/webapp/CHANGELOG.md
@@ -2,11 +2,12 @@
 
 ## [2022-08-16]
 
-- fix: 🐛 Fix highlights not rendering correctly when mixed with other formatting.
+- fix: 🐛 Fix highlights not rendering correctly when mixed with other  formatting. ([issue #19](https://github.com/mcndt/noteshare.space/issues/19))
+- fix: 🐛 Fix some characters escaping the rendering for #tags. ([issue #10](https://github.com/mcndt/noteshare.space/issues/10))
 
 ## [2022-08-11]
 
-- feat: ✨ Users receive a unique error page when opening expired notes vs. wrong URL. 
+- feat: ✨ Users receive a unique error page when opening expired notes vs. wrong URL. ([issue #11](https://github.com/mcndt/noteshare.space/issues/11))
 
 ## [2022-08-07]
 
diff --git a/webapp/src/lib/marked/extensions.ts b/webapp/src/lib/marked/extensions.ts
index bd8ac31..6b3a792 100644
--- a/webapp/src/lib/marked/extensions.ts
+++ b/webapp/src/lib/marked/extensions.ts
@@ -43,7 +43,7 @@ const TagExtension = {
 		return src.match(/#/)?.index;
 	},
 	tokenizer(src: string) {
-		const match = src.match(/^#([\w/]+)[\W\s]/);
+		const match = src.match(/^#([0-9A-Za-zÀ-ÖØ-öø-ÿ/_-]+)[\s\n]?/);
 		if (match) {
 			return {
 				type: 'tag',