diff --git a/api/chalicelib/core/saved_search.py b/api/chalicelib/core/saved_search.py
index d1e8fe15f..1999c6758 100644
--- a/api/chalicelib/core/saved_search.py
+++ b/api/chalicelib/core/saved_search.py
@@ -49,16 +49,6 @@ def update(search_id, project_id, user_id, data: schemas.SavedSearchSchema):
 
 def get_all(project_id, user_id, details=False):
     with pg_client.PostgresClient() as cur:
-        print(cur.mogrify(
-            f"""\
-                SELECT search_id, project_id, user_id, name, created_at, deleted_at, is_public
-                    {",filter" if details else ""}
-                FROM public.searches
-                WHERE project_id = %(project_id)s
-                  AND deleted_at IS NULL
-                  AND (user_id = %(user_id)s OR is_public);""",
-            {"project_id": project_id, "user_id": user_id}
-        ))
         cur.execute(
             cur.mogrify(
                 f"""\
diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py
index a582531aa..f1add5dfe 100644
--- a/api/chalicelib/core/sessions.py
+++ b/api/chalicelib/core/sessions.py
@@ -7,7 +7,6 @@ SESSION_PROJECTION_COLS = """s.project_id,
 s.session_id::text AS session_id,
 s.user_uuid,
 s.user_id,
--- s.user_agent,
 s.user_os,
 s.user_browser,
 s.user_device,
@@ -199,7 +198,7 @@ def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, f
                                                  ROW_NUMBER() OVER (ORDER BY count(full_sessions) DESC) AS rn
                                             FROM (SELECT *, ROW_NUMBER() OVER (PARTITION BY user_id ORDER BY start_ts DESC) AS rn 
                                             FROM (SELECT DISTINCT ON(s.session_id) {SESSION_PROJECTION_COLS}, 
-                                                                {",".join([f'metadata_{m["index"]} AS {m["key"]}' for m in meta_keys])}
+                                                                {",".join([f'metadata_{m["index"]}' for m in meta_keys])}
                                             {query_part}
                                             ORDER BY s.session_id desc) AS filtred_sessions
                                             ORDER BY favorite DESC, issue_score DESC, {sort} {data.order}) AS full_sessions
@@ -211,7 +210,7 @@ def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, f
             main_query = cur.mogrify(f"""SELECT COUNT(full_sessions) AS count, COALESCE(JSONB_AGG(full_sessions) FILTER (WHERE rn <= 200), '[]'::JSONB) AS sessions
                                             FROM (SELECT *, ROW_NUMBER() OVER (ORDER BY favorite DESC, issue_score DESC, session_id desc, start_ts desc) AS rn
                                             FROM (SELECT DISTINCT ON(s.session_id) {SESSION_PROJECTION_COLS},
-                                                                {",".join([f'metadata_{m["index"]} AS {m["key"]}' for m in meta_keys])}
+                                                                {",".join([f'metadata_{m["index"]}' for m in meta_keys])}
                                             {query_part}
                                             ORDER BY s.session_id desc) AS filtred_sessions
                                             ORDER BY favorite DESC, issue_score DESC, {sort} {data.order}) AS full_sessions;""",
@@ -250,10 +249,10 @@ def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, f
         for i, s in enumerate(sessions):
             sessions[i] = {**s.pop("last_session")[0], **s}
             sessions[i].pop("rn")
-            sessions[i]["metadata"] = {k["key"]: sessions[i][k["key"]] for k in meta_keys}
+            sessions[i]["metadata"] = {k["key"]: sessions[i][f'metadata_{k["index"]}'] for k in meta_keys}
     else:
         for i, s in enumerate(sessions):
-            sessions[i]["metadata"] = {k["key"]: sessions[i][k["key"]] for k in meta_keys}
+            sessions[i]["metadata"] = {k["key"]: sessions[i][f'metadata_{k["index"]}'] for k in meta_keys}
     if not data.group_by_user and data.sort is not None and data.sort != "session_id":
         sessions = sorted(sessions, key=lambda s: s[helper.key_to_snake_case(data.sort)],
                           reverse=data.order.upper() == "DESC")
@@ -984,7 +983,6 @@ def get_favorite_sessions(project_id, user_id, include_viewed=False):
                            s.session_id::text AS session_id,
                            s.user_uuid,
                            s.user_id,
-                           -- s.user_agent,
                            s.user_os,
                            s.user_browser,
                            s.user_device,
@@ -1021,7 +1019,6 @@ def get_user_sessions(project_id, user_id, start_date, end_date):
                            s.session_id::text AS session_id,
                            s.user_uuid,
                            s.user_id,
-                           -- s.user_agent,
                            s.user_os,
                            s.user_browser,
                            s.user_device,