diff --git a/src/components/AutoDataSearch/index.vue b/src/components/AutoDataSearch/index.vue
index d50c3853f..5a0de843e 100644
--- a/src/components/AutoDataSearch/index.vue
+++ b/src/components/AutoDataSearch/index.vue
@@ -51,6 +51,13 @@ export default {
         }
         if (field.type === 'choice' && field.choices) {
           option.children = field.choices.map(item => {
+            if (typeof (item.value) === 'boolean') {
+              if (item.value) {
+                return { label: item.display_name, value: 'True' }
+              } else {
+                return { label: item.display_name, value: 'False' }
+              }
+            }
             return { label: item.display_name, value: item.value }
           })
         }
diff --git a/src/components/DataTable/index.vue b/src/components/DataTable/index.vue
index 900565458..1edfdda68 100644
--- a/src/components/DataTable/index.vue
+++ b/src/components/DataTable/index.vue
@@ -86,7 +86,6 @@ export default {
   computed: {
     tableConfig() {
       const config = Object.assign(this.defaultConfig, this.config)
-      this.$log.debug('Datatable found config change')
       return config
     },
     iListeners() {
@@ -96,7 +95,6 @@ export default {
   watch: {
     config: {
       handler() {
-        this.$log.debug('DataTable: found config change', this.tableConfig.url)
         // this.getList()
       },
       deep: true
diff --git a/src/components/ListTable/index.vue b/src/components/ListTable/index.vue
index b80c57134..33b0af0d9 100644
--- a/src/components/ListTable/index.vue
+++ b/src/components/ListTable/index.vue
@@ -68,9 +68,7 @@ export default {
       this.dataTable.getList()
     },
     search(attrs) {
-      if (Object.keys(attrs).length > 0) {
-        return this.dataTable.search(attrs, true)
-      }
+      return this.dataTable.search(attrs, true)
     },
     handleDateChange(attrs) {
       this.$set(this.extraQuery, 'date_from', attrs[0].toISOString())
diff --git a/src/components/TagSearch/index.vue b/src/components/TagSearch/index.vue
index e4dc9ed81..f399e5d00 100644
--- a/src/components/TagSearch/index.vue
+++ b/src/components/TagSearch/index.vue
@@ -74,7 +74,12 @@ export default {
     }
   },
   mounted() {
-    setTimeout(() => this.$emit('tagSearch', this.filterMaps), 400)
+    setTimeout(() => {
+      if (Object.keys(this.filterMaps).length > 0) {
+        return this.$emit('tagSearch', this.filterMaps)
+      }
+    }
+    , 400)
     // this.$nextTick(() => this.$emit('tagSearch', this.filterMaps))
   },
   methods: {
@@ -95,7 +100,6 @@ export default {
       return ''
     },
     handleMenuItemChange(keys) {
-      this.$log.debug('Tag search keys: ', keys)
       if (keys.length === 0) {
         return
       }
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index aef24e8d5..c8a546e36 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -855,7 +855,9 @@
       "OrganizationCreate": "创建组织",
       "OrganizationDetail": "组织详情",
       "OrganizationList": "组织管理",
-      "OrganizationUpdate": "更新组织"
+      "OrganizationUpdate": "更新组织",
+      "DeleteOrgTitle": "请确保组织内的以下信息已删除",
+      "DeleteOrgMsg": "用户列表、用户组、资产列表、网域列表、管理用户、系统用户、标签管理、资产授权规则"
     },
     "RestoreButton": "恢复默认",
     "SubscriptionID": "订阅授权ID",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 931a2b7e9..c08805254 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -854,7 +854,9 @@
       "OrganizationCreate": "Create organization",
       "OrganizationDetail": "Org detail",
       "OrganizationList": "Organlizations",
-      "OrganizationUpdate": "Update org"
+      "OrganizationUpdate": "Update org",
+      "DeleteOrgTitle":"Please ensure that the following information in the organization has been deleted",
+      "DeleteOrgMsg":"User list、User group、Asset list、Domain list、Admin user、System user、Labels、Asset permission"
     },
     "RestoreButton": "Restore Default",
     "SubscriptionID": "Subscription ID",
diff --git a/src/views/assets/Asset/AssetDetail/components/LabelCard.vue b/src/views/assets/Asset/AssetDetail/components/LabelCard.vue
index 1a659f453..c022c2fd7 100644
--- a/src/views/assets/Asset/AssetDetail/components/LabelCard.vue
+++ b/src/views/assets/Asset/AssetDetail/components/LabelCard.vue
@@ -2,7 +2,7 @@
   <IBox fa="fa-info-circle" :title="title" v-bind="$attrs">
     <div class="quick-actions">
       <p v-if="iLabels.length === 0">{{ $t('common.Nothing') }}</p>
-      <el-tag v-for="i in iLabels" :key="i.name + i.value" type="info">{{ i.name }}: {{ i.value }}</el-tag>
+      <el-tag v-for="i in iLabels" :key="i.name + i.value" type="info">{{ i.name }}:{{ i.value }}</el-tag>
     </div>
   </IBox>
 </template>
diff --git a/src/views/xpack b/src/views/xpack
index acb9b0c3f..c57457d27 160000
--- a/src/views/xpack
+++ b/src/views/xpack
@@ -1 +1 @@
-Subproject commit acb9b0c3fc30dfeac094c5da729443a0be236836
+Subproject commit c57457d27c9c7444d2eb9b9b5e2e0716f7bcbdd2