diff --git a/src/views/detections/DetectionFilter.vue b/src/views/detections/DetectionFilter.vue
index adf7d25e..48ea0ad7 100644
--- a/src/views/detections/DetectionFilter.vue
+++ b/src/views/detections/DetectionFilter.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="detection-filter-case">
+    <div class="no-data" v-if="isNoData">No data</div>
     <template v-for="(filter, index) in filterData" :key="index">
       <div class="detection-filter" v-show="filter.data.length > 0">
         <div class="filter__header" @click="filter.collapse = !filter.collapse">
@@ -51,6 +52,17 @@ export default {
       filter.showIndex && (filter.showIndex += 10)
       filter.showIndex >= filter.data.length && (filter.showMore = false)
     }
+  },
+  computed: {
+    isNoData () {
+      let isNoData = true
+      this.filterData.forEach(filter => {
+        if (!this.$_.isEmpty(filter.data)) {
+          isNoData = false
+        }
+      })
+      return isNoData
+    }
   }
 }
 </script>
diff --git a/src/views/detections/DetectionRow.vue b/src/views/detections/DetectionRow.vue
index 181b9c15..4428c7f0 100644
--- a/src/views/detections/DetectionRow.vue
+++ b/src/views/detections/DetectionRow.vue
@@ -20,16 +20,26 @@
         <div class="cn-detection__body">
           <div class="body__basic-info">
             <div class="basic-info">
-              <div class="basic-info__item">
+              <div class="basic-info__item" v-if="detection.eventSecurity">
                 <i class="cn-icon cn-icon-severity-level"></i>
                 <span>{{$t('detection.list.eventSecurity')}}&nbsp;:&nbsp;&nbsp;</span>
                 <span>{{detection.eventSecurity}}</span>
               </div>
-              <div class="basic-info__item">
+              <div class="basic-info__item" v-if="detection.eventSeverity">
+                <i class="cn-icon cn-icon-severity-level"></i>
+                <span>{{$t('detections.eventSeverity')}}&nbsp;:&nbsp;&nbsp;</span>
+                <span>{{detection.eventSeverity}}</span>
+              </div>
+              <div class="basic-info__item" v-if="detection.securityType">
                 <i class="cn-icon cn-icon-event-type"></i>
                 <span>{{$t('detection.list.securityType')}}&nbsp;:&nbsp;&nbsp;</span>
                 <span>{{detection.securityType}}</span>
               </div>
+              <div class="basic-info__item" v-if="detection.eventType">
+                <i class="cn-icon cn-icon-event-type"></i>
+                <span>{{$t('detections.eventType')}}&nbsp;:&nbsp;&nbsp;</span>
+                <span>{{detection.eventType}}</span>
+              </div>
               <div class="basic-info__item" v-if="detection.malwareName">
                 <i class="cn-icon cn-icon-trojan"></i>
                 <span>{{$t('detection.list.malwareName')}}&nbsp;:&nbsp;&nbsp;</span>