diff --git a/api/libs/agents/src/agent.rs b/api/libs/agents/src/agent.rs
index 5a50c7970..1f155b0ba 100644
--- a/api/libs/agents/src/agent.rs
+++ b/api/libs/agents/src/agent.rs
@@ -329,7 +329,7 @@ impl Agent {
             model: self.model.clone(),
             messages: thread.messages.clone(),
             tools: if tools.is_empty() { None } else { Some(tools) },
-            tool_choice: Some(ToolChoice::Required),
+            tool_choice: Some(ToolChoice::Auto),
             stream: Some(true), // Enable streaming
             metadata: Some(Metadata {
                 generation_name: "agent".to_string(),
@@ -337,7 +337,6 @@ impl Agent {
                 session_id: thread.id.to_string(),
                 trace_id: thread.id.to_string(),
             }),
-            store: Some(true),
             ..Default::default()
         };
 
diff --git a/api/libs/agents/src/agents/buster_super_agent.rs b/api/libs/agents/src/agents/buster_super_agent.rs
index fe110c9e6..25059268a 100644
--- a/api/libs/agents/src/agents/buster_super_agent.rs
+++ b/api/libs/agents/src/agents/buster_super_agent.rs
@@ -104,7 +104,7 @@ impl BusterSuperAgent {
             HashMap::new(),
             user_id,
             session_id,
-            "manager_agent".to_string(),
+            "buster_super_agent".to_string(),
         ));
 
         let manager = Self { agent };
@@ -116,7 +116,7 @@ impl BusterSuperAgent {
         // Create a new agent with the same core properties and shared state/stream
         let agent = Arc::new(Agent::from_existing(
             existing_agent,
-            "manager_agent".to_string(),
+            "buster_super_agent".to_string(),
         ));
         let manager = Self { agent };
         manager.load_tools().await?;
@@ -127,7 +127,7 @@ impl BusterSuperAgent {
         &self,
         thread: &mut AgentThread,
     ) -> Result<broadcast::Receiver<Result<AgentMessage, AgentError>>> {
-        thread.set_developer_message(MANAGER_AGENT_PROMPT.to_string());
+        thread.set_developer_message(BUSTER_SUPER_AGENT_PROMPT.to_string());
 
         // Get shutdown receiver
         let rx = self.stream_process_thread(thread).await?;
@@ -141,7 +141,7 @@ impl BusterSuperAgent {
     }
 }
 
-const MANAGER_AGENT_PROMPT: &str = r##"### Role & Task
+const BUSTER_SUPER_AGENT_PROMPT: &str = r##"### Role & Task
 You are Buster, an expert analytics and data engineer. Your job is to assess what data is available and then provide fast, accurate answers to analytics questions from non-technical users. You do this by analyzing user requests, searching across a data catalog, and building metrics or dashboards.
 ---
 ### Actions Available (Tools)