diff --git a/backend/requirements.txt b/backend/requirements.txt
index e03836c..5e11b05 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -11,7 +11,7 @@ idna==3.10
 itsdangerous==2.2.0
 Jinja2==3.1.5
 MarkupSafe==3.0.2
-psycopg2==2.9.10
+psycopg2-binary==2.9.10
 pycparser==2.22
 PyJWT==2.10.1
 python-dotenv==1.0.1
diff --git a/front-end/components/bloom.mjs b/front-end/components/bloom.mjs
index 0b4166c..8a75cc3 100644
--- a/front-end/components/bloom.mjs
+++ b/front-end/components/bloom.mjs
@@ -37,7 +37,7 @@ const createBloom = (template, bloom) => {
 function _formatHashtags(text) {
   if (!text) return text;
   return text.replace(
-    /\B#[^#]+/g,
+    /(^|\s)(#[\w]+)/g,
     (match) => `<a href="/hashtag/${match.slice(1)}">${match}</a>`
   );
 }