diff --git a/DSL/Resql/rag-search/POST/update-llm-connection-used-budget.sql b/DSL/Resql/rag-search/POST/update-llm-connection-used-budget.sql
index 3802bc9..16105f7 100644
--- a/DSL/Resql/rag-search/POST/update-llm-connection-used-budget.sql
+++ b/DSL/Resql/rag-search/POST/update-llm-connection-used-budget.sql
@@ -11,4 +11,5 @@ RETURNING
     warn_budget_threshold,
     stop_budget_threshold,
     disconnect_on_budget_exceed,
-    connection_status;
\ No newline at end of file
+    connection_status,
+    (used_budget >= stop_budget_threshold) AS budget_exceeded;
\ No newline at end of file
diff --git a/DSL/Ruuter.private/rag-search/POST/inference/results/test/store.yml b/DSL/Ruuter.private/rag-search/POST/inference/results/test/store.yml
index 6a903a4..f73496d 100644
--- a/DSL/Ruuter.private/rag-search/POST/inference/results/test/store.yml
+++ b/DSL/Ruuter.private/rag-search/POST/inference/results/test/store.yml
@@ -71,9 +71,4 @@ return_success:
 return_bad_request:
   return: ${data_failed}
   status: 400
-  next: end
-
-return_connection_not_found:
-  status: 404
-  return: "error: LLM connection not found"
   next: end
\ No newline at end of file
diff --git a/src/tool_classifier/workflows/service_workflow.py b/src/tool_classifier/workflows/service_workflow.py
index 5f3c7cc..5bf703b 100644
--- a/src/tool_classifier/workflows/service_workflow.py
+++ b/src/tool_classifier/workflows/service_workflow.py
@@ -253,7 +253,7 @@ async def _call_service_discovery(self, chat_id: str) -> Optional[Dict[str, Any]
             logger.error(f"[{chat_id}] Service discovery failed: {e}", exc_info=True)
             return None
 
-    @observe(name="service_intent_detection_orchestration", as_type="span")
+    @observe(name="service_intent_detection_orchestration", as_type="generation")
     async def _detect_service_intent(
         self,
         user_query: str,