diff --git a/server/src/handlers_v2/meta.rs b/server/src/handlers_v2/meta.rs
index bb154fa..9b3a933 100644
--- a/server/src/handlers_v2/meta.rs
+++ b/server/src/handlers_v2/meta.rs
@@ -354,80 +354,73 @@ impl McpTool for OmniSearchHandler {
             vec![]
         };
 
-        let mut kg = KnowledgeGraph::default();
-        let mut tasks = Vec::new();
-        let mut snippets = Vec::new();
-        let mut adrs = Vec::new();
-
-        state.read_graph(|full| {
+        let kg_json = state.read_graph(|full| {
+            let mut kg_entities = std::collections::HashMap::new();
             for (id, doc_type, _, _, _) in &matches {
                 if doc_type == "entity"
                     && let Some(e) = full.entities.get(id)
                 {
-                    kg.entities.insert(id.clone(), e.clone());
+                    kg_entities.insert(id, e);
                 }
             }
+            serde_json::to_value(&kg_entities).unwrap_or_default()
         });
-        state.tasks.read_with(|all_tasks| {
-            for t in all_tasks {
-                if matches
-                    .iter()
-                    .any(|(id, typ, _, _, _)| id == &t.id && typ == "task")
-                {
-                    tasks.push(t.clone());
-                }
-            }
+
+        let tasks_json = state.tasks.read_with(|all_tasks| {
+            let filtered: Vec<_> = all_tasks.iter().filter(|t| {
+                matches.iter().any(|(id, typ, _, _, _)| id == &t.id && typ == "task")
+            }).collect();
+            serde_json::to_value(&filtered).unwrap_or_default()
         });
-        state.snippets.read_with(|all_snippets| {
-            for s in all_snippets {
-                if matches
-                    .iter()
-                    .any(|(id, typ, _, _, _)| id == &s.name && typ == "snippet")
-                {
-                    snippets.push(s.clone());
-                }
-            }
+
+        let snippets_json = state.snippets.read_with(|all_snippets| {
+            let filtered: Vec<_> = all_snippets.iter().filter(|s| {
+                matches.iter().any(|(id, typ, _, _, _)| id == &s.name && typ == "snippet")
+            }).collect();
+            serde_json::to_value(&filtered).unwrap_or_default()
         });
-        state.adrs.read_with(|all_adrs| {
-            for a in all_adrs {
-                if matches
-                    .iter()
-                    .any(|(id, typ, _, _, _)| id == &a.id && typ == "adr")
-                {
-                    adrs.push(a.clone());
-                }
-            }
+
+        let adrs_json = state.adrs.read_with(|all_adrs| {
+            let filtered: Vec<_> = all_adrs.iter().filter(|a| {
+                matches.iter().any(|(id, typ, _, _, _)| id == &a.id && typ == "adr")
+            }).collect();
+            serde_json::to_value(&filtered).unwrap_or_default()
         });
 
         let q = req.query;
-        let tech_debts = state.tech_debts.read_with(|debts| {
-            debts.iter().filter(|d| {
+        let tech_debts_json = state.tech_debts.read_with(|debts| {
+            let filtered: Vec<_> = debts.iter().filter(|d| {
                 req.namespace.as_ref().is_none_or(|ns| d.namespace == *ns)
                     && (contains_ignore_ascii_case(&d.description, &q)
                         || contains_ignore_ascii_case(&d.ideal_solution, &q))
-            }).cloned().collect::<Vec<_>>()
+            }).collect();
+            serde_json::to_value(&filtered).unwrap_or_default()
         });
-        let memos = state.handoff_memos.read_with(|memos| {
-            memos.iter().filter(|m| {
+
+        let memos_json = state.handoff_memos.read_with(|memos| {
+            let filtered: Vec<_> = memos.iter().filter(|m| {
                 req.namespace.as_ref().is_none_or(|ns| m.namespace == *ns)
                     && contains_ignore_ascii_case(&m.content, &q)
-            }).cloned().collect::<Vec<_>>()
+            }).collect();
+            serde_json::to_value(&filtered).unwrap_or_default()
         });
-        let error_fixes = state.error_fixes.read_with(|fixes| {
-            fixes.iter().filter(|f| {
+
+        let error_fixes_json = state.error_fixes.read_with(|fixes| {
+            let filtered: Vec<_> = fixes.iter().filter(|f| {
                 contains_ignore_ascii_case(&f.signature, &q)
                     || contains_ignore_ascii_case(&f.solution, &q)
-            }).cloned().collect::<Vec<_>>()
+            }).collect();
+            serde_json::to_value(&filtered).unwrap_or_default()
         });
 
         let report = serde_json::json!({
-            "knowledge_graph": kg.entities,
-            "tasks": tasks,
-            "snippets": snippets,
-            "adrs": adrs,
-            "tech_debts": tech_debts,
-            "handoff_memos": memos,
-            "error_fixes": error_fixes
+            "knowledge_graph": kg_json,
+            "tasks": tasks_json,
+            "snippets": snippets_json,
+            "adrs": adrs_json,
+            "tech_debts": tech_debts_json,
+            "handoff_memos": memos_json,
+            "error_fixes": error_fixes_json
         });
         Ok(report.to_string())
     }
diff --git a/server/src/main.rs b/server/src/main.rs
index 7b46295..dc7adfd 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -446,7 +446,7 @@ async fn handle_socket(socket: WebSocket, state: Arc<AppState>, client_type: Str
     state
         .clients
         .write()
-        .unwrap()
+        .unwrap_or_else(|e| e.into_inner())
         .insert(session_id.clone(), tx.clone());
 
     let (mut sender, mut receiver) = socket.split();
@@ -501,7 +501,7 @@ async fn handle_socket(socket: WebSocket, state: Arc<AppState>, client_type: Str
                                 let senders: Vec<_> = state_clone
                                     .clients
                                     .read()
-                                    .unwrap()
+                                    .unwrap_or_else(|e| e.into_inner())
                                     .iter()
                                     .filter_map(|(id, tx)| {
                                         if id != &session_id_clone {
@@ -524,7 +524,7 @@ async fn handle_socket(socket: WebSocket, state: Arc<AppState>, client_type: Str
                             let tx_opt = state_clone
                                 .clients
                                 .read()
-                                .unwrap()
+                                .unwrap_or_else(|e| e.into_inner())
                                 .get(&session_id_clone)
                                 .cloned();
                             if let Some(client_tx) = tx_opt {