diff --git a/db/ConfigBuilder.cpp b/db/ConfigBuilder.cpp
index 3037594..655c7d5 100644
--- a/db/ConfigBuilder.cpp
+++ b/db/ConfigBuilder.cpp
@@ -607,8 +607,16 @@ namespace NekoRay {
             }
 
             // Bypass Lookup for the first profile
-            if (isFirstProfile && !IsIpAddress(ent->bean->serverAddress)) {
-                status->domainListDNSDirect += "full:" + ent->bean->serverAddress;
+            auto serverAddress = ent->bean->serverAddress;
+
+            auto customBean = dynamic_cast<fmt::CustomBean *>(ent->bean.get());
+            if (customBean != nullptr && customBean->core == "internal") {
+                auto server = QString2QJsonObject(customBean->config_simple)["server"].toString();
+                if (!server.isEmpty()) serverAddress = server;
+            }
+
+            if (isFirstProfile && !IsIpAddress(serverAddress)) {
+                status->domainListDNSDirect += "full:" + serverAddress;
             }
 
             status->outbounds += outbound;
@@ -713,15 +721,15 @@ namespace NekoRay {
                     if (item.startsWith("geosite:")) {
                         geosite += item.replace("geosite:", "");
                     } else if (item.startsWith("full:")) {
-                        domain_full += item.replace("full:", "");
+                        domain_full += item.replace("full:", "").toLower();
                     } else if (item.startsWith("domain:")) {
-                        domain_subdomain += item.replace("domain:", "");
+                        domain_subdomain += item.replace("domain:", "").toLower();
                     } else if (item.startsWith("regexp:")) {
-                        domain_regexp += item.replace("regexp:", "");
+                        domain_regexp += item.replace("regexp:", "").toLower();
                     } else if (item.startsWith("keyword:")) {
-                        domain_keyword += item.replace("keyword:", "");
+                        domain_keyword += item.replace("keyword:", "").toLower();
                     } else {
-                        domain_full += item;
+                        domain_full += item.toLower();
                     }
                 }
             }
@@ -751,7 +759,7 @@ namespace NekoRay {
         if (!status->forTest)
             dnsServers += QJsonObject{
                 {"tag", "dns-remote"},
-                {"address_resolver", "dns-underlying"},
+                {"address_resolver", "dns-local"},
                 {"strategy", dataStore->remote_dns_strategy},
                 {"address", dataStore->remote_dns},
                 {"detour", tagProxy},
@@ -766,7 +774,7 @@ namespace NekoRay {
         if (!status->forTest)
             dnsServers += QJsonObject{
                 {"tag", "dns-direct"},
-                {"address_resolver", "dns-underlying"},
+                {"address_resolver", "dns-local"},
                 {"strategy", dataStore->direct_dns_strategy},
                 {"address", directDNSAddress.replace("+local://", "://")},
                 {"detour", "direct"},
@@ -774,7 +782,7 @@ namespace NekoRay {
 
         // Underlying 100% Working DNS
         dnsServers += QJsonObject{
-            {"tag", "dns-underlying"},
+            {"tag", "dns-local"},
             {"address", underlyingStr},
             {"detour", "direct"},
         };
diff --git a/libs/build_public_res.sh b/libs/build_public_res.sh
index 49943fb..26edc0d 100755
--- a/libs/build_public_res.sh
+++ b/libs/build_public_res.sh
@@ -7,10 +7,10 @@ rm -rf $DEST
 mkdir -p $DEST
 
 #### Download geodata ####
-curl -Lso $DEST/geoip.dat "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat"
-curl -Lso $DEST/geosite.dat "https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat"
-curl -Lso $DEST/geoip.db "https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db"
-curl -Lso $DEST/geosite.db "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db"
+curl -fLso $DEST/geoip.dat "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat"
+curl -fLso $DEST/geosite.dat "https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat"
+curl -fLso $DEST/geoip.db "https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db"
+curl -fLso $DEST/geosite.db "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db"
 
 #### copy res/public ####
 cp res/public/* $DEST
diff --git a/ui/dialog_manage_routes.ui b/ui/dialog_manage_routes.ui
index 7ca7dfd..f3282f5 100644
--- a/ui/dialog_manage_routes.ui
+++ b/ui/dialog_manage_routes.ui
@@ -102,6 +102,26 @@
         <item>
          <widget class="QLineEdit" name="dns_direct"/>
         </item>
+        <item>
+         <widget class="Line" name="line">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="dns_routing">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Enable DNS Routing</string>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QPushButton" name="queryStrategy">
           <property name="text">
@@ -113,7 +133,7 @@
       </item>
       <item>
        <widget class="QWidget" name="domain_v2ray" native="true">
-        <layout class="QHBoxLayout" name="_2" stretch="0,0,0,1,0,1">
+        <layout class="QHBoxLayout" name="_2" stretch="0,1,0,1">
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -126,26 +146,6 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
-         <item>
-          <widget class="QCheckBox" name="dns_routing">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Enable DNS Routing</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="Line" name="line">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-          </widget>
-         </item>
          <item>
           <widget class="QLabel" name="label_6">
            <property name="text">
@@ -465,6 +465,7 @@
   <tabstop>dns_remote</tabstop>
   <tabstop>dns_direct</tabstop>
   <tabstop>dns_routing</tabstop>
+  <tabstop>queryStrategy</tabstop>
   <tabstop>domainStrategyCombo</tabstop>
   <tabstop>domainMatcherCombo</tabstop>
   <tabstop>preset</tabstop>