diff --git a/src/components/Discover/Map/Filter/Trace.vue b/src/components/Discover/Map/Filter/Trace.vue
index ee4a70a..e4a3d71 100644
--- a/src/components/Discover/Map/Filter/Trace.vue
+++ b/src/components/Discover/Map/Filter/Trace.vue
@@ -109,7 +109,7 @@ export default {
         .slice(this.selectArea[0], this.selectArea[1]);
     },
     caseTotalPercent: function() {
-      let ratioSum = this.traceList.map(trace => trace.count).reduce((acc, cur) => acc + cur, 0) / this.traceCountTotal;
+      let ratioSum = this.traceList.map(trace => trace.base_count).reduce((acc, cur) => acc + cur, 0) / this.traceCountTotal;
       return this.getPercentLabel(ratioSum)
     },
     chartData: function() {
diff --git a/src/components/Discover/Map/SidebarFilter.vue b/src/components/Discover/Map/SidebarFilter.vue
index 2616d01..91d568c 100644
--- a/src/components/Discover/Map/SidebarFilter.vue
+++ b/src/components/Discover/Map/SidebarFilter.vue
@@ -359,48 +359,48 @@ export default {
      */
     setRule(e) {
       let label, type;
-      const includeStr = e.is_exclude?" Exclude ":" Include ";
+      const includeStr = e.is_exclude? "exclude" : "include";
       let containmentMap = {
-        'occurred-in' : 'Contained in',
-        'started-in' : 'Started in',
-        'completed-in' : 'Ended in',
-        'occurred-around' : 'Active in'
+        'occurred-in' : 'contained in',
+        'started-in' : 'started in',
+        'completed-in' : 'ended in',
+        'occurred-around' : 'active in'
       };
 
       switch(e.type){
         case "contains-task":
-          label = `${includeStr} ${e.task}`
+          label = `${includeStr}, ${e.task}`
           type = "Sequence"
           break
         case "starts-with":
-          label = `Start with ${e.task} ${includeStr}`
+          label = `${includeStr}, start with ${e.task} `
           type = "Sequence"
           break
         case "ends-with":
-          label = `End with ${e.task} ${includeStr}`
+          label = `${includeStr}, end with ${e.task} `
           type = "Sequence"
           break
         case "start-end":
-          label = `Start with ${e.starts_with}, End with ${e.ends_with} ${includeStr}`
+          label = `${includeStr}, start with ${e.starts_with}, end with ${e.ends_with}`
           type = "Sequence"
           break
         case "directly-follows":
-          label = `Directly-follows ${e.task_seq.join(' -> ')}${includeStr}`
+          label = `${includeStr}, directly follows, ${e.task_seq.join(' -> ')}`
           type = "Sequence"
           break
         case "eventually-follows":
-          label = `Eventually-follows ${e.task_seq.join(' -> ')}${includeStr}`
+          label = `${includeStr}, eventually follows, ${e.task_seq.join(' -> ')}`
           type = "Sequence"
           break
         case "occurred-in":
         case "started-in":
         case "completed-in":
         case "occurred-around":
-          label = `${containmentMap[e.type]} from ${getMoment(e.start).format("YYYY-MM-DD HH:mm:ss")} to ${getMoment(e.end).format("YYYY-MM-DD HH:mm:ss")} ${includeStr}`
+          label = `${containmentMap[e.type]}, ${includeStr}, from ${getMoment(e.start).format("YYYY-MM-DD HH:mm:ss")} to ${getMoment(e.end).format("YYYY-MM-DD HH:mm:ss")} `
           type = "Timeframe"
           break
         case "trace-freq":
-          label = `from #${e.lower} to #${e.upper} ${includeStr}`
+          label = `${includeStr}, from #${e.lower} to #${e.upper}`
           type = "Trace"
           break
       };