diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile
index 50b5f7f2b..e360ea76c 100644
--- a/luci-app-passwall2/Makefile
+++ b/luci-app-passwall2/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall2
-PKG_VERSION:=1.21-1
+PKG_VERSION:=1.21-2
 PKG_RELEASE:=
 
 PKG_CONFIG_DEPENDS:= \
diff --git a/luci-app-passwall2/luasrc/passwall2/api.lua b/luci-app-passwall2/luasrc/passwall2/api.lua
index 6bb885a7d..b9a6f11d1 100644
--- a/luci-app-passwall2/luasrc/passwall2/api.lua
+++ b/luci-app-passwall2/luasrc/passwall2/api.lua
@@ -16,6 +16,7 @@ OPENWRT_ARCH = nil
 DISTRIB_ARCH = nil
 
 LOG_FILE = "/tmp/log/passwall2.log"
+CACHE_PATH = "/tmp/etc/passwall2_tmp"
 
 function log(...)
 	local result = os.date("%Y-%m-%d %H:%M:%S: ") .. table.concat({...}, " ")
@@ -921,6 +922,30 @@ function to_move(app_name,file)
 	return {code = 0}
 end
 
+function cacheFileCompareToLogic(file, str)
+	local result = nil
+	if file and str then
+		local file_str = ""
+		if fs.access(file) then
+			file_str = sys.exec("cat " .. file)
+		end
+
+		if file_str ~= str then
+			sys.call("rm -f " .. file)
+			result = false
+		else
+			result = true
+		end
+
+		local f_out = io.open(file, "w")
+		if f_out then
+			f_out:write(str)
+			f_out:close()
+		end
+	end
+	return result
+end
+
 function is_js_luci()
 	return sys.call('[ -f "/www/luci-static/resources/uci.js" ]') == 0
 end
diff --git a/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua b/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua
index b73b5c45b..a070b1929 100644
--- a/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua
+++ b/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua
@@ -5,6 +5,7 @@ local sys = api.sys
 local jsonc = api.jsonc
 local appname = api.appname
 local fs = api.fs
+local CACHE_PATH = api.CACHE_PATH
 
 local new_port
 
@@ -712,6 +713,8 @@ function gen_config(var)
 	local direct_dns_udp_server = var["-direct_dns_udp_server"]
 	local direct_dns_udp_port = var["-direct_dns_udp_port"]
 	local direct_dns_query_strategy = var["-direct_dns_query_strategy"]
+	local direct_ipset = var["-direct_ipset"]
+	local direct_nftset = var["-direct_nftset"]
 	local remote_dns_udp_server = var["-remote_dns_udp_server"]
 	local remote_dns_udp_port = var["-remote_dns_udp_port"]
 	local remote_dns_tcp_server = var["-remote_dns_tcp_server"]
@@ -731,6 +734,8 @@ function gen_config(var)
 	local inbounds = {}
 	local outbounds = {}
 
+	local CACHE_TEXT_FILE = CACHE_PATH .. "/cache_" .. flag .. ".txt"
+
 	local singbox_settings = uci:get_all(appname, "@global_singbox[0]") or {}
 
 	local route = {
@@ -1349,6 +1354,25 @@ function gen_config(var)
 			},
 			outbound = "dns-out"
 		})
+
+		local content = flag .. node_id .. jsonc.stringify(dns)
+		if api.cacheFileCompareToLogic(CACHE_TEXT_FILE, content) == false then
+			--clear ipset/nftset
+			if direct_ipset then
+				string.gsub(direct_ipset, '[^' .. "," .. ']+', function(w)
+					sys.call("ipset -q -F " .. w)
+				end)
+			end
+			if direct_nftset then
+				string.gsub(direct_nftset, '[^' .. "," .. ']+', function(w)
+					local s = string.reverse(w)
+					local _, i = string.find(s, "#")
+					local m = string.len(s) - i + 1
+					local n = w:sub(m + 1)
+					sys.call("nft flush set inet fw4 " .. n .. "2>/dev/null")
+				end)
+			end
+		end
 	end
 	
 	if inbounds or outbounds then
diff --git a/luci-app-passwall2/luasrc/passwall2/util_xray.lua b/luci-app-passwall2/luasrc/passwall2/util_xray.lua
index 89ae42534..ad2510de4 100644
--- a/luci-app-passwall2/luasrc/passwall2/util_xray.lua
+++ b/luci-app-passwall2/luasrc/passwall2/util_xray.lua
@@ -5,6 +5,7 @@ local sys = api.sys
 local jsonc = api.jsonc
 local appname = api.appname
 local fs = api.fs
+local CACHE_PATH = api.CACHE_PATH
 
 local new_port
 
@@ -520,6 +521,8 @@ function gen_config(var)
 	local dns_query_strategy = var["-dns_query_strategy"]
 	local direct_dns_udp_server = var["-direct_dns_udp_server"]
 	local direct_dns_udp_port = var["-direct_dns_udp_port"]
+	local direct_ipset = var["-direct_ipset"]
+	local direct_nftset = var["-direct_nftset"]
 	local remote_dns_udp_server = var["-remote_dns_udp_server"]
 	local remote_dns_udp_port = var["-remote_dns_udp_port"]
 	local remote_dns_fake = var["-remote_dns_fake"]
@@ -537,6 +540,8 @@ function gen_config(var)
 	local routing = nil
 	local observatory = nil
 
+	local CACHE_TEXT_FILE = CACHE_PATH .. "/cache_" .. flag .. ".txt"
+
 	local xray_settings = uci:get_all(appname, "@global_xray[0]") or {}
 
 	local nodes = {}
@@ -1228,6 +1233,25 @@ function gen_config(var)
 		if dns_hosts_len == 0 then
 			dns.hosts = nil
 		end
+
+		local content = flag .. node_id .. jsonc.stringify(dns)
+		if api.cacheFileCompareToLogic(CACHE_TEXT_FILE, content) == false then
+			--clear ipset/nftset
+			if direct_ipset then
+				string.gsub(direct_ipset, '[^' .. "," .. ']+', function(w)
+					sys.call("ipset -q -F " .. w)
+				end)
+			end
+			if direct_nftset then
+				string.gsub(direct_nftset, '[^' .. "," .. ']+', function(w)
+					local s = string.reverse(w)
+					local _, i = string.find(s, "#")
+					local m = string.len(s) - i + 1
+					local n = w:sub(m + 1)
+					sys.call("nft flush set inet fw4 " .. n .. "2>/dev/null")
+				end)
+			end
+		end
 	end
 	
 	if inbounds or outbounds then
diff --git a/luci-app-passwall2/root/usr/share/passwall2/0_default_config b/luci-app-passwall2/root/usr/share/passwall2/0_default_config
index 142563062..41b06348d 100644
--- a/luci-app-passwall2/root/usr/share/passwall2/0_default_config
+++ b/luci-app-passwall2/root/usr/share/passwall2/0_default_config
@@ -74,11 +74,9 @@ config nodes 'myshunt'
 	option DirectGame '_direct'
 	option ProxyGame '_default'
 	option Direct '_direct'
-	option AD 'nil'
-	option BT '_direct'
+	option GooglePlay '_default'
 	option Netflix 'nil'
 	option OpenAI 'nil'
-	option TVB 'nil'
 	option Proxy '_default'
 	option China '_direct'
 	option QUIC '_blackhole'
@@ -175,15 +173,12 @@ cdn-qc.content.steamchina.com
 cdn-ali.content.steamchina.com
 epicgames-download1-1251447533.file.myqcloud.com'
 
-config shunt_rules 'AD'
-	option remarks 'AD'
-	option domain_list 'geosite:category-ads-all'
-	option network 'tcp,udp'
-
-config shunt_rules 'BT'
-	option remarks 'BT'
-	option protocol 'bittorrent'
+config shunt_rules 'GooglePlay'
+	option remarks 'GooglePlay'
 	option network 'tcp,udp'
+	option domain_list 'domain:googleapis.cn
+domain:googleapis.com
+domain:xn--ngstr-lra8j.com'
 
 config shunt_rules 'Netflix'
 	option remarks 'Netflix'
@@ -192,14 +187,8 @@ config shunt_rules 'Netflix'
 	
 config shunt_rules 'OpenAI'
 	option remarks 'OpenAI'
-	option domain_list 'geosite:openai'
-
-config shunt_rules 'TVB'
-	option remarks 'TVB'
 	option network 'tcp,udp'
-	option domain_list 'geosite:tvb
-geosite:mytvsuper
-'
+	option domain_list 'geosite:openai'
 
 config shunt_rules 'Proxy'
 	option network 'tcp,udp'
diff --git a/luci-app-passwall2/root/usr/share/passwall2/app.sh b/luci-app-passwall2/root/usr/share/passwall2/app.sh
index 3eb36d406..37fd168ad 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/app.sh
+++ b/luci-app-passwall2/root/usr/share/passwall2/app.sh
@@ -393,6 +393,8 @@ run_xray() {
 		[ -n "$dns_cache" ] && _extra_param="${_extra_param} -dns_cache ${dns_cache}"
 		_extra_param="${_extra_param} -dns_query_strategy UseIP"
 		_extra_param="${_extra_param} -direct_dns_udp_port ${direct_dnsmasq_listen_port} -direct_dns_udp_server 127.0.0.1"
+		[ -n "${direct_ipset}" ] && _extra_param="${_extra_param} -direct_ipset ${direct_ipset}"
+		[ -n "${direct_nftset}" ] && _extra_param="${_extra_param} -direct_nftset ${direct_nftset}"
 		_extra_param="${_extra_param} -remote_dns_udp_port ${dns_remote_listen_port} -remote_dns_udp_server 127.0.0.1"
 		[ "$remote_fakedns" = "1" ] && _extra_param="${_extra_param} -remote_dns_fake 1 -remote_dns_fake_strategy ${remote_dns_query_strategy}"
 	}
@@ -472,6 +474,8 @@ run_singbox() {
 		run_ipset_dnsmasq listen_port=${direct_dnsmasq_listen_port} server_dns=127.0.0.1#${dns_direct_listen_port} ipset="${direct_ipset}" nftset="${direct_nftset}" config_file=${direct_ipset_conf}
 		
 		_extra_param="${_extra_param} -direct_dns_udp_port ${direct_dnsmasq_listen_port} -direct_dns_udp_server 127.0.0.1 -direct_dns_query_strategy ${direct_dns_query_strategy}"
+		[ -n "${direct_ipset}" ] && _extra_param="${_extra_param} -direct_ipset ${direct_ipset}"
+		[ -n "${direct_nftset}" ] && _extra_param="${_extra_param} -direct_nftset ${direct_nftset}"
 
 		case "$remote_dns_protocol" in
 			udp)
diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile
index 9ad23e9ca..356316f4f 100644
--- a/v2ray-geodata/Makefile
+++ b/v2ray-geodata/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-3.0-only
 #
-# Copyright (C) 2021-2023 ImmortalWrt.org
+# Copyright (C) 2021-2022 ImmortalWrt.org
 
 include $(TOPDIR)/rules.mk
 
@@ -12,22 +12,31 @@ PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 
 include $(INCLUDE_DIR)/package.mk
 
-GEOIP_VER:=202310050037
+GEOIP_VER:=202310050037
 GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
 define Download/geoip
   URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
   URL_FILE:=geoip.dat
   FILE:=$(GEOIP_FILE)
-  HASH:=25e8fd3517988781e0a901c1d29dd35bed1aabed6343647c76206161e49fa1f4
+  HASH:=25e8fd3517988781e0a901c1d29dd35bed1aabed6343647c76206161e49fa1f4
 endef
 
-GEOSITE_VER:=20231005164032
+GEOSITE_VER:=20231009173428
 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
 define Download/geosite
   URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
   URL_FILE:=dlc.dat
   FILE:=$(GEOSITE_FILE)
-  HASH:=84471ed11bb9667fe58876cfa5bf410eafe63c29b609ebd36d2afe83d8dd5b99
+  HASH:=844d267aeb997561e1ef4dd9f7a62c5a3c64889af6fd45efab875cebbc5fd63b
+endef
+
+GEOSITE_IRAN_VER:=202310090024
+GEOSITE_IRAN_FILE:=iran.dat.$(GEOSITE_IRAN_VER)
+define Download/geosite-ir
+  URL:=https://github.com/bootmortis/iran-hosted-domains/releases/download/$(GEOSITE_IRAN_VER)/
+  URL_FILE:=iran.dat
+  FILE:=$(GEOSITE_IRAN_FILE)
+  HASH:=b44305363d07d6b0a014c7b1635f120aa6d951eae3097f16b3298511e9dab385
 endef
 
 define Package/v2ray-geodata/template
@@ -52,6 +61,14 @@ define Package/v2ray-geosite
   LICENSE:=MIT
 endef
 
+define Package/v2ray-geosite-ir
+  $(call Package/v2ray-geodata/template)
+  TITLE:=Iran Geosite List for V2Ray
+  PROVIDES:=xray-geosite-ir
+  VERSION:=$(GEOSITE_IRAN_VER)-$(PKG_RELEASE)
+  LICENSE:=MIT
+endef
+
 define Build/Prepare
 	$(call Build/Prepare/Default)
 ifneq ($(CONFIG_PACKAGE_v2ray-geoip),)
@@ -60,6 +77,9 @@ endif
 ifneq ($(CONFIG_PACKAGE_v2ray-geosite),)
 	$(call Download,geosite)
 endif
+ifneq ($(CONFIG_PACKAGE_v2ray-geosite-ir),)
+	$(call Download,geosite-ir)
+endif
 endef
 
 define Build/Compile
@@ -75,5 +95,12 @@ define Package/v2ray-geosite/install
 	$(INSTALL_DATA) $(DL_DIR)/$(GEOSITE_FILE) $(1)/usr/share/v2ray/geosite.dat
 endef
 
+define Package/v2ray-geosite-ir/install
+	$(INSTALL_DIR) $(1)/usr/share/v2ray $(1)/usr/share/xray
+	$(INSTALL_DATA) $(DL_DIR)/$(GEOSITE_IRAN_FILE) $(1)/usr/share/v2ray/iran.dat
+	$(LN) ../v2ray/iran.dat $(1)/usr/share/xray/iran.dat
+endef
+
 $(eval $(call BuildPackage,v2ray-geoip))
 $(eval $(call BuildPackage,v2ray-geosite))
+$(eval $(call BuildPackage,v2ray-geosite-ir))