diff --git a/src/public/javascripts/services/utils.js b/src/public/javascripts/services/utils.js
index 4436232df..7e9beb642 100644
--- a/src/public/javascripts/services/utils.js
+++ b/src/public/javascripts/services/utils.js
@@ -77,7 +77,7 @@ async function stopWatch(what, func) {
 }
 
 function formatValueWithWhitespace(val) {
-    return /[^\w_-]/.test(val) ? '"' + val + '"' : val;
+    return /[^\p{L}_-]/u.test(val) ? '"' + val + '"' : val;
 }
 
 function formatLabel(label) {
diff --git a/src/services/parse_filters.js b/src/services/parse_filters.js
index ea2a142f4..0625e4b8a 100644
--- a/src/services/parse_filters.js
+++ b/src/services/parse_filters.js
@@ -1,6 +1,6 @@
 const dayjs = require("dayjs");
 
-const filterRegex = /(\b(AND|OR)\s+)?@(!?)([\w_]+|"[^"]+")\s*((=|!=|<|<=|>|>=|!?\*=|!?=\*|!?\*=\*)\s*([\w_/-]+|"[^"]+"))?/ig;
+const filterRegex = /(\b(AND|OR)\s+)?@(!?)([\p{L}_]+|"[^"]+")\s*((=|!=|<|<=|>|>=|!?\*=|!?=\*|!?\*=\*)\s*([\p{L}_/-]+|"[^"]+"))?/igu;
 const smartValueRegex = /^(NOW|TODAY|WEEK|MONTH|YEAR) *([+\-] *\d+)?$/i;
 
 function calculateSmartValue(v) {