diff --git a/backend/src/middleware/hashtags/extractHashtags.js b/backend/src/middleware/hashtags/extractHashtags.js
index 1ccac8be4..dfb993f82 100644
--- a/backend/src/middleware/hashtags/extractHashtags.js
+++ b/backend/src/middleware/hashtags/extractHashtags.js
@@ -8,7 +8,7 @@ import { exec, build } from 'xregexp/xregexp-all.js'
 //    2. If it starts with a digit '0-9' than a unicode character has to follow.
 const regX = build('^/search/hashtag/((\\pL+[\\pL0-9]*)|([0-9]+\\pL+[\\pL0-9]*))$')
 
-export default function(content) {
+export default function (content) {
   if (!content) return []
   const $ = cheerio.load(content)
   // We can not search for class '.hashtag', because the classes are removed at the 'xss' middleware.
@@ -20,8 +20,8 @@ export default function(content) {
     .get()
   const hashtags = []
   urls.forEach(url => {
-    let match
-    if ((match = exec(url, regX)) != null) {
+    const match = exec(url, regX)
+    if (match != null) {
       hashtags.push(match[1])
     }
   })
diff --git a/deployment/legacy-migration/maintenance-worker/migration/neo4j/contributions/contributions.cql b/deployment/legacy-migration/maintenance-worker/migration/neo4j/contributions/contributions.cql
index a4e11c6ec..e3ec9ad44 100644
--- a/deployment/legacy-migration/maintenance-worker/migration/neo4j/contributions/contributions.cql
+++ b/deployment/legacy-migration/maintenance-worker/migration/neo4j/contributions/contributions.cql
@@ -125,7 +125,6 @@
 [ ]   wasSeeded: { type: Boolean }
     }
 */
-
 CALL apoc.load.json("file:${IMPORT_CHUNK_PATH_CQL_FILE}") YIELD value as post
 MERGE (p:Post {id: post._id["$oid"]})
 ON CREATE SET
@@ -148,8 +147,10 @@ MATCH (c:Category {id: categoryId})
 MERGE (p)-[:CATEGORIZED]->(c)
 WITH p, post.tags AS tags
 UNWIND tags AS tag
-WITH apoc.text.replace(tag, '[^\\p{L}0-9]', '') as tagNoSpacesAllowed
-CALL apoc.when(tagNoSpacesAllowed =~ '^((\\p{L}+[\\p{L}0-9]*)|([0-9]+\\p{L}+[\\p{L}0-9]*))$', 'RETURN tagNoSpacesAllowed', '', {tagNoSpacesAllowed: tagNoSpacesAllowed})
+WITH '[^\\p{L}0-9]' as regexMatchAllNonUnicodeOrDigits
+WITH apoc.text.replace(tag, regexMatchAllNonUnicodeOrDigits, '') as tagNoSpacesAllowed
+WITH '^((\\p{L}+[\\p{L}0-9]*)|([0-9]+\\p{L}+[\\p{L}0-9]*))$' as regexHashtagMustNotIncludeOnlyDigits
+CALL apoc.when(tagNoSpacesAllowed =~ regexHashtagMustNotIncludeOnlyDigits, 'RETURN tagNoSpacesAllowed', '', {tagNoSpacesAllowed: tagNoSpacesAllowed})
 YIELD value as validated
 WHERE validated.tagNoSpacesAllowed IS NOT NULL
 MERGE (t:Tag { id: validated.tagNoSpacesAllowed, disabled: false, deleted: false })
diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index 09f2a985a..4d51ebefb 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -215,8 +215,7 @@ export default {
     },
     sanitizeQuery(query) {
       if (this.suggestionType === HASHTAG) {
-        // remove all unallowed chars
-        const regX = build('[^\\pL0-9]')
+        const regexMatchAllNonUnicodeOrDigits = build('[^\\pL0-9]')
         query = replace(query, regX, '', 'all')
         // if the query is only made of digits, make it empty
         return query.replace(/[0-9]/gm, '') === '' ? '' : query