diff --git a/src/components/Discover/Map/Filter/Attributes.vue b/src/components/Discover/Map/Filter/Attributes.vue
index ab94fe4..df92c4e 100644
--- a/src/components/Discover/Map/Filter/Attributes.vue
+++ b/src/components/Discover/Map/Filter/Attributes.vue
@@ -689,7 +689,13 @@ export default {
           this.valueEndMin = inputValue;
         }
       }
-      else if(direction === 'end') isDateType ? this.startMaxDate = e : this.valueStartMax = inputValue;
+      else if(direction === 'end') {
+        if(isDateType) {
+          this.startMaxDate = e;
+        } else {
+          this.valueStartMax = inputValue;
+        };
+      }
       // 重新算圖
       if(!isNaN(closestIndexes[0]) && !isNaN(closestIndexes[1])) this.resizeMask(this.chartComplete);
       else return;
diff --git a/src/components/Discover/Map/Filter/Funnel.vue b/src/components/Discover/Map/Filter/Funnel.vue
index 0c8f9e4..0847a87 100644
--- a/src/components/Discover/Map/Filter/Funnel.vue
+++ b/src/components/Discover/Map/Filter/Funnel.vue
@@ -50,7 +50,7 @@ export default {
     const { isLoading } = storeToRefs(loadingStore);
     const { hasResultRule, temporaryData, postRuleData, ruleData, isRuleData, tempFilterId } = storeToRefs(allMapDataStore);
 
-    return { isLoading, hasResultRule, temporaryData, postRuleData, ruleData, isRuleData, allMapDataStore, tempFilterId, allMapDataStore }
+    return { isLoading, hasResultRule, temporaryData, postRuleData, ruleData, isRuleData, allMapDataStore, tempFilterId }
   },
   methods: {
     /**
diff --git a/src/components/Discover/Map/Filter/Timeframes.vue b/src/components/Discover/Map/Filter/Timeframes.vue
index 227dc7c..e9df1fb 100644
--- a/src/components/Discover/Map/Filter/Timeframes.vue
+++ b/src/components/Discover/Map/Filter/Timeframes.vue
@@ -103,17 +103,20 @@ export default{
       let d = this.filterTimeframe.data[0].y;
       let e = 2;
       let f = this.filterTimeframe.data[1].y;
-      b = (e*d - a*d - f*a - f*c) / (e - c - a)
-      b < 0 ? b = 0 : b;
+      b = (e*d - a*d - f*a - f*c) / (e - c - a);
+      if(b < 0) {
+        b = 0;
+      }
       // y 軸最大值
       let ma = 9;
       let mb = this.filterTimeframe.data[8].y;
       let mc = 10;
       let md = this.filterTimeframe.data[9].y;
       let me = 11;
-      let mf;
-      mf = (mb*me - mb*mc -md*me + md*ma) / (ma - mc);
-      mf < 0 ? mf = 0 : mf;
+      let mf = (mb*me - mb*mc -md*me + md*ma) / (ma - mc);
+      if(mf < 0) {
+        mf = 0;
+      }
 
       // 添加最小值
       data.unshift({
@@ -304,7 +307,7 @@ export default{
       // 重新算圖
       this.resizeMask(this.chart);
       // 執行 timeFrameStartEnd 才會改變數據
-      this.timeFrameStartEnd;
+      this.timeFrameStartEnd();
     },
     /**
      * 選取開始或結束時間時，要改變滑塊跟圖表
diff --git a/src/components/Discover/Map/Filter/Trace.vue b/src/components/Discover/Map/Filter/Trace.vue
index 9003ca6..03e6e5d 100644
--- a/src/components/Discover/Map/Filter/Trace.vue
+++ b/src/components/Discover/Map/Filter/Trace.vue
@@ -257,7 +257,6 @@ export default {
      async switchCaseData(id, count) {
       // 點同一筆 id 不要有動作
       if(id == this.showTraceId) return;
-      // if(count >= 1000) this.isLoading = true; // 超過 1000 筆要 loading 畫面
       this.isLoading = true; // 都要 loading 畫面
       this.infinit404 = null;
       this.infinitMaxItems = false;
diff --git a/src/components/Discover/Map/SidebarFilter.vue b/src/components/Discover/Map/SidebarFilter.vue
index e6b471f..65a7cf9 100644
--- a/src/components/Discover/Map/SidebarFilter.vue
+++ b/src/components/Discover/Map/SidebarFilter.vue
@@ -38,14 +38,6 @@
             <label :for="item + index">{{ item }}</label>
           </div>
         </div>
-        <!-- 目前只有 case -->
-        <!-- <div v-show="selectValue[0] === 'Attributes'">
-          <p class="h2">Mode</p>
-          <div v-for="(item, index) in selectFilter['ModeAtt']" :key="index">
-            <RadioButton v-model="selectValue[4]" :inputId="item + index" name="ModeAtt" :value="item" class="mb-1 mr-2"/>
-            <label :for="item + index">{{ item }}</label>
-          </div>
-        </div> -->
         <div>
           <p class="h2">Refine</p>
           <div v-for="(item, index) in selectFilter['Refine']" :key="index">
diff --git a/src/components/Discover/Map/SidebarState.vue b/src/components/Discover/Map/SidebarState.vue
index 7525d75..5713682 100644
--- a/src/components/Discover/Map/SidebarState.vue
+++ b/src/components/Discover/Map/SidebarState.vue
@@ -63,6 +63,7 @@
         <p class="h2">Case Duration</p>
         <table class="text-sm caseDurationTable">
           <caption class="hidden">Case Duration</caption>
+          <th class="hidden"></th>
           <tbody>
             <tr>
               <td>
@@ -300,9 +301,6 @@ export default {
 :deep(.p-tabview-panel) {
   @apply animate-fadein
 }
-/* .caseDurationTable td:first-child {
-  @apply pr-1
-} */
 .caseDurationTable td {
   @apply scroll-pb-12
 }
diff --git a/src/components/Discover/Map/SidebarTraces.vue b/src/components/Discover/Map/SidebarTraces.vue
index 38a05bb..24812e4 100644
--- a/src/components/Discover/Map/SidebarTraces.vue
+++ b/src/components/Discover/Map/SidebarTraces.vue
@@ -176,7 +176,6 @@ export default {
     async switchCaseData(id, count) {
       // 點同一筆 id 不要有動作
       if(id == this.showTraceId) return;
-      // if(count >= 1000) this.isLoading = true; // 超過 1000 筆要 loading 畫面
       this.isLoading = true; // 都要 loading 畫面
       this.infinit404 = null;
       this.infinitMaxItems = false;
diff --git a/src/components/Discover/StatusBar.vue b/src/components/Discover/StatusBar.vue
index 86154af..8e4b06d 100644
--- a/src/components/Discover/StatusBar.vue
+++ b/src/components/Discover/StatusBar.vue
@@ -5,7 +5,6 @@
     <li class="bg-neutral-10 rounded p-3 w-full">
       <div class="flex justify-between items-center mb-5">
         <p class="font-bold text-sm leading-8">Cases</p>
-        <!-- <span class="material-symbols-outlined text-base">info</span> -->
       </div>
       <div class="flex justify-between items-center">
         <div class="mr-2 w-full">
@@ -18,7 +17,6 @@
     <li class="bg-neutral-10 rounded p-3 w-full">
       <div class="flex justify-between items-center mb-5">
         <p class="font-bold text-sm leading-8">Traces</p>
-        <!-- <span class="material-symbols-outlined text-base">info</span> -->
       </div>
       <div class="flex justify-between items-center">
         <div class="mr-2 w-full">
@@ -31,7 +29,6 @@
     <li class="bg-neutral-10 rounded p-3 w-full">
       <div class="flex justify-between items-center mb-5">
         <p class="font-bold text-sm leading-8">Activity Instances</p>
-        <!-- <span class="material-symbols-outlined text-base">info</span> -->
       </div>
       <div class="flex justify-between items-center">
         <div class="mr-2 w-full">
@@ -44,7 +41,6 @@
     <li class="bg-neutral-10 rounded p-3 w-full">
       <div class="flex justify-between items-center mb-5">
         <p class="font-bold text-sm leading-8">Activities</p>
-        <!-- <span class="material-symbols-outlined text-base">info</span> -->
       </div>
       <div class="flex justify-between items-center">
         <div class="mr-2 w-full">