diff --git a/botserver/src/core/bot/mod.rs b/botserver/src/core/bot/mod.rs
index 24fa0f52..a320ab3b 100644
--- a/botserver/src/core/bot/mod.rs
+++ b/botserver/src/core/bot/mod.rs
@@ -899,29 +899,6 @@ let system_prompt = if !message.active_switchers.is_empty() {
         let switchers: Vec<Switcher> = Vec::new();
 
         let user_id_str = user_id.to_string();
-        // Flush any remaining content in html_buffer
-        if !html_buffer.is_empty() {
-            let content_to_send = html_buffer
-                .replace("< ", "<")
-                .replace("</ ", "</");
-            
-            let response = BotResponse {
-                bot_id: bot_id_str.clone(),
-                user_id: user_id_str.clone(),
-                session_id: session_id_str.clone(),
-                channel: message.channel.clone(),
-                content: content_to_send,
-                message_type: MessageType::BOT_RESPONSE,
-                stream_token: None,
-                is_complete: false,
-                suggestions: Vec::new(),
-                switchers: Vec::new(),
-                context_name: None,
-                context_length: 0,
-                context_max_length: 0,
-            };
-            let _ = response_tx.send(response).await;
-        }
 
         let final_response = BotResponse {
             bot_id: bot_id_str,
@@ -934,7 +911,7 @@ let system_prompt = if !message.active_switchers.is_empty() {
             is_complete: true,
             suggestions: suggestions
                 .into_iter()
-                .map(|s| s.suggestion_text)
+                .map(|s| s.text)
                 .collect(),
             switchers: Vec::new(),
             context_name: None,
@@ -1880,7 +1857,7 @@ async fn handle_websocket(
                         }).await;
 
                         match result {
-                            Ok(Ok(())) => {
+                            Ok(Ok(_)) => {
                                 info!("start.bas executed successfully for bot {}", bot_name);
                                 // Final confirmation in memory
                                 let mut guards = state_for_redis.start_bas_guards.blocking_lock();