diff --git a/DSL/Resql/analytics/POST/feedback-avg-feedback-to-buerokratt-chats.sql b/DSL/Resql/analytics/POST/feedback-avg-feedback-to-buerokratt-chats.sql
index 1c3314dd..ada57370 100644
--- a/DSL/Resql/analytics/POST/feedback-avg-feedback-to-buerokratt-chats.sql
+++ b/DSL/Resql/analytics/POST/feedback-avg-feedback-to-buerokratt-chats.sql
@@ -2,7 +2,8 @@ WITH rating_config AS (
     SELECT value AS is_five_rating_scale
     FROM configuration
     WHERE key = 'isFiveRatingScale'
-      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
+      AND "domain" IS NULL
+      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
       AND NOT deleted
 )
 SELECT date_trunc(:metric, ended) AS date_time,
diff --git a/DSL/Resql/analytics/POST/feedback-buerokratt-chats-nps.sql b/DSL/Resql/analytics/POST/feedback-buerokratt-chats-nps.sql
index 4ea49384..68eb18e4 100644
--- a/DSL/Resql/analytics/POST/feedback-buerokratt-chats-nps.sql
+++ b/DSL/Resql/analytics/POST/feedback-buerokratt-chats-nps.sql
@@ -2,7 +2,8 @@ WITH rating_config AS (
     SELECT value AS is_five_rating_scale
     FROM configuration
     WHERE key = 'isFiveRatingScale'
-      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
+      AND "domain" IS NULL
+      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
       AND NOT deleted
 ),
 chat_buerokratt AS (
diff --git a/DSL/Resql/analytics/POST/feedback-chats-distribution.sql b/DSL/Resql/analytics/POST/feedback-chats-distribution.sql
index 678e14a3..142f7e3f 100644
--- a/DSL/Resql/analytics/POST/feedback-chats-distribution.sql
+++ b/DSL/Resql/analytics/POST/feedback-chats-distribution.sql
@@ -2,7 +2,8 @@ WITH rating_config AS (
     SELECT value AS is_five_rating_scale
     FROM configuration
     WHERE key = 'isFiveRatingScale'
-      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
+      AND "domain" IS NULL
+      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
       AND NOT deleted
 ),
 chats_filtered AS (
diff --git a/DSL/Resql/analytics/POST/feedback-chats-with-negative-feedback.sql b/DSL/Resql/analytics/POST/feedback-chats-with-negative-feedback.sql
index ffb12ea9..b52ceb22 100644
--- a/DSL/Resql/analytics/POST/feedback-chats-with-negative-feedback.sql
+++ b/DSL/Resql/analytics/POST/feedback-chats-with-negative-feedback.sql
@@ -2,7 +2,8 @@ WITH rating_config AS (
     SELECT value AS is_five_rating_scale
     FROM configuration
     WHERE key = 'isFiveRatingScale'
-      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
+      AND "domain" IS NULL
+      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
       AND NOT deleted
 ),
 MaxChatHistoryComments AS (
diff --git a/DSL/Resql/analytics/POST/feedback-csa-chats-feedback-nps.sql b/DSL/Resql/analytics/POST/feedback-csa-chats-feedback-nps.sql
index 380270f6..1ec3bff5 100644
--- a/DSL/Resql/analytics/POST/feedback-csa-chats-feedback-nps.sql
+++ b/DSL/Resql/analytics/POST/feedback-csa-chats-feedback-nps.sql
@@ -2,7 +2,8 @@ WITH rating_config AS (
     SELECT value AS is_five_rating_scale
     FROM configuration
     WHERE key = 'isFiveRatingScale'
-      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
+      AND "domain" IS NULL
+      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
       AND NOT deleted
 ),
 chat_csas AS (
diff --git a/DSL/Resql/analytics/POST/feedback-selected-csa-feedback-nps.sql b/DSL/Resql/analytics/POST/feedback-selected-csa-feedback-nps.sql
index 501f6e92..2fa9ae55 100644
--- a/DSL/Resql/analytics/POST/feedback-selected-csa-feedback-nps.sql
+++ b/DSL/Resql/analytics/POST/feedback-selected-csa-feedback-nps.sql
@@ -2,7 +2,8 @@ WITH rating_config AS (
     SELECT value AS is_five_rating_scale
     FROM configuration
     WHERE key = 'isFiveRatingScale'
-      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
+      AND "domain" IS NULL
+      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
       AND NOT deleted
 ),
 ranked_chats AS (
diff --git a/DSL/Resql/analytics/POST/get-chat-by-id.sql b/DSL/Resql/analytics/POST/get-chat-by-id.sql
index 0b64b158..5d247bbb 100644
--- a/DSL/Resql/analytics/POST/get-chat-by-id.sql
+++ b/DSL/Resql/analytics/POST/get-chat-by-id.sql
@@ -2,7 +2,8 @@ WITH rating_config AS (
     SELECT value AS is_five_rating_scale
     FROM configuration
     WHERE key = 'isFiveRatingScale'
-      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
+      AND "domain" IS NULL
+      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
       AND NOT deleted
 ),
 MaxChatHistoryComments AS (
diff --git a/DSL/Resql/analytics/POST/get-cs-all-ended-chats.sql b/DSL/Resql/analytics/POST/get-cs-all-ended-chats.sql
index 95ae4cd0..633d4187 100644
--- a/DSL/Resql/analytics/POST/get-cs-all-ended-chats.sql
+++ b/DSL/Resql/analytics/POST/get-cs-all-ended-chats.sql
@@ -2,7 +2,8 @@ WITH rating_config AS (
     SELECT value AS is_five_rating_scale
     FROM configuration
     WHERE key = 'isFiveRatingScale'
-      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
+      AND "domain" IS NULL
+      AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
       AND NOT deleted
 ),
 MaxChatHistoryComments AS (
@@ -93,7 +94,7 @@ MaxChats AS (
       AND c.ended::timestamptz BETWEEN :start::timestamptz AND :end::timestamptz
       AND CASE 
           WHEN (SELECT COALESCE(is_five_rating_scale, 'false') = 'true' FROM rating_config) 
-          THEN c.feedback_rating_five IS NOT NULL AND c.feedback_rating_five <= 5
+          THEN c.feedback_rating_five IS NOT NULL AND c.feedback_rating_five <= 3
           ELSE c.feedback_rating IS NOT NULL AND c.feedback_rating <= 5
       END
     GROUP BY base_id
diff --git a/DSL/Resql/analytics/POST/overview-total-chats-no-csa.sql b/DSL/Resql/analytics/POST/overview-total-chats-no-csa.sql
index c9f10c9a..f1f5792f 100644
--- a/DSL/Resql/analytics/POST/overview-total-chats-no-csa.sql
+++ b/DSL/Resql/analytics/POST/overview-total-chats-no-csa.sql
@@ -17,12 +17,6 @@ WHERE EXISTS (
     WHERE message.chat_base_id = c.base_id
   AND message.author_role = 'backoffice-user'
     )
-  AND EXISTS (
-    SELECT 1
-    FROM message
-    WHERE message.chat_base_id = c.base_id
-  AND message.author_role = 'buerokratt'
-    )
   AND (c.ended AT TIME ZONE :timezone) >= date_trunc(
     :group_period,
     (current_date AT TIME ZONE :timezone - concat('1 ', :group_period)::INTERVAL)
diff --git a/GUI/src/i18n/en/common.json b/GUI/src/i18n/en/common.json
index 876103d9..b8de1a5b 100644
--- a/GUI/src/i18n/en/common.json
+++ b/GUI/src/i18n/en/common.json
@@ -380,7 +380,8 @@
       "rating": "Rating",
       "feedback": "Feedback",
       "chosenCsa": "Chosen csa(s)",
-      "chosenColumn": "Chosen column(s)"
+      "chosenColumn": "Chosen column(s)",
+      "statusAddedDate": "Status added date"
     },
     "plainEvents": {
       "answered": "Answered",
diff --git a/GUI/src/i18n/et/common.json b/GUI/src/i18n/et/common.json
index 73be57aa..c91dee8f 100644
--- a/GUI/src/i18n/et/common.json
+++ b/GUI/src/i18n/et/common.json
@@ -418,7 +418,8 @@
       "rating": "Hinnang",
       "chosenCsa": "Valitud nõustaja(d)",
       "chosenColumn": "Valitud tulba(d)",
-      "feedback": "Tagasiside"
+      "feedback": "Tagasiside",
+      "statusAddedDate": "Staatuse lisamise kuupäev"
     },
     "plainEvents": {
       "answered": "Vastatud",