diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DbAdaptorFactory.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DbAdaptorFactory.java
index 014568852..8e3eb08e7 100644
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DbAdaptorFactory.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DbAdaptorFactory.java
@@ -21,6 +21,6 @@ public class DbAdaptorFactory {
     }
 
     public static DbAdaptor getEngineAdaptor(String engineType) {
-        return dbAdaptorMap.get(engineType);
+        return dbAdaptorMap.get(engineType.toUpperCase());
     }
 }
diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/optimizer/DbDialectOptimizer.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/optimizer/DbDialectOptimizer.java
index c8ae12fb7..1d5151b1b 100644
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/optimizer/DbDialectOptimizer.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/optimizer/DbDialectOptimizer.java
@@ -26,8 +26,7 @@ public class DbDialectOptimizer implements QueryOptimizer {
         SemanticSchemaResp semanticSchemaResp = queryStatement.getSemanticSchema();
         DatabaseResp database = semanticSchemaResp.getDatabaseResp();
         String sql = queryStatement.getSql();
-        DbAdaptor engineAdaptor =
-                DbAdaptorFactory.getEngineAdaptor(database.getType().toLowerCase());
+        DbAdaptor engineAdaptor = DbAdaptorFactory.getEngineAdaptor(database.getType());
         if (Objects.nonNull(engineAdaptor)) {
             String adaptedSql = engineAdaptor.rewriteSql(sql);
             queryStatement.setSql(adaptedSql);
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java
index 3d8457646..b0288b4eb 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java
@@ -202,8 +202,7 @@ public class DatabaseServiceImpl extends ServiceImpl<DatabaseDOMapper, DatabaseD
     @Override
     public List<String> getDbNames(Long id) throws SQLException {
         DatabaseResp databaseResp = getDatabase(id);
-        DbAdaptor dbAdaptor =
-                DbAdaptorFactory.getEngineAdaptor(databaseResp.getType().toUpperCase());
+        DbAdaptor dbAdaptor = DbAdaptorFactory.getEngineAdaptor(databaseResp.getType());
         return dbAdaptor.getDBs(DatabaseConverter.getConnectInfo(databaseResp));
     }
 
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java
index ac7c2642d..c9f65ab1c 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java
@@ -271,26 +271,24 @@ public class ModelConverter {
 
         if (measures != null) {
             for (Measure measure : measures) {
-                if (StringUtils.isBlank(measure.getBizName())) {
-                    continue;
+                if (StringUtils.isNotBlank(measure.getBizName())
+                        && StringUtils.isBlank(measure.getExpr())) {
+                    measure.setExpr(measure.getBizName());
                 }
-                measure.setExpr(measure.getBizName());
             }
         }
         if (dimensions != null) {
             for (Dimension dimension : dimensions) {
-                if (StringUtils.isBlank(dimension.getBizName())) {
-                    continue;
+                if (StringUtils.isNotBlank(dimension.getBizName())
+                        && StringUtils.isBlank(dimension.getExpr())) {
+                    dimension.setExpr(dimension.getBizName());
                 }
-                dimension.setExpr(dimension.getBizName());
             }
         }
         if (identifiers != null) {
             for (Identify identify : identifiers) {
-                if (StringUtils.isBlank(identify.getBizName())) {
-                    continue;
-                }
-                if (StringUtils.isBlank(identify.getName())) {
+                if (StringUtils.isNotBlank(identify.getBizName())
+                        && StringUtils.isBlank(identify.getName())) {
                     identify.setName(identify.getBizName());
                 }
                 identify.setIsCreateDimension(1);