diff --git a/luci-app-godproxy/rulesupdate.log b/luci-app-godproxy/rulesupdate.log
index 7f2b22825..ac3792f5e 100644
--- a/luci-app-godproxy/rulesupdate.log
+++ b/luci-app-godproxy/rulesupdate.log
@@ -1,41 +1,44 @@
-2021-11-19 00:33:28: ------------------- 规则更新 -----------------------
-2021-11-19 00:33:28: ====================================================
-2021-11-19 00:33:28: 开始更新koolproxy的规则，请等待...
-2021-11-19 00:33:28:  ---------------------------------------------------------------------------------------
-2021-11-19 00:33:29: ABP规则的本地版本号：
-2021-11-19 00:33:29: ABP规则的在线版本号： 202111190026
-2021-11-19 00:33:29: 检测到 ABP规则 已更新，现在开始更新...
-2021-11-19 00:33:29: 将临时的ABP规则文件移动到指定位置
-2021-11-19 00:33:29:  ---------------------------------------------------------------------------------------
-2021-11-19 00:33:30: Fanboy规则本地版本号： 202111181600
-2021-11-19 00:33:30: Fanboy规则在线版本号： 202111190000
-2021-11-19 00:33:30: 检测到新版本 Fanboy规则 列表，开始更新...
-2021-11-19 00:33:30: 将临时文件覆盖到原始 Fanboy规则 文件
-2021-11-19 00:33:30:  ---------------------------------------------------------------------------------------
-2021-11-19 00:33:31: Yhosts规则本地版本号： 202111082343
-2021-11-19 00:33:31: Yhosts规则在线版本号： 202111082343
-2021-11-19 00:33:31: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊!
-2021-11-19 00:33:31:  ---------------------------------------------------------------------------------------
-2021-11-19 00:33:31: Antiad规则本地版本号： 20211117023854
-2021-11-19 00:33:31: Antiad规则在线版本号： 20211117023854
-2021-11-19 00:33:31: 检测到 Antiad规则 本地版本号和在线版本号相同，那还更新个毛啊!
-2021-11-19 00:33:31:  ---------------------------------------------------------------------------------------
-2021-11-19 00:33:31: StevenBlack规则本地版本号： 18 November 2021
-2021-11-19 00:33:31: StevenBlack规则在线版本号： 18 November 2021
-2021-11-19 00:33:31: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊!
-2021-11-19 00:33:31: 正在优化 ABP规则。。。。。
-2021-11-19 00:33:35: 正在优化 Fanboy规则。。。。。
-2021-11-19 00:33:39: 跳过优化 补充规则Yhosts。。。。。
-2021-11-19 00:33:39: 跳过优化 补充规则Antiad。。。。。
-2021-11-19 00:33:39: 跳过优化 补充规则StevenBlack。。。。。
-2021-11-19 00:33:39: 所有规则更新并优化完毕！
-2021-11-19 00:33:39: ====================================================
-2021-11-19 00:33:41: -------------------ABP规则 version 202111190026
-2021-11-19 00:33:41: -------------------Fanboy规则 version 202111190000
-2021-11-19 00:33:41: -------------------Yhosts规则 version 202111082343
-2021-11-19 00:33:41: -------------------Antiad规则 version 20211117023854
-2021-11-19 00:33:41: -------------------StevenBlack规则 version 18 November 2021
-2021-11-19 00:33:41: -------------------静态规则 version 2021-10-07 18:00
-2021-11-19 00:33:41: -------------------乘风视频 version 202111131
-2021-11-19 00:33:41: ------------------- 内置规则更新成功！ -------------------
-2021-11-19 00:33:41: ------------------- 规则更新成功！ -------------------
+2021-11-19 09:03:12: ------------------- 规则更新 -----------------------
+2021-11-19 09:03:12: ====================================================
+2021-11-19 09:03:12: 开始更新koolproxy的规则，请等待...
+2021-11-19 09:03:12:  ---------------------------------------------------------------------------------------
+2021-11-19 09:03:12: ABP规则的本地版本号：
+2021-11-19 09:03:12: ABP规则的在线版本号： 202111190856
+2021-11-19 09:03:12: 检测到 ABP规则 已更新，现在开始更新...
+2021-11-19 09:03:12: 将临时的ABP规则文件移动到指定位置
+2021-11-19 09:03:12:  ---------------------------------------------------------------------------------------
+2021-11-19 09:03:13: Fanboy规则本地版本号：
+2021-11-19 09:03:13: Fanboy规则在线版本号： 202111190900
+2021-11-19 09:03:13: 检测到新版本 Fanboy规则 列表，开始更新...
+2021-11-19 09:03:13: 将临时文件覆盖到原始 Fanboy规则 文件
+2021-11-19 09:03:13:  ---------------------------------------------------------------------------------------
+2021-11-19 09:03:15: Yhosts规则本地版本号：
+2021-11-19 09:03:15: Yhosts规则在线版本号： 202111082343
+2021-11-19 09:03:15: 检测到 Yhosts规则 已更新，现在开始更新...
+2021-11-19 09:03:15: 将临时文件覆盖到原始Yhosts文件
+2021-11-19 09:03:15:  ---------------------------------------------------------------------------------------
+2021-11-19 09:03:15: Antiad规则本地版本号：
+2021-11-19 09:03:15: Antiad规则在线版本号： 20211117023854
+2021-11-19 09:03:15: 检测到新版本 Antiad规则 列表，开始更新...
+2021-11-19 09:03:15: 将临时文件覆盖到原始 Antiad规则 文件
+2021-11-19 09:03:15:  ---------------------------------------------------------------------------------------
+2021-11-19 09:03:15: StevenBlack规则本地版本号：
+2021-11-19 09:03:15: StevenBlack规则在线版本号： 18 November 2021
+2021-11-19 09:03:15: 检测到新版本 StevenBlack规则 列表，开始更新...
+2021-11-19 09:03:15: 将临时文件覆盖到原始 StevenBlack规则 文件
+2021-11-19 09:03:15: 正在优化 ABP规则。。。。。
+2021-11-19 09:03:18: 正在优化 Fanboy规则。。。。。
+2021-11-19 09:03:19: 正在优化 补充规则yhosts。。。。。
+2021-11-19 09:03:19: 正在优化 补充规则antiad。。。。。
+2021-11-19 09:03:20: 正在优化 补充规则steven。。。。。
+2021-11-19 09:03:21: 所有规则更新并优化完毕！
+2021-11-19 09:03:21: ====================================================
+2021-11-19 09:03:22: -------------------ABP规则 version 202111190856
+2021-11-19 09:03:22: -------------------Fanboy规则 version 202111190900
+2021-11-19 09:03:22: -------------------Yhosts规则 version 202111082343
+2021-11-19 09:03:22: -------------------Antiad规则 version 20211117023854
+2021-11-19 09:03:22: -------------------StevenBlack规则 version 18 November 2021
+2021-11-19 09:03:22: -------------------静态规则 version 2021-10-07 18:00
+2021-11-19 09:03:22: -------------------乘风视频 version 202111131
+2021-11-19 09:03:22: ------------------- 内置规则更新成功！ -------------------
+2021-11-19 09:03:22: ------------------- 规则更新成功！ -------------------
diff --git a/luci-app-nft-qos/po/ro/nft-qos.po b/luci-app-nft-qos/po/ro/nft-qos.po
index 561392032..481431d65 100644
--- a/luci-app-nft-qos/po/ro/nft-qos.po
+++ b/luci-app-nft-qos/po/ro/nft-qos.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2021-11-17 19:57+0000\n"
+"PO-Revision-Date: 2021-11-18 18:36+0000\n"
 "Last-Translator: Simona Iacob <s@zp1.net>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsnft-qos/ro/>\n"
@@ -123,11 +123,11 @@ msgstr "Activare limită"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:239
 msgid "Limit Traffic Rate By Mac Address"
-msgstr ""
+msgstr "Limitarea ratei de trafic în funcție de adresa Mac"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:44
 msgid "Limit Type"
-msgstr ""
+msgstr "Tipul de limită"
 
 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:170
 msgid "MAC (optional)"
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua
index 7bf109e4d..71be3cc4b 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua
@@ -44,6 +44,8 @@ o = s:option(ListValue, "filter_keyword_mode", translate("Filter keyword Mode"))
 o:value("0", translate("Close"))
 o:value("1", translate("Discard List"))
 o:value("2", translate("Keep List"))
+o:value("3", translate("Discard List,But Keep List First"))
+o:value("4", translate("Keep List,But Discard List First"))
 
 o = s:option(DynamicList, "filter_discard_list", translate("Discard List"))
 
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua
index 46c01e013..39a2ee814 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua
@@ -53,13 +53,19 @@ o.default = "3"
 o:value("0", translate("Close"))
 o:value("1", translate("Discard List"))
 o:value("2", translate("Keep List"))
-o:value("3", translate("Use global config"))
+o:value("3", translate("Discard List,But Keep List First"))
+o:value("4", translate("Keep List,But Discard List First"))
+o:value("5", translate("Use global config"))
 
 o = s:option(DynamicList, "filter_discard_list", translate("Discard List"))
 o:depends("filter_keyword_mode", "1")
+o:depends("filter_keyword_mode", "3")
+o:depends("filter_keyword_mode", "4")
 
 o = s:option(DynamicList, "filter_keep_list", translate("Keep List"))
 o:depends("filter_keyword_mode", "2")
+o:depends("filter_keyword_mode", "3")
+o:depends("filter_keyword_mode", "4")
 
 if #ss_aead_type > 0 then
     o = s:option(ListValue, "ss_aead_type", translate("SS AEAD Node Use Type"))
diff --git a/luci-app-passwall/po/zh-cn/passwall.po b/luci-app-passwall/po/zh-cn/passwall.po
index aa216107c..d07c5b6a7 100644
--- a/luci-app-passwall/po/zh-cn/passwall.po
+++ b/luci-app-passwall/po/zh-cn/passwall.po
@@ -895,6 +895,12 @@ msgstr "丢弃列表"
 msgid "Keep List"
 msgstr "保留列表"
 
+msgid "Discard List,But Keep List First"
+msgstr "丢弃列表，但保留列表优先"
+
+msgid "Keep List,But Discard List First"
+msgstr "保留列表，但丢弃列表优先"
+
 msgid "Use global config"
 msgstr "使用全局配置"
 
diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua
index 316281c0a..082af4ab2 100755
--- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua
+++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua
@@ -49,6 +49,32 @@ local function is_filter_keyword(value)
 			end
 		end
 		return result
+	elseif filter_keyword_mode_default == "3" then
+		local result = false
+		for k,v in ipairs(filter_keyword_discard_list_default) do
+			if value:find(v) then
+				result = true
+			end
+		end
+		for k,v in ipairs(filter_keyword_keep_list_default) do
+			if value:find(v) then
+				result = false
+			end
+		end
+		return result
+	elseif filter_keyword_mode_default == "4" then
+		local result = true
+		for k,v in ipairs(filter_keyword_keep_list_default) do
+			if value:find(v) then
+				result = false
+			end
+		end
+		for k,v in ipairs(filter_keyword_discard_list_default) do
+			if value:find(v) then
+				result = true
+			end
+		end
+		return result
 	end
 	return false
 end
@@ -1088,7 +1114,7 @@ local execute = function()
 			if value.allowInsecure and value.allowInsecure ~= "1" then
 				allowInsecure_default = nil
 			end
-			local filter_keyword_mode = value.filter_keyword_mode or "3"
+			local filter_keyword_mode = value.filter_keyword_mode or "5"
 			if filter_keyword_mode == "0" then
 				filter_keyword_mode_default = "0"
 			elseif filter_keyword_mode == "1" then
@@ -1097,6 +1123,14 @@ local execute = function()
 			elseif filter_keyword_mode == "2" then
 				filter_keyword_mode_default = "2"
 				filter_keyword_keep_list_default = value.filter_keep_list or {}
+			elseif filter_keyword_mode == "3" then
+				filter_keyword_mode_default = "3"
+				filter_keyword_keep_list_default = value.filter_keep_list or {}
+				filter_keyword_discard_list_default = value.filter_discard_list or {}
+			elseif filter_keyword_mode == "4" then
+				filter_keyword_mode_default = "4"
+				filter_keyword_keep_list_default = value.filter_keep_list or {}
+				filter_keyword_discard_list_default = value.filter_discard_list or {}
 			end
 			local ss_aead_type = value.ss_aead_type or "global"
 			if ss_aead_type ~= "global" then
diff --git a/oaf/src/app_filter.c b/oaf/src/app_filter.c
index cf402613e..5e90e9669 100755
--- a/oaf/src/app_filter.c
+++ b/oaf/src/app_filter.c
@@ -134,11 +134,14 @@ int __add_app_feature(int appid,
 		
 		if (begin != dict) {
 			strncpy(pos, begin, p - begin);
-			k_sscanf(pos, "%d:%x",&index, &value);
-			node->pos_info[node->pos_num].pos = index;
-			node->pos_info[node->pos_num].value = value;
-			node->pos_num++;
 		}
+		else{
+			strcpy(pos, dict);
+		}
+		k_sscanf(pos, "%d:%x",&index, &value);
+		node->pos_info[node->pos_num].pos = index;
+		node->pos_info[node->pos_num].value = value;
+		node->pos_num++;
 		feature_list_write_lock();
 		list_add(&(node->head), &af_feature_head);
 		feature_list_write_unlock();
@@ -659,7 +662,8 @@ int af_match_one(flow_info_t *flow, af_feature_node_t *node)
 		AF_ERROR("node or flow is NULL\n");
 		return AF_FALSE;
 	}
-	
+	if (node->proto > 0 && flow->l4_protocol != node->proto)
+		return AF_FALSE;
 	if (flow->l4_len == 0)
 		return AF_FALSE;
 
diff --git a/oaf/src/app_filter_config.c b/oaf/src/app_filter_config.c
index af67fba68..023a0d524 100755
--- a/oaf/src/app_filter_config.c
+++ b/oaf/src/app_filter_config.c
@@ -236,7 +236,6 @@ int af_set_mac_list(cJSON * data_obj)
 			return -1;
 		}
 		if (-1 == mac_to_hex(mac_obj->valuestring, mac_hex)){
-			AF_ERROR("mac format error: %s\n", mac_obj->valuestring);
 			continue;
 		}
 		af_mac_add(mac_hex);