diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java
index d4b88a658..2d87bd34c 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java
@@ -60,6 +60,10 @@ public class RetrieveServiceImpl implements RetrieveService {
 
     @Override
     public List<SearchResult> retrieve(QueryNLReq queryNLReq) {
+        if (CollectionUtils.isEmpty(queryNLReq.getDataSetIds())) {
+            return Collections.emptyList();
+        }
+
         String queryText = queryNLReq.getQueryText();
 
         // 1. Get meta info
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryUtils.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryUtils.java
index 12da5759e..e98fa3146 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryUtils.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryUtils.java
@@ -135,10 +135,10 @@ public class QueryUtils {
         if (StringUtils.isBlank(type)) {
             return false;
         }
-        return type.toLowerCase().endsWith("int") || type.equalsIgnoreCase("float")
-                || type.equalsIgnoreCase("double") || type.equalsIgnoreCase("real")
-                || type.equalsIgnoreCase("numeric") || type.toLowerCase().startsWith("decimal")
-                || type.equalsIgnoreCase("decfloat");
+        return type.toLowerCase().endsWith("int") || type.toLowerCase().startsWith("int")
+                || type.equalsIgnoreCase("float") || type.equalsIgnoreCase("double")
+                || type.equalsIgnoreCase("real") || type.equalsIgnoreCase("numeric")
+                || type.toLowerCase().startsWith("decimal") || type.equalsIgnoreCase("decfloat");
     }
 
     private String getName(String nameEn) {