diff --git a/data/apple b/data/apple
index f2c5ab58..f83d15b5 100644
--- a/data/apple
+++ b/data/apple
@@ -737,47 +737,47 @@ xn--kput3imi374g.xn--hxt814e # 苹果手机.网店
 xn--ohq11k7pl25iyo8a.cn @cn # 苹果专卖店.cn
 xn--ruq8a011kt6y.xn--hxt814e # 苹果保修.网店
 
-full:apple.com.akadns.net
-full:courier-push-apple.com.akadns.net
-full:push-apple.com.akadns.net
+apple.com.akadns.net
+courier-push-apple.com.akadns.net
+push-apple.com.akadns.net
 
 # Domains and services below are available in China mainland
 # Use in config file like this: "geosite:apple@cn"
-full:amp-api-search-edge.apps.apple.com @cn
-full:amp-api.apps.apple.com @cn
-full:aod.itunes.apple.com @cn
-full:api-edge.apps.apple.com @cn
-full:apptrailers.itunes.apple.com @cn
-full:bag.itunes.apple.com @cn
-full:bookkeeper.itunes.apple.com @cn
-full:client-api.itunes.apple.com @cn
-full:cma.itunes.apple.com @cn
-full:communities.apple.com @cn
-full:discussionschinese.apple.com @cn
-full:downloaddispatch.itunes.apple.com @cn
-full:fides-pol.apple.com @cn
-full:gspe11-2-cn-ssl.ls.apple.com @cn
-full:gspe12-cn-ssl.ls.apple.com @cn
-full:gspe85-cn-ssl.ls.apple.com @cn
-full:init.itunes.apple.com @cn
-full:iosapps.itunes.apple.com @cn
-full:js-cdn.music.apple.com @cn
-full:km.support.apple.com @cn
-full:maps.apple.com @cn
-full:osxapps.itunes.apple.com @cn
-full:pd.itunes.apple.com @cn
-full:play.itunes.apple.com @cn
-full:se-edge.itunes.apple.com @cn
-full:se2.itunes.apple.com @cn
-full:search.itunes.apple.com @cn
-full:sf-api-token-service.itunes.apple.com @cn
-full:sp.itunes.apple.com @cn
-full:stocks-sparkline.apple.com @cn
-full:streamingaudio.itunes.apple.com @cn
-full:su.itunes.apple.com @cn
-full:sync.itunes.apple.com @cn
-full:upp.itunes.apple.com @cn
-full:weather-data.apple.com @cn
+amp-api-search-edge.apps.apple.com @cn
+amp-api.apps.apple.com @cn
+aod.itunes.apple.com @cn
+api-edge.apps.apple.com @cn
+apptrailers.itunes.apple.com @cn
+bag.itunes.apple.com @cn
+bookkeeper.itunes.apple.com @cn
+client-api.itunes.apple.com @cn
+cma.itunes.apple.com @cn
+communities.apple.com @cn
+discussionschinese.apple.com @cn
+downloaddispatch.itunes.apple.com @cn
+fides-pol.apple.com @cn
+gspe11-2-cn-ssl.ls.apple.com @cn
+gspe12-cn-ssl.ls.apple.com @cn
+gspe85-cn-ssl.ls.apple.com @cn
+init.itunes.apple.com @cn
+iosapps.itunes.apple.com @cn
+js-cdn.music.apple.com @cn
+km.support.apple.com @cn
+maps.apple.com @cn
+osxapps.itunes.apple.com @cn
+pd.itunes.apple.com @cn
+play.itunes.apple.com @cn
+se-edge.itunes.apple.com @cn
+se2.itunes.apple.com @cn
+search.itunes.apple.com @cn
+sf-api-token-service.itunes.apple.com @cn
+sp.itunes.apple.com @cn
+stocks-sparkline.apple.com @cn
+streamingaudio.itunes.apple.com @cn
+su.itunes.apple.com @cn
+sync.itunes.apple.com @cn
+upp.itunes.apple.com @cn
+weather-data.apple.com @cn
 
 regexp:^a[1-5]\.mzstatic\.com$ @cn
 regexp:^cdn(-cn)?[1-4]?\.apple-mapkit\.com$ @cn
@@ -789,124 +789,124 @@ regexp:^s[1-5]?\.mzstatic\.com$ @cn
 # The rules below are from https://github.com/felixonmars/dnsmasq-china-list/blob/master/apple.china.conf
 # Revision: e2c83d8e94b77b4eb9babb026b454f6f4bfd2cce
 # Use in config file like this: "geosite:apple@cn"
-full:a1.mzstatic.com @cn
-full:a2.mzstatic.com @cn
-full:a3.mzstatic.com @cn
-full:a4.mzstatic.com @cn
-full:a5.mzstatic.com @cn
-full:adcdownload.apple.com.akadns.net @cn
-full:adcdownload.apple.com @cn
-full:appldnld.apple.com @cn
-full:appldnld.g.aaplimg.com @cn
-full:apps.mzstatic.com @cn
-full:api-cn.apple-mapkit.com @cn
-full:cdn-cn1.apple-mapkit.com @cn
-full:cdn-cn2.apple-mapkit.com @cn
-full:cdn-cn3.apple-mapkit.com @cn
-full:cdn-cn4.apple-mapkit.com @cn
-full:cdn.apple-mapkit.com @cn
-full:cdn1.apple-mapkit.com @cn
-full:cdn2.apple-mapkit.com @cn
-full:cdn3.apple-mapkit.com @cn
-full:cdn4.apple-mapkit.com @cn
-full:cds-cdn.v.aaplimg.com @cn
-full:cds.apple.com.akadns.net @cn
-full:cds.apple.com @cn
-full:cl1-cdn.origin-apple.com.akadns.net @cn
-full:cl1.apple.com @cn
-full:cl2-cn.apple.com @cn
-full:cl2.apple.com.edgekey.net.globalredir.akadns.net @cn
-full:cl2.apple.com @cn
-full:cl3-cdn.origin-apple.com.akadns.net @cn
-full:cl3.apple.com @cn
-full:cl4-cdn.origin-apple.com.akadns.net @cn
-full:cl4-cn.apple.com @cn
-full:cl4.apple.com @cn
-full:cl5-cdn.origin-apple.com.akadns.net @cn
-full:cl5.apple.com @cn
-full:clientflow.apple.com.akadns.net @cn
-full:clientflow.apple.com @cn
-full:configuration.apple.com.akadns.net @cn
-full:configuration.apple.com @cn
-full:cstat.apple.com @cn
-full:dd-cdn.origin-apple.com.akadns.net @cn
-full:download.developer.apple.com @cn
-full:gs-loc-cn.apple.com @cn
-full:gs-loc.apple.com @cn
-full:gsp10-ssl-cn.ls.apple.com @cn
-full:gsp11-cn.ls.apple.com @cn
-full:gsp12-cn.ls.apple.com @cn
-full:gsp13-cn.ls.apple.com @cn
-full:gsp4-cn.ls.apple.com.edgekey.net.globalredir.akadns.net @cn
-full:gsp4-cn.ls.apple.com.edgekey.net @cn
-full:gsp4-cn.ls.apple.com @cn
-full:gsp5-cn.ls.apple.com @cn
-full:gsp85-cn-ssl.ls.apple.com @cn
-full:gspe19-cn-ssl.ls.apple.com @cn
-full:gspe19-cn.ls-apple.com.akadns.net @cn
-full:gspe19-cn.ls.apple.com @cn
-full:gspe21-ssl.ls.apple.com @cn
-full:gspe21.ls.apple.com @cn
-full:gspe35-ssl.ls.apple.com @cn
-full:iadsdk.apple.com @cn
-full:icloud-cdn.icloud.com.akadns.net @cn
-full:icloud.cdn-apple.com @cn
-full:images.apple.com.akadns.net @cn
-full:images.apple.com.edgekey.net.globalredir.akadns.net @cn
-full:images.apple.com @cn
-full:init-p01md-lb.push-apple.com.akadns.net @cn
-full:init-p01md.apple.com @cn
-full:init-p01st-lb.push-apple.com.akadns.net @cn
-full:init-p01st.push.apple.com @cn
-full:init-s01st-lb.push-apple.com.akadns.net @cn
-full:init-s01st.push.apple.com @cn
-full:iosapps.itunes.g.aaplimg.com @cn
-full:iphone-ld.apple.com @cn
-full:is1-ssl.mzstatic.com @cn
-full:is1.mzstatic.com @cn
-full:is2-ssl.mzstatic.com @cn
-full:is2.mzstatic.com @cn
-full:is3-ssl.mzstatic.com @cn
-full:is3.mzstatic.com @cn
-full:is4-ssl.mzstatic.com @cn
-full:is4.mzstatic.com @cn
-full:is5-ssl.mzstatic.com @cn
-full:is5.mzstatic.com @cn
-full:itunes-apple.com.akadns.net @cn
-full:itunes.apple.com @cn
-full:itunesconnect.apple.com @cn
-full:mesu-cdn.apple.com.akadns.net @cn
-full:mesu-china.apple.com.akadns.net @cn
-full:mesu.apple.com @cn
-full:music.apple.com @cn
-full:oscdn.apple.com @cn
-full:oscdn.origin-apple.com.akadns.net @cn
-full:pancake.apple.com @cn
-full:pancake.cdn-apple.com.akadns.net @cn
-full:phobos.apple.com @cn
-full:prod-support.apple-support.akadns.net @cn
-full:reserve-prime.apple.com @cn
-full:s.mzstatic.com @cn
-full:stocks-sparkline-lb.apple.com.akadns.net @cn
-full:store.apple.com.edgekey.net.globalredir.akadns.net @cn
-full:store.apple.com.edgekey.net @cn
-full:store.apple.com @cn
-full:store.storeimages.apple.com.akadns.net @cn
-full:store.storeimages.cdn-apple.com @cn
-full:support-china.apple-support.akadns.net @cn
-full:support.apple.com @cn
-full:swcatalog-cdn.apple.com.akadns.net @cn
-full:swcatalog.apple.com @cn
-full:swcdn.apple.com @cn
-full:swcdn.g.aaplimg.com @cn
-full:swdist.apple.com.akadns.net @cn
-full:swdist.apple.com @cn
-full:swscan-cdn.apple.com.akadns.net @cn
-full:swscan.apple.com @cn
-full:updates-http.cdn-apple.com.akadns.net @cn
-full:updates-http.cdn-apple.com @cn
-full:valid.apple.com @cn
-full:valid.origin-apple.com.akadns.net @cn
-full:www.apple.com.edgekey.net.globalredir.akadns.net @cn
-full:www.apple.com.edgekey.net @cn
-full:www.apple.com @cn
+a1.mzstatic.com @cn
+a2.mzstatic.com @cn
+a3.mzstatic.com @cn
+a4.mzstatic.com @cn
+a5.mzstatic.com @cn
+adcdownload.apple.com.akadns.net @cn
+adcdownload.apple.com @cn
+appldnld.apple.com @cn
+appldnld.g.aaplimg.com @cn
+apps.mzstatic.com @cn
+api-cn.apple-mapkit.com @cn
+cdn-cn1.apple-mapkit.com @cn
+cdn-cn2.apple-mapkit.com @cn
+cdn-cn3.apple-mapkit.com @cn
+cdn-cn4.apple-mapkit.com @cn
+cdn.apple-mapkit.com @cn
+cdn1.apple-mapkit.com @cn
+cdn2.apple-mapkit.com @cn
+cdn3.apple-mapkit.com @cn
+cdn4.apple-mapkit.com @cn
+cds-cdn.v.aaplimg.com @cn
+cds.apple.com.akadns.net @cn
+cds.apple.com @cn
+cl1-cdn.origin-apple.com.akadns.net @cn
+cl1.apple.com @cn
+cl2-cn.apple.com @cn
+cl2.apple.com.edgekey.net.globalredir.akadns.net @cn
+cl2.apple.com @cn
+cl3-cdn.origin-apple.com.akadns.net @cn
+cl3.apple.com @cn
+cl4-cdn.origin-apple.com.akadns.net @cn
+cl4-cn.apple.com @cn
+cl4.apple.com @cn
+cl5-cdn.origin-apple.com.akadns.net @cn
+cl5.apple.com @cn
+clientflow.apple.com.akadns.net @cn
+clientflow.apple.com @cn
+configuration.apple.com.akadns.net @cn
+configuration.apple.com @cn
+cstat.apple.com @cn
+dd-cdn.origin-apple.com.akadns.net @cn
+download.developer.apple.com @cn
+gs-loc-cn.apple.com @cn
+gs-loc.apple.com @cn
+gsp10-ssl-cn.ls.apple.com @cn
+gsp11-cn.ls.apple.com @cn
+gsp12-cn.ls.apple.com @cn
+gsp13-cn.ls.apple.com @cn
+gsp4-cn.ls.apple.com.edgekey.net.globalredir.akadns.net @cn
+gsp4-cn.ls.apple.com.edgekey.net @cn
+gsp4-cn.ls.apple.com @cn
+gsp5-cn.ls.apple.com @cn
+gsp85-cn-ssl.ls.apple.com @cn
+gspe19-cn-ssl.ls.apple.com @cn
+gspe19-cn.ls-apple.com.akadns.net @cn
+gspe19-cn.ls.apple.com @cn
+gspe21-ssl.ls.apple.com @cn
+gspe21.ls.apple.com @cn
+gspe35-ssl.ls.apple.com @cn
+iadsdk.apple.com @cn
+icloud-cdn.icloud.com.akadns.net @cn
+icloud.cdn-apple.com @cn
+images.apple.com.akadns.net @cn
+images.apple.com.edgekey.net.globalredir.akadns.net @cn
+images.apple.com @cn
+init-p01md-lb.push-apple.com.akadns.net @cn
+init-p01md.apple.com @cn
+init-p01st-lb.push-apple.com.akadns.net @cn
+init-p01st.push.apple.com @cn
+init-s01st-lb.push-apple.com.akadns.net @cn
+init-s01st.push.apple.com @cn
+iosapps.itunes.g.aaplimg.com @cn
+iphone-ld.apple.com @cn
+is1-ssl.mzstatic.com @cn
+is1.mzstatic.com @cn
+is2-ssl.mzstatic.com @cn
+is2.mzstatic.com @cn
+is3-ssl.mzstatic.com @cn
+is3.mzstatic.com @cn
+is4-ssl.mzstatic.com @cn
+is4.mzstatic.com @cn
+is5-ssl.mzstatic.com @cn
+is5.mzstatic.com @cn
+itunes-apple.com.akadns.net @cn
+itunes.apple.com @cn
+itunesconnect.apple.com @cn
+mesu-cdn.apple.com.akadns.net @cn
+mesu-china.apple.com.akadns.net @cn
+mesu.apple.com @cn
+music.apple.com @cn
+oscdn.apple.com @cn
+oscdn.origin-apple.com.akadns.net @cn
+pancake.apple.com @cn
+pancake.cdn-apple.com.akadns.net @cn
+phobos.apple.com @cn
+prod-support.apple-support.akadns.net @cn
+reserve-prime.apple.com @cn
+s.mzstatic.com @cn
+stocks-sparkline-lb.apple.com.akadns.net @cn
+store.apple.com.edgekey.net.globalredir.akadns.net @cn
+store.apple.com.edgekey.net @cn
+store.apple.com @cn
+store.storeimages.apple.com.akadns.net @cn
+store.storeimages.cdn-apple.com @cn
+support-china.apple-support.akadns.net @cn
+support.apple.com @cn
+swcatalog-cdn.apple.com.akadns.net @cn
+swcatalog.apple.com @cn
+swcdn.apple.com @cn
+swcdn.g.aaplimg.com @cn
+swdist.apple.com.akadns.net @cn
+swdist.apple.com @cn
+swscan-cdn.apple.com.akadns.net @cn
+swscan.apple.com @cn
+updates-http.cdn-apple.com.akadns.net @cn
+updates-http.cdn-apple.com @cn
+valid.apple.com @cn
+valid.origin-apple.com.akadns.net @cn
+www.apple.com.edgekey.net.globalredir.akadns.net @cn
+www.apple.com.edgekey.net @cn
+www.apple.com @cn