diff --git a/data/alibaba b/data/alibaba
index b651da48..84e85958 100644
--- a/data/alibaba
+++ b/data/alibaba
@@ -11,10 +11,10 @@ taobao
 tmall
 
 include:9game
-include:alibaba-ads
 include:alibabacloud
 include:aliyun
 include:aliyun-drive
+include:amap
 include:cainiao
 include:dingtalk
 include:eleme
@@ -196,9 +196,6 @@ fliggy.com
 fliggy.hk @!cn
 iuynfg.com
 
-# 高德地图
-include:amap
-
 # 虾米音乐
 xiami.com
 xiami.fm
@@ -228,3 +225,29 @@ lydaas.net
 lydass.cn
 lydass.com.cn
 lydass.net
+
+# Ads/tracking
+a.alimama.cn @ads
+adash-c.m.taobao.com @ads
+adash-c.ut.taobao.com @ads
+adash.m.taobao.com @ads
+adashbc.m.taobao.com @ads
+adashbc.ut.taobao.com @ads
+adashx.m.taobao.com @ads
+adashx4ae.ut.taobao.com @ads
+adashx4yt.m.taobao.com @ads
+adashxgc.ut.taobao.com @ads
+adsh.m.taobao.com @ads
+adtrack.quark.cn @ads
+c-adash.m.taobao.com @ads
+fourier.taobao.com @ads
+g.click.taobao.com @ads
+h-adashx.ut.taobao.com @ads
+h-adashx4yt.ut.taobao.com @ads
+m-adash.m.taobao.com @ads
+marketing.alibaba.com @ads
+nbsdk-baichuan.taobao.com @ads
+retcode.taobao.com @ads
+tns.simba.taobao.com @ads
+track.lc.quark.cn @ads
+v6-adashx.ut.taobao.com @ads
diff --git a/data/alibaba-ads b/data/alibaba-ads
deleted file mode 100644
index 7a7821bf..00000000
--- a/data/alibaba-ads
+++ /dev/null
@@ -1,43 +0,0 @@
-include:amap-ads
-include:youku-ads
-
-a.alimama.cn @ads
-acjs.aliyun.com @ads
-adash-c.m.taobao.com @ads
-adash-c.ut.taobao.com @ads
-adash-emas.cn-hangzhou.aliyuncs.com @ads
-adash.m.taobao.com @ads
-adash.man.aliyuncs.com @ads
-adashbc.m.taobao.com @ads
-adashbc.ut.taobao.com @ads
-adashx.m.taobao.com @ads
-adashx.ut.ele.me @ads
-adashx4ae.ut.taobao.com @ads
-adashx4yt.m.taobao.com @ads
-adashxgc.ut.taobao.com @ads
-ads.uc.cn @ads
-adsh.m.taobao.com @ads
-adslot.uc.cn @ads
-adtrack.quark.cn @ads
-alimama.alicdn.com @ads
-atanx.alicdn.com @ads
-atanx2.alicdn.com @ads
-baichuan-sdk.alicdn.com @ads
-c-adash.m.taobao.com @ads
-fourier.taobao.com @ads
-g.click.taobao.com @ads
-h-adashx.ut.ele.me @ads
-h-adashx.ut.taobao.com @ads
-h-adashx4yt.ut.taobao.com @ads
-log.umtrack.com @ads
-m-adash.m.taobao.com @ads
-marketing.alibaba.com @ads
-nbsdk-baichuan.alicdn.com @ads
-nbsdk-baichuan.taobao.com @ads
-retcode.taobao.com @ads
-tce.alicdn.com @ads
-tns.simba.taobao.com @ads
-track.lc.quark.cn @ads
-v6-adashx.ut.cainiao.com @ads
-v6-adashx.ut.ele.me @ads
-v6-adashx.ut.taobao.com @ads
diff --git a/data/aliyun b/data/aliyun
index a731579d..69511b6f 100644
--- a/data/aliyun
+++ b/data/aliyun
@@ -67,3 +67,14 @@ oss-eu-west-1.aliyuncs.com @!cn
 oss-me-east-1.aliyuncs.com @!cn
 oss-us-east-1.aliyuncs.com @!cn
 oss-us-west-1.aliyuncs.com @!cn
+
+# Ads/tracking
+acjs.aliyun.com @ads
+adash-emas.cn-hangzhou.aliyuncs.com @ads
+adash.man.aliyuncs.com @ads
+alimama.alicdn.com @ads
+atanx.alicdn.com @ads
+atanx2.alicdn.com @ads
+baichuan-sdk.alicdn.com @ads
+nbsdk-baichuan.alicdn.com @ads
+tce.alicdn.com @ads
diff --git a/data/amap b/data/amap
index dc951951..dab2c323 100644
--- a/data/amap
+++ b/data/amap
@@ -1,5 +1,3 @@
-include:amap-ads
-
 a-map.cn
 a-map.co
 a-map.link
@@ -10,3 +8,10 @@ amapauto.com
 anav.com
 autonavi.com
 gaode.com
+
+# Ads/tracking
+adashx.ut.amap.com @ads
+dualstack-logs.amap.com @ads
+logs.amap.com @ads
+optimus-ads.amap.com @ads
+v6-adashx.ut.amap.com @ads
diff --git a/data/amap-ads b/data/amap-ads
deleted file mode 100644
index 46681dbc..00000000
--- a/data/amap-ads
+++ /dev/null
@@ -1,5 +0,0 @@
-adashx.ut.amap.com @ads
-dualstack-logs.amap.com @ads
-logs.amap.com @ads
-optimus-ads.amap.com @ads
-v6-adashx.ut.amap.com @ads
diff --git a/data/cainiao b/data/cainiao
index 65006845..df376b19 100644
--- a/data/cainiao
+++ b/data/cainiao
@@ -3,3 +3,6 @@ cainiao.com
 cainiao.com.cn
 cainiaoyizhan.com
 guoguo-app.com
+
+# Ads/tracking
+v6-adashx.ut.cainiao.com @ads
diff --git a/data/category-ads b/data/category-ads
index 84b8be6d..24cd219b 100644
--- a/data/category-ads
+++ b/data/category-ads
@@ -2,7 +2,7 @@
 
 include:acfun @ads
 include:adobe @ads
-include:alibaba-ads
+include:alibaba @ads
 include:amazon-ads
 include:apple-ads
 include:baidu-ads
@@ -40,7 +40,6 @@ include:television-ads
 include:tencent-ads
 include:tendcloud @ads
 include:twitter @ads
-include:umeng-ads
 include:unity @ads
 include:unitychina @ads
 include:xhamster-ads
diff --git a/data/eleme b/data/eleme
index ae32b8de..c34814a5 100644
--- a/data/eleme
+++ b/data/eleme
@@ -6,3 +6,8 @@ eleme.io
 elemecdn.cn
 elemecdn.com
 elenet.me
+
+# Ads/tracking
+adashx.ut.ele.me @ads
+h-adashx.ut.ele.me @ads
+v6-adashx.ut.ele.me @ads
diff --git a/data/uc b/data/uc
index e6f5d9dc..2e8cc1d6 100644
--- a/data/uc
+++ b/data/uc
@@ -2,3 +2,7 @@ uc.cn
 uc123.com
 ucweb.com
 uczzd.cn
+
+# Ads/tracking
+ads.uc.cn @ads
+adslot.uc.cn @ads
diff --git a/data/umeng b/data/umeng
index d25b3f07..cbbc3f71 100644
--- a/data/umeng
+++ b/data/umeng
@@ -1,5 +1,3 @@
-include:umeng-ads
-
 cnzz.com
 mobmore.com
 puata.info
@@ -10,3 +8,31 @@ umsns.com
 umtrack.com
 uyunad.com
 whalecloud.com
+
+# Ads/tracking
+aaid.umeng.com @ads
+alog.umeng.com @ads
+alog.umengcloud.com @ads
+alogs.umeng.com @ads
+alogus.umeng.com @ads
+ar.umeng.com @ads
+aspect-upush.umeng.com @ads
+audid.umeng.com @ads
+ccs.umeng.com @ads
+cnlogs.umeng.com @ads
+cnlogs.umengcloud.com @ads
+log.umtrack.com @ads
+new-aaid.umeng.com @ads
+new-aaid.umeng.com.gds.alibabadns.com @ads
+oc.umeng.com @ads
+plbslog.umeng.com @ads
+resolve.umeng.com @ads
+ulogs.umeng.com @ads
+ulogs.umengcloud.com @ads
+utoken.umeng.com @ads
+w.cnzz.com @ads
+z.gds.cnzz.com @ads
+
+# https://github.com/TG-Twilight/AWAvenue-Ads-Rule/issues/185
+# errlog.umeng.com @ads
+# errnewlog.umeng.com @ads
diff --git a/data/umeng-ads b/data/umeng-ads
deleted file mode 100644
index 52303be0..00000000
--- a/data/umeng-ads
+++ /dev/null
@@ -1,26 +0,0 @@
-aaid.umeng.com @ads
-alog.umeng.com @ads
-alog.umengcloud.com @ads
-alogs.umeng.com @ads
-alogus.umeng.com @ads
-ar.umeng.com @ads
-aspect-upush.umeng.com @ads
-audid.umeng.com @ads
-ccs.umeng.com @ads
-cnlogs.umeng.com @ads
-cnlogs.umengcloud.com @ads
-# https://github.com/TG-Twilight/AWAvenue-Ads-Rule/issues/185
-# errlog.umeng.com @ads
-# errnewlog.umeng.com @ads
-new-aaid.umeng.com @ads
-new-aaid.umeng.com.gds.alibabadns.com @ads
-oc.umeng.com @ads
-plbslog.umeng.com @ads
-resolve.umeng.com @ads
-ulogs.umeng.com @ads
-ulogs.umengcloud.com @ads
-utoken.umeng.com @ads
-
-# CNZZ
-w.cnzz.com @ads
-z.gds.cnzz.com @ads
diff --git a/data/youku b/data/youku
index 79fc486d..c7d46900 100644
--- a/data/youku
+++ b/data/youku
@@ -10,3 +10,26 @@ soku.com
 
 # youku video cdn
 cibntv.net
+
+# Ads/tracking
+ad.api.3g.youku.com @ads
+ad.api.mobile.youku.com @ads
+ad.mobile.youku.com @ads
+adashx.ut.youku.com @ads
+atm.youku.com @ads
+e.stat.ykimg.com @ads
+ems.youku.com @ads
+guanggaoad.youku.com @ads
+h-adashx.ut.youku.com @ads
+lstat.youku.com @ads
+mobilemsg.youku.com @ads
+msg.youku.com @ads
+p-log.ykimg.com @ads
+passport-log.youku.com @ads
+pl.youku.com @ads
+s-adashx.ut.youku.com @ads
+stat.youku.com @ads
+statis.api.3g.youku.com @ads
+v6-adashx.ut.youku.com @ads
+yk-ssp.ad.youku.com @ads
+ykad-data.youku.com @ads
diff --git a/data/youku-ads b/data/youku-ads
deleted file mode 100644
index 1f4f07d6..00000000
--- a/data/youku-ads
+++ /dev/null
@@ -1,21 +0,0 @@
-ad.api.3g.youku.com @ads
-ad.api.mobile.youku.com @ads
-ad.mobile.youku.com @ads
-adashx.ut.youku.com @ads
-atm.youku.com @ads
-e.stat.ykimg.com @ads
-ems.youku.com @ads
-guanggaoad.youku.com @ads
-h-adashx.ut.youku.com @ads
-lstat.youku.com @ads
-mobilemsg.youku.com @ads
-msg.youku.com @ads
-p-log.ykimg.com @ads
-passport-log.youku.com @ads
-pl.youku.com @ads
-s-adashx.ut.youku.com @ads
-stat.youku.com @ads
-statis.api.3g.youku.com @ads
-v6-adashx.ut.youku.com @ads
-yk-ssp.ad.youku.com @ads
-ykad-data.youku.com @ads