diff --git a/DSL/Resql/analytics/POST/chat-count-with-csa-and-chatbot.sql b/DSL/Resql/analytics/POST/chat-count-with-csa-and-chatbot.sql
index 9b8802b6..31e34c4a 100644
--- a/DSL/Resql/analytics/POST/chat-count-with-csa-and-chatbot.sql
+++ b/DSL/Resql/analytics/POST/chat-count-with-csa-and-chatbot.sql
@@ -46,7 +46,7 @@ csa_ids AS (
   AND EXISTS (
     SELECT 1 FROM message m
     WHERE m.chat_base_id = b.base_id
-      AND m.event = 'taken-over' or m.event = 'pending-assigned'
+      AND (m.event = 'taken-over' or m.event = 'pending-assigned' or m.event = 'forwarded_to_backoffice')
   )
   AND (
     :showTest = TRUE
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 870121d3..ffb12ea9 100644
--- a/DSL/Resql/analytics/POST/feedback-chats-with-negative-feedback.sql
+++ b/DSL/Resql/analytics/POST/feedback-chats-with-negative-feedback.sql
@@ -28,7 +28,7 @@ n_chats AS (
       AND created::timestamptz BETWEEN :start::timestamptz AND :end::timestamptz
       AND CASE 
           WHEN (SELECT COALESCE(is_five_rating_scale, 'false') = 'true' FROM rating_config) 
-          THEN feedback_rating_five IS NOT NULL AND feedback_rating_five <= 5
+          THEN feedback_rating_five IS NOT NULL AND feedback_rating_five <= 3
           ELSE feedback_rating IS NOT NULL AND feedback_rating <= 5
       END
     GROUP BY base_id