diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
index 8ff3c7c2b..9b015b211 100644
--- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
+++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
@@ -201,9 +201,9 @@ export default {
         endpoint: {
           endpointTabTitle: [
             { prop: 'panelTab', name: this.$t('overall.detail') },
+            { prop: 'endpointAlertMessage', name: this.$t('overall.alert') },
             { prop: 'endpointQuery', name: 'Query' },
             { prop: 'log', name: 'Log' },
-            { prop: 'endpointAlertMessage', name: this.$t('overall.alert') }
           ]
         },
         chartTemp: {
@@ -250,8 +250,8 @@ export default {
       const hasLog = config && config.enable === 1
       const tabs = [
         { prop: 'panelTab', name: this.$t('overall.detail') },
-        { prop: 'endpointQuery', name: 'Query' },
-        { prop: 'endpointAlertMessage', name: this.$t('overall.alert') }
+        { prop: 'endpointAlertMessage', name: this.$t('overall.alert') },
+        { prop: 'endpointQuery', name: 'Metrics' }
       ]
       if (hasLog) {
         tabs.push({ prop: 'log', name: 'Log' })
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
index 9eef86495..036682a2c 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
@@ -102,7 +102,7 @@ export default {
         this.expressions.forEach((item, index) => {
           if (item != '') {
             let expr = item
-            this.matchContent && (expr = `${item} ${this.matchSymbol} ${this.matchContent}`)
+            this.matchContent && (expr = `${item} ${this.matchSymbol} "${this.matchContent}"`)
             requestArr.push(this.$get('/logs/loki/api/v1/query_range?format=1&query=' + expr + '&start=' + this.$stringTimeParseToUnix(this.filterTime[0]) + '&end=' + this.$stringTimeParseToUnix(this.filterTime[1]) + '&limit=' + limit))
           }
         })
diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
index d7d803da4..b8d075cd7 100644
--- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
@@ -175,7 +175,7 @@
             <i class="nz-icon nz-icon-more3"></i>
           </div>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item v-if="!endpointTab" :command="['endpointQuery', scope.row]"><i class="nz-icon nz-icon-search"></i><span class="operation-dropdown-text">{{$t('overall.query')}}</span></el-dropdown-item>
+<!--            <el-dropdown-item v-if="!endpointTab" :command="['endpointQuery', scope.row]"><i class="nz-icon nz-icon-search"></i><span class="operation-dropdown-text">{{$t('overall.query')}}</span></el-dropdown-item>-->
             <el-dropdown-item v-if="!endpointTab" v-has="'monitor_endpoint_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'monitor_endpoint_delete'" :command="['delete', scope.row, `sys/endpoint?ids=${scope.row.id}`]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
             <el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'endpoint']"><i class="nz-icon nz-icon-fast-silence"></i><span class="operation-dropdown-text">{{$t('overall.silenceAlert')}}</span></el-dropdown-item>
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index 85a91568c..1e3e7987d 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -296,16 +296,16 @@ export default {
           width: 0,
           index: -1
         },
-        type: {
-          label: 'Type',
-          key: 'type',
-          type: 'checkBox',
-          children: [],
-          show: false,
-          showMore: false,
-          width: 0,
-          index: -1
-        }
+        // type: {
+        //   label: 'Type',
+        //   key: 'type',
+        //   type: 'checkBox',
+        //   children: [],
+        //   show: false,
+        //   showMore: false,
+        //   width: 0,
+        //   index: -1
+        // }
       },
       selectValue: {
         projectIds: [],
@@ -482,12 +482,12 @@ export default {
         { key: 'Up', value: 1, name: 'Up' },
         { key: 'Suspended', value: 2, name: 'Suspended' }
       ]
-      this.titleSearchList.type.children = [
-        { key: 'Metrics', value: 'metrics', name: 'Metrics' },
-        { key: 'Logs', value: 'logs', name: 'Logs' }
-      ]
+      // this.titleSearchList.type.children = [
+      //   { key: 'Metrics', value: 'metrics', name: 'Metrics' },
+      //   { key: 'Logs', value: 'logs', name: 'Logs' }
+      // ]
       this.titleSearchList.state.show = true
-      this.titleSearchList.type.show = true
+      // this.titleSearchList.type.show = true
     },
     batchModify () {
       if (!this.batchDeleteObjs.length) {