diff --git a/luci-app-passwall/luasrc/passwall/util_xray.lua b/luci-app-passwall/luasrc/passwall/util_xray.lua
index 67e47332..d521b5e7 100644
--- a/luci-app-passwall/luasrc/passwall/util_xray.lua
+++ b/luci-app-passwall/luasrc/passwall/util_xray.lua
@@ -1120,8 +1120,7 @@ function gen_config(var)
 
 		local _remote_dns = {
 			--_flag = "remote",
-			address = "tcp://" .. remote_dns_tcp_server,
-			port = tonumber(remote_dns_tcp_port)
+			address = "tcp://" .. remote_dns_tcp_server .. ":" .. tonumber(remote_dns_tcp_port) or 53
 		}
 
 		local _remote_dns_host
diff --git a/v2ray-geoview/Makefile b/v2ray-geoview/Makefile
index a8f999a9..1a4e5a85 100644
--- a/v2ray-geoview/Makefile
+++ b/v2ray-geoview/Makefile
@@ -18,36 +18,31 @@ PKG_USE_MIPS16:=0
 PKG_BUILD_FLAGS:=no-mips16
 
 GO_PKG:=github.com/snowie2000/geoview
-GO_PKG_BUILD_PKG:=github.com/snowie2000/geoview
+GO_PKG_BUILD_PKG:=$(GO_PKG)
 
 GO_PKG_LDFLAGS:=-s -w
 
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
-define geoview/templates
-  define Package/$(1)
-    TITLE:=A geofile toolkit ($(1))
-    URL:=https://github.com/snowie2000/geoview
-    SECTION:=net
-    CATEGORY:=Network
-    SUBMENU:=Web Servers/Proxies
-    DEPENDS+= $$(GO_ARCH_DEPENDS)
-  endef
-
-  define Package/$(1)/description
-  geoview is a handy tool to extract useful information from geo* files.
-
-  This package contains the $(1).
-  endef
-
-  define Package/$(1)/install
-	$$(call GoPackage/Package/Install/Bin,$$(PKG_INSTALL_DIR))
-	$$(INSTALL_DIR) $$(1)/usr/bin
-	$$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)/usr/bin/
-  endef
+define Package/geoview
+  TITLE:=A geofile toolkit
+  URL:=https://github.com/snowie2000/geoview
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=IP Addresses and Names
+  DEPENDS+= $(GO_ARCH_DEPENDS)
+endef
+
+define Package/geoview/description
+  geoview is a handy tool to extract useful information from geo* files.
+endef
+
+define Package/geoview/install
+	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/geoview $(1)/usr/bin/
 endef
 
-$(eval $(call geoview/templates,geoview))
 $(eval $(call GoBinPackage,geoview))
 $(eval $(call BuildPackage,geoview))