diff --git a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
index c8c442c76..248f940dd 100755
--- a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
+++ b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
@@ -1244,18 +1244,10 @@ function interfaces_status()
 	    -- Detect WAN gateway status
 	    local gw_ping = "UP"
 	    local gw_ping6 = "UP"
-	    if ifname ~= nil and not (ifname:match("^tun.*") or interface:match("^ovpn.*") or interface:match("^wg.*")) then
-	        if proto ~= "dhcpv6" then
-			gateway = ut.trim(sys.exec("ip -4 r list dev " .. ifname .. " | grep via | grep -v default | grep -v metric | awk '{print $1}' | tr -d '\n'"))
-		end
-		if ipv6 == "1" or ipv6 == "auto" then
-			gateway6 = ut.trim(sys.exec("ip -6 r list dev " .. ifname .. " | grep via | grep -v default | grep -v metric | awk '{print $1}' | tr -d '\n'"))
-		end
-	    end
-
 	    if gateway == "" and proto ~= "dhcpv6" then
 		    gateway = get_gateway(interface)
 	    end
+
 	    if gateway == "" and ifname ~= nil and ifname ~= "" and ipv6 ~= "1" and ipv6 ~= "auto" then
 		    if fs.access("/sys/class/net/" .. ifname) then
 			    gateway = ut.trim(sys.exec("ip -4 r list dev " .. ifname .. " | grep kernel | awk '/proto kernel/ {print $1}' | grep -v / | tr -d '\n'"))
@@ -1264,6 +1256,11 @@ function interfaces_status()
 			    end
 		    end
 	    end
+	    if ifname ~= nil and not (ifname:match("^tun.*") or interface:match("^ovpn.*") or interface:match("^wg.*")) then
+	        if proto ~= "dhcpv6" and gateway == "" then
+			gateway = ut.trim(sys.exec("ip -4 r list dev " .. ifname .. " | grep via | grep -v default | grep -v metric | awk '{print $1}' | tr -d '\n'"))
+		end
+	    end
 	    if gateway6 == "" and (ipv6 == "1" or ipv6 == "auto") then
 		    gateway6 = get_gateway6(interface)
 	    end
@@ -1275,6 +1272,11 @@ function interfaces_status()
 			    end
 		    end
 	    end
+	    if ifname ~= nil and not (ifname:match("^tun.*") or interface:match("^ovpn.*") or interface:match("^wg.*")) then
+		if ipv6 == "1" or ipv6 == "auto" and gateway6 == ""then
+			gateway6 = ut.trim(sys.exec("ip -6 r list dev " .. ifname .. " | grep via | grep -v default | grep -v metric | awk '{print $1}' | tr -d '\n'"))
+		end
+	    end
 	    local signal = ""
 	    local operator = ""
 	    local phonenumber = ""
diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
index b642a75b0..6ca5be142 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -1372,6 +1372,7 @@ if [ -n "$OMR_TRACKER_INTERFACE" ] && ([ "$(uci -q get openmptcprouter.$OMR_TRAC
 		traceboxmtutest() {
 			omr_tracebox_mtu() {
 				local serverip=$1
+				[ "$serverip" != "${1#*[0-9].[0-9]}" ] && serverip=""
 				[ -n "$serverip" ] && [ "$serverip" != "127.0.0.1" ] && [ "$(pgrep tracebox)" = "" ] && [ "$(uci -q get openmptcprouter.settings.tracebox)" != "0" ] && {
 					omrtracebox="$(omr-tracebox-mptcp $serverip $OMR_TRACKER_DEVICE)"
 					[ -n "$omrtracebox" ] && [ -z "$(echo $omrtracebox | grep error)" ] && uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.mptcp_status="$omrtracebox"
@@ -1446,6 +1447,7 @@ if [ -n "$OMR_TRACKER_INTERFACE" ] && ([ "$(uci -q get openmptcprouter.$OMR_TRAC
 		traceboxmtutest() {
 			omr_tracebox_mtu() {
 				local serverip=$1
+				[ "$serverip" != "${1#*:[0-9a-fA-F]}" ] && serverip=""
 				[ -n "$serverip" ] && [ "$serverip" != "127.0.0.1" ] && [ "$(pgrep tracebox)" = "" ] && [ "$(uci -q get openmptcprouter.settings.tracebox)" != "0" ] && {
 					omrtracebox="$(omr-tracebox-mptcp $serverip $OMR_TRACKER_DEVICE)"
 					[ -n "$omrtracebox" ] && [ -z "$(echo $omrtracebox | grep error)" ] && uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.mptcp_status="$omrtracebox"
@@ -1467,7 +1469,7 @@ if [ -n "$OMR_TRACKER_INTERFACE" ] && ([ "$(uci -q get openmptcprouter.$OMR_TRAC
 								ip link set dev $OMR_TRACKER_DEVICE mtu $mtu > /dev/null 2>&1
 							}
 						} || {
-							local mtu=$(omr-mtu6 $OMR_TRACKER_DEVICE_IP 2606:4700:4700::1111)
+							local mtu=$(omr-mtu6 $OMR_TRACKER_DEVICE_IP6 2606:4700:4700::1111)
 							[ -n "$mtu" ] && {
 								uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.mtu=$mtu
 								ip link set dev $OMR_TRACKER_DEVICE mtu $mtu > /dev/null 2>&1
@@ -1703,6 +1705,11 @@ if [ "$(pgrep openmptcprouter-vps)" = "" ] && ([ "$(uci -q show openmptcprouter
 	sleep 5
 fi
 
+if [ "$(uci -q get sqm.${OMR_TRACKER_INTERFACE}.enabled)" = "1" ] && [ "$(uci -q get sqm.${OMR_TRACKER_INTERFACE}.autorate)" = "1" ] && [ -z $(pgrep -f "autorate.sh ${OMR_TRACKER_INTERFACE}") ]; then
+	/etc/init.d/sqm-autorate restart >/dev/null 2>&1
+	sleep 5
+fi
+
 #if [ "$(uci -q show openmptcprouter | grep server)" != "" ] && [ "$(uci -q show openmptcprouter | grep password)" != "" ] && [ "$(pgrep openmptcprouter-vps)" = "" ] && [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" = "" ] && ([ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ] || [ -z "$(iptables-save | grep omr_dst_bypass_${OMR_TRACKER_DEVICE})" ]); then
 if [ "$(pgrep -f set_vps_firewall)" = "" ] && [ "$(uci -q show openmptcprouter | grep server)" != "" ] && [ "$(uci -q show openmptcprouter | grep password)" != "" ] && [ "$(pgrep openmptcprouter-vps)" = "" ] && [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" = "" ] && [ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ]; then
 	check_server_fw() {
diff --git a/ndpi-netfilter2/Makefile b/ndpi-netfilter2/Makefile
index 2c0377aa8..d218d7daa 100755
--- a/ndpi-netfilter2/Makefile
+++ b/ndpi-netfilter2/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ndpi-netfilter2
 PKG_RELEASE:=3
-PKG_REV:=59f295ba86110f2642f76eb967b041c4108fedd5
+PKG_REV:=b19e6392cf0c7d51c44e076a91fc4db0cbbd6403
 PKG_VERSION:=4-$(PKG_REV)
 
 PKG_SOURCE_PROTO:=git
@@ -65,7 +65,7 @@ endef
 define Build/Compile
 	(cd $(PKG_BUILD_DIR)/src/lib &&\
 	    gcc -g -O2 -fPIC -DPIC -DNDPI_LIB_COMPILATION -I../../src/include/ -I../../src/lib/third_party/include/ ndpi_network_list_compile.c -o ndpi_network_list_compile &&\
-	    ./ndpi_network_list_compile -o ndpi_network_list.c.inc ndpi_network_list_std.yaml ndpi_network_list_tor.yaml)
+	    ./ndpi_network_list_compile -o ndpi_network_list.c.inc ndpi_network_list_*.yaml)
 	$(MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR)/ndpi-netfilter
 endef
 
diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 723c52b55..9ac1e17b2 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -271,7 +271,7 @@ _set_ss_server_vps() {
 	if [ "$current_mptcp" != "$mptcp" ] || [ "$current_obfs_plugin" != "$obfs_plugin" ] || [ "$current_obfs_type" != "$obfs_type" ] || [ "$current_port" != "$port" ] || [ "$current_method" != "$method" ] || [ "$current_key" != "$key" ] || [ "$current_ebpf" != "$ebpf" ] || [ "$current_obfs" != "$obfs" ] || [ "$current_fast_open" != "$fast_open" ] || [ "$current_no_delay" != "$no_delay" ]; then
 		local settings
 		settings='{"port": '$port',"method":"'$method'","fast_open":'$fast_open',"reuse_port":true,"no_delay":'$no_delay',"mptcp":'$mptcp',"key":"'$key'","ebpf":'$ebpf',"obfs":'$obfs',"obfs_plugin":"'$obfs_plugin'","obfs_type":"'$obfs_type'"}'
-		_set_json "shadowsocks" "$settings"
+		result=$(_set_json "shadowsocks" "$settings")
 	fi
 }
 
@@ -966,7 +966,7 @@ _vps_firewall_redirect_port() {
 				fi
 				if [ "$checkfw" = "" ]; then
 					settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","source_dip" : "'$src_dip'","source_ip" : "'$src_ip'","proto" : "'$protoi'","fwtype" : "'$target'","ipproto" : "'$family'"}'
-					_set_json "shorewallopen" "$settings"
+					result=$(_set_json "shorewallopen" "$settings")
 				fi
 				if [ "$family" = "ipv4" ]; then
 					if [ "$src_dip" = "" ] && [ "$src_ip" = "" ]; then
@@ -1036,10 +1036,10 @@ _vps_firewall_redirect_port() {
 				fi
 				if [ "$checkfw" = "" ]; then
 					settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","source_dip" : "'$src_dip'","source_ip" : "'$src_ip'","proto" : "'${protoi}'","fwtype" : "ACCEPT","ipproto" : "'$family'","comment" : "V2Ray to '${dest_ip}':'${dest_port}'"}'
-					_set_json "shorewallopen" "$settings"
+					result=$(_set_json "shorewallopen" "$settings")
 					[ -z "$dest_port" ] && dest_port="$src_dport"
 					settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","destip" : "'$dest_ip'","destport" : "'$dest_port'","proto" : "'${protoi}'"}'
-					_set_json "v2rayredirect" "$settings"
+					result=$(_set_json "v2rayredirect" "$settings")
 				fi
 				if [ "$family" = "ipv4" ]; then
 					if [ "$src_dip" = "" ] && [ "$src_ip" = "" ]; then
@@ -1087,12 +1087,12 @@ _vps_firewall_close_port() {
 				else
 					settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","comment" : "'$comment'"}'
 				fi
-				_set_json "shorewallclose" "$settings"
+				result=$(_set_json "shorewallclose" "$settings")
 				[ "$type" = "ACCEPT" ] && {
 					destip=$(echo $comment | awk '{print $3}' | awk -F: '{print $1}')
 					destport=$(echo $comment | awk '{print $3}' | awk -F: '{print $2}')
 					settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","destip" : "'$destip'","destport": "'$destport'"}'
-					_set_json "v2rayunredirect" "$settings"
+					result=$(_set_json "v2rayunredirect" "$settings")
 				}
 			}
 		done
@@ -1115,10 +1115,10 @@ _vps_firewall_close_port() {
 				else
 					settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","ipproto" : "ipv6","comment" : "'$comment'"}'
 				fi
-				_set_json "shorewallclose" "$settings"
+				result=$(_set_json "shorewallclose" "$settings")
 				[ "$type" = "ACCEPT" ] && {
 					settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","comment" : "'$comment'"}'
-					_set_json "v2rayunredirect" "$settings"
+					result=$(_set_json "v2rayunredirect" "$settings")
 				}
 			}
 		done
@@ -1694,7 +1694,7 @@ _backup_send() {
 		logger -t "OMR-VPS" "Send backup file to server $servername"
 		local backupjson
 		backupjson='{"data": "'$backup_data'","sha256sum": "'$backup_sha256sum'"}'
-		_set_json "backuppost" "$backupjson"
+		result=$(_set_json "backuppost" "$backupjson")
 		uci -q set openmptcprouter.$servername.lastbackup=$(date +%s)
 	}
 }
diff --git a/openmptcprouter/files/etc/init.d/vnstat_backup b/openmptcprouter/files/etc/init.d/vnstat_backup
index ea00cb864..3a1cf5112 100755
--- a/openmptcprouter/files/etc/init.d/vnstat_backup
+++ b/openmptcprouter/files/etc/init.d/vnstat_backup
@@ -38,9 +38,7 @@ backup_database() {
 }
  
 restore_database() {
-	if [ ! -f $BACKUP_FILE ]; then
-		logger -t $LOGGER_TAG -p err "cannot restore, backup file does not exist (yet)"
-	else
+	if [ -f $BACKUP_FILE ]; then
 		logger -t $LOGGER_TAG -p info 'restoring database'
 		[ ! -d $VNSTAT_DIR ] && mkdir $VNSTAT_DIR
 		/bin/tar -xzf $BACKUP_FILE -C $VNSTAT_DIR
diff --git a/openmptcprouter/files/etc/uci-defaults/2060-omr-system b/openmptcprouter/files/etc/uci-defaults/2060-omr-system
index 933c0d693..fbb1a6912 100755
--- a/openmptcprouter/files/etc/uci-defaults/2060-omr-system
+++ b/openmptcprouter/files/etc/uci-defaults/2060-omr-system
@@ -6,10 +6,11 @@ uci -q batch <<-EOF >/dev/null
 	set system.ntp.enable_server='1'
 	set system.ntp.enabled='1'
 	del system.ntp.server
-	add_list system.ntp.server='ntp.aliyun.com'
-	add_list system.ntp.server='time1.cloud.tencent.com'
-	add_list system.ntp.server='time.ustc.edu.cn'
-	add_list system.ntp.server='cn.pool.ntp.org'
+	set system.@system[-1].cronloglevel=9
+	add_list system.ntp.server='0.pool.ntp.org'
+	add_list system.ntp.server='1.pool.ntp.org'
+	add_list system.ntp.server='2.pool.ntp.org'
+	add_list system.ntp.server='3.pool.ntp.org'
 	commit system
 	set rpcd.@rpcd[0].timeout=120
 	commit rpcd
@@ -38,7 +39,7 @@ fi
 	EOF
 }
 
-if [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep rutx)" ]; then
+if [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep rutx)" ] && [ -z "$(uci show system | grep WAN_ETH)" ]; then
 	uci -q batch <<-EOF >/dev/null
 		add system led
 		set system.@led[-1].sysfs='wan_wifi_4'