diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/DimensionRecommendProcessor.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/DimensionRecommendProcessor.java
index 3792da48b..f30a76e2b 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/DimensionRecommendProcessor.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/DimensionRecommendProcessor.java
@@ -34,8 +34,13 @@ public class DimensionRecommendProcessor implements ExecuteResultProcessor {
                 || CollectionUtils.isEmpty(semanticParseInfo.getMetrics())) {
             return;
         }
-        SchemaElement element = semanticParseInfo.getMetrics().iterator().next();
-        List<SchemaElement> dimensionRecommended = getDimensions(element.getId(), element.getDataSetId());
+        Long dataSetId = semanticParseInfo.getDataSetId();
+        Optional<SchemaElement> firstMetric = semanticParseInfo.getMetrics().stream().findFirst();
+        if (!firstMetric.isPresent()) {
+            return;
+        }
+        SchemaElement element = firstMetric.get();
+        List<SchemaElement> dimensionRecommended = getDimensions(element.getId(), dataSetId);
         queryResult.setRecommendedDimensions(dimensionRecommended);
     }
 
diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/OnePassSCSqlGenStrategy.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/OnePassSCSqlGenStrategy.java
index 8f92c358e..22ac33a87 100644
--- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/OnePassSCSqlGenStrategy.java
+++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/OnePassSCSqlGenStrategy.java
@@ -101,11 +101,11 @@ public class OnePassSCSqlGenStrategy extends SqlGenStrategy {
 
         // use custom prompt template if provided.
         PromptConfig promptConfig = llmReq.getPromptConfig();
-        String prompTemplate = INSTRUCTION;
+        String promptTemplate = INSTRUCTION;
         if (promptConfig != null && StringUtils.isNotBlank(promptConfig.getPromptTemplate())) {
-            prompTemplate = promptConfig.getPromptTemplate();
+            promptTemplate = promptConfig.getPromptTemplate();
         }
-        return PromptTemplate.from(prompTemplate).apply(variable);
+        return PromptTemplate.from(promptTemplate).apply(variable);
     }
 
     @Override