diff --git a/api/chalicelib/core/funnels.py b/api/chalicelib/core/funnels.py
index b9db6c631..c33bed586 100644
--- a/api/chalicelib/core/funnels.py
+++ b/api/chalicelib/core/funnels.py
@@ -103,6 +103,7 @@ def get_by_user(project_id, user_id, range_value=None, start_date=None, end_date
                                              project_id=project_id, user_id=None, count_only=True)
                 row["sessionsCount"] = counts["countSessions"]
                 row["usersCount"] = counts["countUsers"]
+                filter_clone = dict(row["filter"])
                 overview = significance.get_overview(filter_d=row["filter"], project_id=project_id)
                 row["stages"] = overview["stages"]
                 row.pop("filter")
@@ -111,7 +112,7 @@ def get_by_user(project_id, user_id, range_value=None, start_date=None, end_date
                 row["criticalIssuesCount"] = overview["criticalIssuesCount"]
                 row["missedConversions"] = 0 if len(row["stages"]) < 2 \
                     else row["stages"][0]["sessionsCount"] - row["stages"][-1]["sessionsCount"]
-                row["filter"] = helper.old_search_payload_to_flat(row["filter"])
+                row["filter"] = helper.old_search_payload_to_flat(filter_clone)
     return rows
 
 
diff --git a/api/chalicelib/core/significance.py b/api/chalicelib/core/significance.py
index d81378ddb..f2261ce59 100644
--- a/api/chalicelib/core/significance.py
+++ b/api/chalicelib/core/significance.py
@@ -2,7 +2,7 @@ __author__ = "AZNAUROV David"
 __maintainer__ = "KRAIEM Taha Yassine"
 
 import schemas
-from chalicelib.core import events, sessions_metas, metadata, sessions
+from chalicelib.core import events, metadata, sessions
 from chalicelib.utils import dev
 
 """
@@ -617,6 +617,15 @@ def get_overview(filter_d, project_id, first_stage=None, last_stage=None):
     # The result of the multi-stage query
     rows = get_stages_and_events(filter_d=filter_d, project_id=project_id)
     if len(rows) == 0:
+        # PS: not sure what to return if rows are empty
+        output["stages"] = [{
+            "type": stages[0]["type"],
+            "value": stages[0]["value"],
+            "sessionsCount": None,
+            "dropPercentage": None,
+            "usersCount": None
+        }]
+        output['criticalIssuesCount'] = 0
         return output
     # Obtain the first part of the output
     stages_list = get_stages(stages, rows)