diff --git a/api/endpoints/agent.php b/api/endpoints/agent.php
index 288b8da..f7ee21b 100644
--- a/api/endpoints/agent.php
+++ b/api/endpoints/agent.php
@@ -184,7 +184,7 @@ switch ($agentAction) {
             ];
         }
         JarvisDB::query(
-            'INSERT INTO kb_facts (fact_key, fact_value, fact_type) VALUES ("ha/entity_map", ?, "json")
+            'INSERT INTO kb_facts (category, fact_key, fact_value) VALUES ("ha_entities", "ha/entity_map", ?)
              ON DUPLICATE KEY UPDATE fact_value=VALUES(fact_value), updated_at=NOW()',
             [json_encode($entityMap)]
         );
diff --git a/public_html/assets/js/jarvis-app.js b/public_html/assets/js/jarvis-app.js
index 78aeba1..04725a5 100644
--- a/public_html/assets/js/jarvis-app.js
+++ b/public_html/assets/js/jarvis-app.js
@@ -1180,7 +1180,7 @@ async function sendMessage() {
     const payload = {message:text, session_id:sessionId, stream:true};
     if (selectedContext) { payload.context = selectedContext; clearContext(); }
 
-    const resp = await fetch('/api.php?action=chat', {
+    const resp = await fetch('/api/chat', {
       method: 'POST',
       headers: {'Content-Type':'application/json','X-Session-Token':sessionToken},
       body: JSON.stringify(payload),