diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json
index 7cd2d89a04..9fd192a912 100644
--- a/app/script/flavorfilter/flavors.json
+++ b/app/script/flavorfilter/flavors.json
@@ -7,7 +7,7 @@
       "driver": ["ochFT"]
     },
     "shuttle" :{
-      "driver": ["ochJL"],
+      "driver": ["ochJL","ochM2"],
       "passenger": ["ochJL","ochM2"]
     },
     "taxi" :{
@@ -26,25 +26,16 @@
     }
   },
   "dali": {
-    "noop" : null,
-    "sweeper" :null,
     "shuttle" :{
       "driver": ["ochJL","ochM2"],
       "passenger": ["ochJL","ochM2"]
     },
-    "taxi" :null,
-    "bus" :{
-      "driver": null,
-      "driverpassenger": null,
-      "passenger": null
-    },
     "charter" :{
       "driver": ["ochM1"],
       "passenger": ["ochM1"]
     }
   },
   "yantai": {
-    "noop" :null,
     "sweeper" :{
       "driver": ["ochFT"]
     },
@@ -52,8 +43,6 @@
       "driver": ["ochJL","ochM2"],
       "passenger": ["ochJL","ochM2"]
     },
-    "taxi" :null,
-    "bus" :null,
     "charter" :{
       "driver": ["ochM1"],
       "passenger": ["ochM1"]