diff --git a/api/chalicelib/core/heatmaps.py b/api/chalicelib/core/heatmaps.py
index 58eabb3394..5885e57132 100644
--- a/api/chalicelib/core/heatmaps.py
+++ b/api/chalicelib/core/heatmaps.py
@@ -213,7 +213,7 @@ def search_short_session(data: schemas.HeatMapSessionsSearch, project_id, user_i
             elif _depth == 0 and len(session['domURL']) == 0 and len(session['mobsUrl']) == 0:
                 logger.info("couldn't find an existing replay after 3 iterations for heatmap")
 
-        session['events'] = get_page_events(session_id=session["session_id"])
+        session['events'] = get_page_events(session_id=session["session_id"], project_id=project_id)
     else:
         logger.debug("No session found for heatmap")
 
@@ -236,18 +236,19 @@ def get_selected_session(project_id, session_id):
             raise err
 
         session = cur.fetchone()
+
     if session:
         session['domURL'] = sessions_mobs.get_urls(session_id=session["session_id"], project_id=project_id)
         session['mobsUrl'] = sessions_mobs.get_urls_depercated(session_id=session["session_id"])
         if len(session['domURL']) == 0 and len(session['mobsUrl']) == 0:
             session["_issue"] = "mob file not found"
             logger.info("can't find selected mob file for heatmap")
-        session['events'] = get_page_events(session_id=session["session_id"])
+        session['events'] = get_page_events(session_id=session["session_id"], project_id=project_id)
 
     return helper.dict_to_camel_case(session)
 
 
-def get_page_events(session_id):
+def get_page_events(session_id, project_id):
     with pg_client.PostgresClient() as cur:
         cur.execute(cur.mogrify("""\
                 SELECT 
@@ -255,7 +256,6 @@ def get_page_events(session_id):
                     timestamp,
                     host,
                     path,
-                    query,
                     path AS value,
                     path AS url,
                     'LOCATION' AS type
diff --git a/ee/api/chalicelib/core/heatmaps.py b/ee/api/chalicelib/core/heatmaps.py
index f57273ec69..6f84c2f119 100644
--- a/ee/api/chalicelib/core/heatmaps.py
+++ b/ee/api/chalicelib/core/heatmaps.py
@@ -229,7 +229,7 @@ def search_short_session(data: schemas.HeatMapSessionsSearch, project_id, user_i
                 elif _depth == 0 and len(session['domURL']) == 0 and len(session['mobsUrl']) == 0:
                     logger.info("couldn't find an existing replay after 3 iterations for heatmap")
 
-            session['events'] = get_page_events(session_id=session["session_id"])
+            session['events'] = get_page_events(session_id=session["session_id"], project_id=project_id)
         else:
             logger.debug("No session found for heatmap")
 
@@ -258,12 +258,12 @@ def get_selected_session(project_id, session_id):
             if len(session['domURL']) == 0 and len(session['mobsUrl']) == 0:
                 session["_issue"] = "mob file not found"
                 logger.info("can't find selected mob file for heatmap")
-            session['events'] = get_page_events(session_id=session["session_id"])
+            session['events'] = get_page_events(session_id=session["session_id"], project_id=project_id)
 
         return helper.dict_to_camel_case(session)
 
 
-    def get_page_events(session_id):
+    def get_page_events(session_id, project_id):
         with pg_client.PostgresClient() as cur:
             cur.execute(cur.mogrify("""\
                     SELECT 
@@ -271,7 +271,6 @@ def get_page_events(session_id):
                         timestamp,
                         host,
                         path
-                        query,
                         path AS value,
                         path AS url,
                         'LOCATION' AS type
@@ -384,31 +383,35 @@ def get_selected_session(project_id, session_id):
                 raise err
         if len(session) > 0:
             session = session[0]
+        else:
+            session = None
+
         if session:
             session['domURL'] = sessions_mobs.get_urls(session_id=session["session_id"], project_id=project_id)
             session['mobsUrl'] = sessions_mobs.get_urls_depercated(session_id=session["session_id"])
             if len(session['domURL']) == 0 and len(session['mobsUrl']) == 0:
                 session["_issue"] = "mob file not found"
                 logger.info("can't find selected mob file for heatmap")
-            session['events'] = get_page_events(session_id=session["session_id"])
+            session['events'] = get_page_events(session_id=session["session_id"], project_id=project_id)
 
         return helper.dict_to_camel_case(session)
 
 
-    def get_page_events(session_id):
+    def get_page_events(session_id, project_id):
         with ch_client.ClickHouseClient() as cur:
             rows = cur.execute("""\
                     SELECT 
                         message_id,
-                        timestamp,
-                        host,
-                        path,
-                        query,
-                        path AS value,
-                        path AS url,
+                        toUnixTimestamp(datetime)*1000 AS timestamp,
+                        url_host AS host,
+                        url_path AS path,
+                        url_path AS value,
+                        url_path AS url,
                         'LOCATION' AS type
                     FROM experimental.events
-                    WHERE session_id = %(session_id)s AS event_type='LOCATION'
-                    ORDER BY timestamp,message_id;""", {"session_id": session_id})
+                    WHERE session_id = %(session_id)s 
+                        AND event_type='LOCATION'
+                        AND project_id= %(project_id)s
+                    ORDER BY datetime,message_id;""", {"session_id": session_id,"project_id": project_id})
             rows = helper.list_to_camel_case(rows)
         return rows