diff --git a/data/inet6num/fd00:f57a:2b85::_48 b/data/inet6num/fd00:f57a:2b85::_48
index f378bc347..df1f27aa0 100644
--- a/data/inet6num/fd00:f57a:2b85::_48
+++ b/data/inet6num/fd00:f57a:2b85::_48
@@ -5,7 +5,7 @@ nserver:            tobisawa.mashiro.dn42
 ds-rdata:           11006 13 2 E8AE0A4B94DF1638BA507AAA65015439DF9F933EB2EF66289BAAD27D 9F77497A
 netname:            MASHIRO-NETWORK
 descr:              Mashiro Network (v6)
-remarks:            Geofeed https://mashiro.dn42/geofeed.csv
+geofeed:            https://mashiro.dn42/geofeed.csv
 admin-c:            COMPLEXE-DN42
 tech-c:             COMPLEXE-DN42
 mnt-by:             COMPLEXE-MNT
diff --git a/data/inet6num/fd28:cb8f:4c92::_48 b/data/inet6num/fd28:cb8f:4c92::_48
index dfbb6d4be..4c762d035 100644
--- a/data/inet6num/fd28:cb8f:4c92::_48
+++ b/data/inet6num/fd28:cb8f:4c92::_48
@@ -1,7 +1,7 @@
 inet6num:           fd28:cb8f:4c92:0000:0000:0000:0000:0000 - fd28:cb8f:4c92:ffff:ffff:ffff:ffff:ffff
 netname:            KSKB-DN42v6
 descr:              KSKB-DN42 Network IPv6
-remarks:            Geofeed https://dn42.kskb.eu.org/files/dn42geofeed.csv
+geofeed:            https://dn42.kskb.eu.org/files/dn42geofeed.csv
 country:            TW
 admin-c:            KSKB-DN42
 tech-c:             KSKB-DN42
diff --git a/data/inet6num/fd3c:e5ef:cea6::_48 b/data/inet6num/fd3c:e5ef:cea6::_48
index 446444a5e..0c285f088 100644
--- a/data/inet6num/fd3c:e5ef:cea6::_48
+++ b/data/inet6num/fd3c:e5ef:cea6::_48
@@ -4,7 +4,7 @@ country:            NZ
 admin-c:            RIVENSBANE-DN42
 tech-c:             RIVENSBANE-DN42
 mnt-by:             RIVENSBANE-MNT
-remarks:            Geofeed https://geofeed.rivensbane.com/dn42_geofeed.csv
+geofeed:            https://geofeed.rivensbane.com/dn42_geofeed.csv
 nserver:            nz0.ns.rivensbane.dn42
 nserver:            au1.ns.rivensbane.dn42
 nserver:            ch0.ns.rivensbane.dn42
diff --git a/data/inet6num/fd42:23eb:6cf::_48 b/data/inet6num/fd42:23eb:6cf::_48
index e843d6aab..5bbec83c9 100644
--- a/data/inet6num/fd42:23eb:6cf::_48
+++ b/data/inet6num/fd42:23eb:6cf::_48
@@ -9,4 +9,4 @@ status:             ASSIGNED
 nserver:            ns1.sess.dn42
 nserver:            ns2.sess.dn42
 source:             DN42
-remarks:            Geofeed https://sess.dn42/geofeed.csv
+geofeed:            https://sess.dn42/geofeed.csv
diff --git a/data/inet6num/fd42:4242:2279::_48 b/data/inet6num/fd42:4242:2279::_48
index 034b29418..89fe0f150 100644
--- a/data/inet6num/fd42:4242:2279::_48
+++ b/data/inet6num/fd42:4242:2279::_48
@@ -4,7 +4,7 @@ netname:            MOOHR-NETWORK
 descr:              MOOHR NETWORK
 nserver:            ns1.2279.dn42
 nserver:            ns2.2279.dn42
-remarks:            Geofeed https://www.mhr.hk/dn42_geofeed.csv
+geofeed:            https://www.mhr.hk/dn42_geofeed.csv
 country:            HK
 admin-c:            MOOHR-DN42
 tech-c:             MOOHR-DN42
diff --git a/data/inet6num/fd42:4246:1e7f::_48 b/data/inet6num/fd42:4246:1e7f::_48
index c188ab2a2..f0c124c38 100644
--- a/data/inet6num/fd42:4246:1e7f::_48
+++ b/data/inet6num/fd42:4246:1e7f::_48
@@ -7,6 +7,6 @@ mnt-by:             GSHAPIRO-MNT
 status:             ASSIGNED
 cidr:               fd42:4246:1e7f::/48
 nserver:            ns.gshapiro.dn42
-remarks:            Geofeed https://gshapiro.net/dn42geofeed.csv
+geofeed:            https://gshapiro.net/dn42geofeed.csv
 ds-rdata:           32591 13 2 94DDA296776ACCA280EA48692084E54755A8A6CC889B8FCE01F0B64A1167ED7A
 source:             DN42
diff --git a/data/inet6num/fd59:8:952d::_48 b/data/inet6num/fd59:8:952d::_48
index c1aca248a..68669525f 100644
--- a/data/inet6num/fd59:8:952d::_48
+++ b/data/inet6num/fd59:8:952d::_48
@@ -9,4 +9,4 @@ mnt-by:             CODIE-MNT
 status:             ASSIGNED
 source:             DN42
 nserver:            ns1.behindthatteam.dn42
-remarks:            Geofeed https://behindthatteam.dn42/trash/geofeed.csv
+geofeed:            https://behindthatteam.dn42/trash/geofeed.csv
diff --git a/data/inet6num/fd62:5e23:8905::_48 b/data/inet6num/fd62:5e23:8905::_48
index e0d3b19c7..af8b5a779 100644
--- a/data/inet6num/fd62:5e23:8905::_48
+++ b/data/inet6num/fd62:5e23:8905::_48
@@ -2,7 +2,7 @@ inet6num:           fd62:5e23:8905:0000:0000:0000:0000:0000 - fd62:5e23:8905:fff
 netname:            STEERING-NET6
 cidr:               fd62:5e23:8905::/48
 descr:              Network of STEERING
-remarks:            Geofeed https://steering.dn42/geofeed.csv
+geofeed:            https://steering.dn42/geofeed.csv
 country:            US
 admin-c:            STEERING-DN42
 tech-c:             STEERING-DN42
diff --git a/data/inet6num/fd6c:243b:40fb::_48 b/data/inet6num/fd6c:243b:40fb::_48
index 8eae08e8e..cb834a9b4 100644
--- a/data/inet6num/fd6c:243b:40fb::_48
+++ b/data/inet6num/fd6c:243b:40fb::_48
@@ -1,7 +1,7 @@
 inet6num:           fd6c:243b:40fb:0000:0000:0000:0000:0000 - fd6c:243b:40fb:ffff:ffff:ffff:ffff:ffff
 cidr:               fd6c:243b:40fb::/48
 nserver:            ns1.buzzster.dn42
-remarks:            Geofeed http://geo.buzzster.dn42/geofeed.csv
+geofeed:            http://geo.buzzster.dn42/geofeed.csv
 netname:            BUZZSTER-NET6
 org:                ORG-BUZZSTER
 country:            ES
diff --git a/data/inet6num/fd6f:e34d:80de::_48 b/data/inet6num/fd6f:e34d:80de::_48
index 6b7b3e4a6..755922013 100644
--- a/data/inet6num/fd6f:e34d:80de::_48
+++ b/data/inet6num/fd6f:e34d:80de::_48
@@ -4,7 +4,7 @@ country:            NZ
 admin-c:            RIVENSBANE-DN42
 tech-c:             RIVENSBANE-DN42
 mnt-by:             RIVENSBANE-MNT
-remarks:            Geofeed https://geofeed.rivensbane.com/dn42_geofeed.csv
+geofeed:            https://geofeed.rivensbane.com/dn42_geofeed.csv
 nserver:            nz0.ns.rivensbane.dn42
 nserver:            au1.ns.rivensbane.dn42
 nserver:            ch0.ns.rivensbane.dn42
diff --git a/data/inet6num/fd7d:3858:42d::_48 b/data/inet6num/fd7d:3858:42d::_48
index 964f065fe..caeb51fe5 100644
--- a/data/inet6num/fd7d:3858:42d::_48
+++ b/data/inet6num/fd7d:3858:42d::_48
@@ -2,7 +2,7 @@ inet6num:           fd7d:3858:042d:0000:0000:0000:0000:0000 - fd7d:3858:042d:fff
 cidr:               fd7d:3858:42d::/48
 netname:            LAUNCHPAD-NETWORK
 descr:              LAUNCHPAD-NETWORK's IP Space
-remarks:            Geofeed https://feeds.lpnet0.dn42/geofeed.csv
+geofeed:            https://feeds.lpnet0.dn42/geofeed.csv
 nserver:            ns1.lpnet0.dn42
 nserver:            ns2.lpnet0.dn42
 ds-rdata:           56075 13 2 9ed9de51d010108c86983a703ec09dd8b37cd8d9a61a9fb0c9e91362d8955ecf
diff --git a/data/inet6num/fd8b:dc6c:8653::_48 b/data/inet6num/fd8b:dc6c:8653::_48
index 91c2e8ed6..f6b27339d 100644
--- a/data/inet6num/fd8b:dc6c:8653::_48
+++ b/data/inet6num/fd8b:dc6c:8653::_48
@@ -2,7 +2,7 @@ inet6num:           fd8b:dc6c:8653:0000:0000:0000:0000:0000 - fd8b:dc6c:8653:fff
 cidr:               fd8b:dc6c:8653::/48
 netname:            ASMLTFR-6NETWORK
 descr:              v6 network of AS-MLTFR
-remarks:            Geofeed https://asmltfr.dn42/geofeed.csv
+geofeed:            https://asmltfr.dn42/geofeed.csv
 country:            FR
 admin-c:            MLTFR-DN42
 tech-c:             MLTFR-DN42
diff --git a/data/inet6num/fd99:727:bad0::_48 b/data/inet6num/fd99:727:bad0::_48
index de8c6514b..2fffc80f4 100644
--- a/data/inet6num/fd99:727:bad0::_48
+++ b/data/inet6num/fd99:727:bad0::_48
@@ -9,4 +9,4 @@ status:             ASSIGNED
 nserver:            ns1.badaimweeb.dn42
 ds-rdata:           34045 13 2 01775BD30FC0B694FB1BB04B5680DB2300DAF2A5F8E276DB8145E0E2 0CE4450B
 source:             DN42
-remarks:            Geofeed https://badaimweeb.me/geofeed.csv
+geofeed:            https://badaimweeb.me/geofeed.csv
diff --git a/data/inet6num/fdb6:fc6a:e66c::_48 b/data/inet6num/fdb6:fc6a:e66c::_48
index cadf40c56..ea1547b32 100644
--- a/data/inet6num/fdb6:fc6a:e66c::_48
+++ b/data/inet6num/fdb6:fc6a:e66c::_48
@@ -7,7 +7,7 @@ admin-c:            LEZI-DN42
 tech-c:             LEZI-DN42
 mnt-by:             LEZI-MNT
 nserver:            ns.anycast.leziblog.dn42
-remarks:            Geofeed https://net.leziblog.dn42/geofeed/geofeed.csv
+geofeed:            https://net.leziblog.dn42/geofeed/geofeed.csv
 ds-rdata:           62874 13 2 A87B318A6950ED1F3D63FA3EE4A17E1718F98E8B85145A6B10B3C48EA9862346
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inet6num/fdbc:f9dc:67ad::_48 b/data/inet6num/fdbc:f9dc:67ad::_48
index 94663ca86..136b3281f 100644
--- a/data/inet6num/fdbc:f9dc:67ad::_48
+++ b/data/inet6num/fdbc:f9dc:67ad::_48
@@ -3,7 +3,7 @@ netname:            LANTIAN-IPV6
 descr:              Lan Tian's IP space
 remarks:            My network is open to peering; see https://lantian.pub/page/dn42
 remarks:            or directly contact me at dn42@lantian.pub
-remarks:            Geofeed https://lantian.pub/dn42-geofeed.csv
+geofeed:            https://lantian.pub/dn42-geofeed.csv
 country:            CN
 admin-c:            LANTIAN-DN42
 tech-c:             LANTIAN-DN42
diff --git a/data/inet6num/fdc8:dc88:ee11::_48 b/data/inet6num/fdc8:dc88:ee11::_48
index 05bca0409..eabb0ca99 100644
--- a/data/inet6num/fdc8:dc88:ee11::_48
+++ b/data/inet6num/fdc8:dc88:ee11::_48
@@ -2,7 +2,7 @@ inet6num:           fdc8:dc88:ee11:0000:0000:0000:0000:0000 - fdc8:dc88:ee11:fff
 cidr:               fdc8:dc88:ee11::/48
 netname:            SUNNET-NETWORK
 descr:              SUNNET-NETWORK-IPV6
-remarks:            Geofeed https://dn42.6700.cc/ip-geofeed.csv
+geofeed:            https://dn42.6700.cc/ip-geofeed.csv
 country:            CN
 admin-c:            SUNNET-DN42
 tech-c:             SUNNET-DN42
diff --git a/data/inet6num/fdd0:f8f8:a076::_48 b/data/inet6num/fdd0:f8f8:a076::_48
index d2d37f103..b94615081 100644
--- a/data/inet6num/fdd0:f8f8:a076::_48
+++ b/data/inet6num/fdd0:f8f8:a076::_48
@@ -9,4 +9,4 @@ mnt-by:             NAAIN-MNT
 status:             ASSIGNED
 source:             DN42
 nserver:            ns1.yobanirot.dn42
-remarks:            Geofeed https://yobanirot.dn42/trash/geofeed.csv
+geofeed:            https://yobanirot.dn42/trash/geofeed.csv
diff --git a/data/inet6num/fdda:8ca4:1556::_48 b/data/inet6num/fdda:8ca4:1556::_48
index 2b3f1fa91..f8dcd5178 100644
--- a/data/inet6num/fdda:8ca4:1556::_48
+++ b/data/inet6num/fdda:8ca4:1556::_48
@@ -11,4 +11,4 @@ nserver:            ns2.duststars.dn42
 ds-rdata:           8867 13 2 6429CD14415CA3ADF660A01F61C11A26FD74794DBFB015908D435832BF906A64
 status:             ASSIGNED
 source:             DN42
-remarks:            Geofeed https://networkdesign.ping2.sh/public/geofeed.csv
+geofeed:            https://networkdesign.ping2.sh/public/geofeed.csv
diff --git a/data/inet6num/fddf:3681:e80::_48 b/data/inet6num/fddf:3681:e80::_48
index 518d2e80e..1c6cf9736 100644
--- a/data/inet6num/fddf:3681:e80::_48
+++ b/data/inet6num/fddf:3681:e80::_48
@@ -2,7 +2,7 @@ inet6num:           fddf:3681:0e80:0000:0000:0000:0000:0000 - fddf:3681:0e80:fff
 cidr:               fddf:3681:e80::/48
 netname:            BINGXIN-NETWORK
 descr:              Network of bingxin
-remarks:            Geofeed https://dn42.baka.pub/geofeed.csv
+geofeed:            https://dn42.baka.pub/geofeed.csv
 country:            CN
 admin-c:            BINGXIN-DN42
 tech-c:             BINGXIN-DN42
diff --git a/data/inet6num/fdea:a10b:3d3a::_48 b/data/inet6num/fdea:a10b:3d3a::_48
index cba332305..28e907da5 100644
--- a/data/inet6num/fdea:a10b:3d3a::_48
+++ b/data/inet6num/fdea:a10b:3d3a::_48
@@ -2,7 +2,7 @@ inet6num:           fdea:a10b:3d3a:0000:0000:0000:0000:0000 - fdea:a10b:3d3a:fff
 netname:            MORAXYC-IPV6
 descr:              Welcome to peer me on dn42@moraxyc.com!
 remarks:            More info at https://dn42.moraxyc.com
-remarks:            Geofeed https://dn42.moraxyc.com/geofeed.csv
+geofeed:            https://dn42.moraxyc.com/geofeed.csv
 country:            CN
 admin-c:            MORAXYC-DN42
 tech-c:             MORAXYC-DN42
diff --git a/data/inet6num/fdec:4f96:8be1::_48 b/data/inet6num/fdec:4f96:8be1::_48
index ccbd25fd7..cb579450e 100644
--- a/data/inet6num/fdec:4f96:8be1::_48
+++ b/data/inet6num/fdec:4f96:8be1::_48
@@ -2,7 +2,7 @@ inet6num:           fdec:4f96:8be1:0000:0000:0000:0000:0000 - fdec:4f96:8be1:fff
 cidr:               fdec:4f96:8be1::/48
 nserver:            ns1.xiaoxi654.dn42
 descr:              Izumi Network IPv6 Backbone
-remarks:            Geofeed https://xiaoxi654.dn42/objects/geofeed.csv
+geofeed:            https://xiaoxi654.dn42/objects/geofeed.csv
 netname:            IZUMINET-IPV6
 country:            CN
 admin-c:            XIAOXI654-DN42
diff --git a/data/inet6num/fdef:fa9b:62b::_48 b/data/inet6num/fdef:fa9b:62b::_48
index f1165d955..bdcb767b7 100644
--- a/data/inet6num/fdef:fa9b:62b::_48
+++ b/data/inet6num/fdef:fa9b:62b::_48
@@ -1,7 +1,7 @@
 inet6num:           fdef:fa9b:062b:0000:0000:0000:0000:0000 - fdef:fa9b:062b:ffff:ffff:ffff:ffff:ffff
 netname:            NEDIFINITA-IPV6
 descr:              Nedifinita Network
-remarks:            Geofeed https://dn42.nedifinita.com/geofeed.csv
+geofeed:            https://dn42.nedifinita.com/geofeed.csv
 country:            US
 admin-c:            NEDIFINITA-DN42
 tech-c:             NEDIFINITA-DN42
diff --git a/data/inet6num/fdf4:be86:71d9::_48 b/data/inet6num/fdf4:be86:71d9::_48
index e2e3ae4df..522b089dc 100644
--- a/data/inet6num/fdf4:be86:71d9::_48
+++ b/data/inet6num/fdf4:be86:71d9::_48
@@ -1,7 +1,7 @@
 inet6num:           fdf4:be86:71d9:0000:0000:0000:0000:0000 - fdf4:be86:71d9:ffff:ffff:ffff:ffff:ffff
 cidr:               fdf4:be86:71d9::/48
 netname:            FACTOR2431-NETWORK
-remarks:            Geofeed https://r2.factor2431.com/geofeed.csv
+geofeed:            https://r2.factor2431.com/geofeed.csv
 nserver:            ns.factor2431.dn42
 country:            CN
 admin-c:            FACTOR2431-DN42
diff --git a/data/inet6num/fdfa:7906:8262::_48 b/data/inet6num/fdfa:7906:8262::_48
index 11256451e..3a4c28bfe 100644
--- a/data/inet6num/fdfa:7906:8262::_48
+++ b/data/inet6num/fdfa:7906:8262::_48
@@ -10,4 +10,4 @@ mnt-by:             SERNET-MNT
 status:             ASSIGNED
 cidr:               fdfa:7906:8262::/48
 source:             DN42
-remarks:            Geofeed http://geofeed.sherpherd.net/geofeed.csv
+geofeed:            http://geofeed.sherpherd.net/geofeed.csv
diff --git a/data/inet6num/fdfd:27b9:f174::_48 b/data/inet6num/fdfd:27b9:f174::_48
index 69c6d0396..e3e802705 100644
--- a/data/inet6num/fdfd:27b9:f174::_48
+++ b/data/inet6num/fdfd:27b9:f174::_48
@@ -12,4 +12,4 @@ nserver:            ns1.headscarf175.dn42
 nserver:            ns2.headscarf175.dn42
 nserver:            ns3.headscarf175.dn42
 nserver:            ns4.headscarf175.dn42
-remarks:            Geofeed http://headscarf175.dn42/geofeed.csv
+geofeed:            http://headscarf175.dn42/geofeed.csv
diff --git a/data/inet6num/fdfe:8d0:7450::_48 b/data/inet6num/fdfe:8d0:7450::_48
index 297f7e26b..5fdd7ee03 100644
--- a/data/inet6num/fdfe:8d0:7450::_48
+++ b/data/inet6num/fdfe:8d0:7450::_48
@@ -4,7 +4,7 @@ netname:            PIVIPI-NET
 nserver:            ns1.m724.dn42
 nserver:            ns2.m724.dn42
 ds-rdata:           20786 13 2 586C1359E15A0FC6EE2F477D5CD1C4157C6E6DA8D95C459EA5348457F4C8A204
-remarks:            geofeed https://m724.dn42/geofeed.csv
+geofeed:            https://m724.dn42/geofeed.csv
 admin-c:            MINECON724-DN42
 tech-c:             MINECON724-DN42
 mnt-by:             MINECON724-MNT
diff --git a/data/inetnum/172.20.133.160_29 b/data/inetnum/172.20.133.160_29
index 653861551..e1636b5ed 100644
--- a/data/inetnum/172.20.133.160_29
+++ b/data/inetnum/172.20.133.160_29
@@ -2,7 +2,7 @@ inetnum:            172.20.133.160 - 172.20.133.167
 cidr:               172.20.133.160/29
 netname:            STEERING-NETWORK
 descr:              Network of STEERING
-remarks:            Geofeed https://steering.dn42/geofeed.csv
+geofeed:            https://steering.dn42/geofeed.csv
 country:            US
 admin-c:            STEERING-DN42
 tech-c:             STEERING-DN42
diff --git a/data/inetnum/172.20.143.16_28 b/data/inetnum/172.20.143.16_28
index 1f66c8751..155b57c14 100644
--- a/data/inetnum/172.20.143.16_28
+++ b/data/inetnum/172.20.143.16_28
@@ -9,4 +9,4 @@ status:             ASSIGNED
 source:             DN42
 nserver:            ns1.duststars.dn42
 nserver:            ns2.duststars.dn42
-remarks:            Geofeed https://networkdesign.ping2.sh/public/geofeed.csv
+geofeed:            https://networkdesign.ping2.sh/public/geofeed.csv
diff --git a/data/inetnum/172.20.143.32_27 b/data/inetnum/172.20.143.32_27
index da9f350a1..b99d27805 100644
--- a/data/inetnum/172.20.143.32_27
+++ b/data/inetnum/172.20.143.32_27
@@ -9,4 +9,4 @@ status:             ASSIGNED
 source:             DN42
 nserver:            ns1.duststars.dn42
 nserver:            ns2.duststars.dn42
-remarks:            Geofeed https://networkdesign.ping2.sh/public/geofeed.csv
+geofeed:            https://networkdesign.ping2.sh/public/geofeed.csv
diff --git a/data/inetnum/172.20.154.224_27 b/data/inetnum/172.20.154.224_27
index 9bad7698c..c7e2d4118 100644
--- a/data/inetnum/172.20.154.224_27
+++ b/data/inetnum/172.20.154.224_27
@@ -2,7 +2,7 @@ inetnum:            172.20.154.224 - 172.20.154.255
 cidr:               172.20.154.224/27
 netname:            BINGXIN-NETWORK
 descr:              Network of Bingxin
-remarks:            Geofeed https://dn42.baka.pub/geofeed.csv
+geofeed:            https://dn42.baka.pub/geofeed.csv
 country:            CN
 admin-c:            BINGXIN-DN42
 tech-c:             BINGXIN-DN42
diff --git a/data/inetnum/172.20.159.128_27 b/data/inetnum/172.20.159.128_27
index d41a44a26..9f30f5f03 100644
--- a/data/inetnum/172.20.159.128_27
+++ b/data/inetnum/172.20.159.128_27
@@ -12,4 +12,4 @@ nserver:            ns1.headscarf175.dn42
 nserver:            ns2.headscarf175.dn42
 nserver:            ns3.headscarf175.dn42
 nserver:            ns4.headscarf175.dn42
-remarks:            Geofeed http://headscarf175.dn42/geofeed.csv
+geofeed:            http://headscarf175.dn42/geofeed.csv
diff --git a/data/inetnum/172.20.165.8_29 b/data/inetnum/172.20.165.8_29
index b02f1485a..6b3842b8b 100644
--- a/data/inetnum/172.20.165.8_29
+++ b/data/inetnum/172.20.165.8_29
@@ -2,7 +2,7 @@ inetnum:            172.20.165.8 - 172.20.165.15
 cidr:               172.20.165.8/29
 netname:            BAKAPUB-NETWORK
 descr:              Baka.Pub IX
-remarks:            Geofeed https://dn42.baka.pub/geofeed.csv
+geofeed:            https://dn42.baka.pub/geofeed.csv
 country:            HK
 org:                ORG-BAKA
 admin-c:            BINGXIN-DN42
diff --git a/data/inetnum/172.20.18.240_28 b/data/inetnum/172.20.18.240_28
index bd4dfbcd9..f5632936f 100644
--- a/data/inetnum/172.20.18.240_28
+++ b/data/inetnum/172.20.18.240_28
@@ -2,7 +2,7 @@ inetnum:            172.20.18.240 - 172.20.18.255
 cidr:               172.20.18.240/28
 netname:            ASMLTFR-4NETWORK
 descr:              v4 network of AS-MLTFR
-remarks:            Geofeed https://asmltfr.dn42/geofeed.csv
+geofeed:            https://asmltfr.dn42/geofeed.csv
 country:            FR
 admin-c:            MLTFR-DN42
 tech-c:             MLTFR-DN42
diff --git a/data/inetnum/172.20.209.64_26 b/data/inetnum/172.20.209.64_26
index dc6001582..1eeacda2e 100644
--- a/data/inetnum/172.20.209.64_26
+++ b/data/inetnum/172.20.209.64_26
@@ -9,5 +9,5 @@ mnt-by:             SERNET-MNT
 status:             ASSIGNED
 cidr:               172.20.209.64/26
 remarks:            Peering worldwide, Asia region node preferred. Contact me at haksrpd@outlook.com
-remarks:            Geofeed http://geofeed.sherpherd.net/geofeed.csv
+geofeed:            http://geofeed.sherpherd.net/geofeed.csv
 source:             DN42
diff --git a/data/inetnum/172.20.21.128_27 b/data/inetnum/172.20.21.128_27
index 840e40416..4a8bb2b78 100644
--- a/data/inetnum/172.20.21.128_27
+++ b/data/inetnum/172.20.21.128_27
@@ -2,7 +2,7 @@ inetnum:            172.20.21.128 - 172.20.21.159
 cidr:               172.20.21.128/27
 netname:            LAUNCHPAD-NETWORK
 descr:              LAUNCHPAD-NETWORK's IP Space
-remarks:            Geofeed https://feeds.lpnet0.dn42/geofeed.csv
+geofeed:            https://feeds.lpnet0.dn42/geofeed.csv
 nserver:            ns1.lpnet0.dn42
 nserver:            ns2.lpnet0.dn42
 ds-rdata:           469 13 2 fa4501d20df0aab92a4acd54a6957d30a29d78f2ce878b6279ca4f8c872b4092
diff --git a/data/inetnum/172.20.210.0_26 b/data/inetnum/172.20.210.0_26
index bb9037deb..be5cb8f4d 100644
--- a/data/inetnum/172.20.210.0_26
+++ b/data/inetnum/172.20.210.0_26
@@ -2,7 +2,7 @@ inetnum:            172.20.210.0 - 172.20.210.63
 cidr:               172.20.210.0/26
 netname:            STEERING-LAN-NETWORK
 descr:              LAN of STEERING
-remarks:            Geofeed https://steering.dn42/geofeed.csv
+geofeed:            https://steering.dn42/geofeed.csv
 country:            US
 admin-c:            STEERING-DN42
 tech-c:             STEERING-DN42
diff --git a/data/inetnum/172.20.214.32_27 b/data/inetnum/172.20.214.32_27
index dcd984de5..0cb0242d5 100644
--- a/data/inetnum/172.20.214.32_27
+++ b/data/inetnum/172.20.214.32_27
@@ -5,7 +5,7 @@ nserver:            tobisawa.mashiro.dn42
 ds-rdata:           33263 13 2 15764F2B63A37B59AD2AEAEBB20DEE63ABA653057312AF1633CC497B EE0DC726
 netname:            MASHIRO-NETWORK
 descr:              Mashiro Network (v4)
-remarks:            Geofeed https://mashiro.dn42/geofeed.csv
+geofeed:            https://mashiro.dn42/geofeed.csv
 admin-c:            COMPLEXE-DN42
 tech-c:             COMPLEXE-DN42
 mnt-by:             COMPLEXE-MNT
diff --git a/data/inetnum/172.20.54.48_29 b/data/inetnum/172.20.54.48_29
index 3caa5b9ed..c36d2df2a 100644
--- a/data/inetnum/172.20.54.48_29
+++ b/data/inetnum/172.20.54.48_29
@@ -9,4 +9,4 @@ mnt-by:             CODIE-MNT
 status:             ASSIGNED
 source:             DN42
 nserver:            ns1.behindthatteam.dn42
-remarks:            Geofeed https://behindthatteam.dn42/trash/geofeed.csv
+geofeed:            https://behindthatteam.dn42/trash/geofeed.csv
diff --git a/data/inetnum/172.20.54.56_29 b/data/inetnum/172.20.54.56_29
index c6ee316a7..4b9a93ee4 100644
--- a/data/inetnum/172.20.54.56_29
+++ b/data/inetnum/172.20.54.56_29
@@ -2,7 +2,7 @@ inetnum:            172.20.54.56 - 172.20.54.63
 cidr:               172.20.54.56/29
 netname:            LAUNCHPAD-NETWORK
 descr:              LAUNCHPAD-NETWORK's IP Space
-remarks:            Geofeed https://feeds.lpnet0.dn42/geofeed.csv
+geofeed:            https://feeds.lpnet0.dn42/geofeed.csv
 nserver:            ns1.lpnet0.dn42
 nserver:            ns2.lpnet0.dn42
 ds-rdata:           27946 13 2 0dd0e4ff2faf16fe7ed4649222d176bb17162c91df12b893b8994c630c5451ba
diff --git a/data/inetnum/172.20.62.160_27 b/data/inetnum/172.20.62.160_27
index 338e9e2c0..e2e931ff4 100644
--- a/data/inetnum/172.20.62.160_27
+++ b/data/inetnum/172.20.62.160_27
@@ -9,4 +9,4 @@ nserver:            ns1.sess.dn42
 nserver:            ns2.sess.dn42
 status:             ASSIGNED
 source:             DN42
-remarks:            Geofeed https://sess.dn42/geofeed.csv
+geofeed:            https://sess.dn42/geofeed.csv
diff --git a/data/inetnum/172.21.100.128_25 b/data/inetnum/172.21.100.128_25
index 3745f3ceb..009b99a7b 100644
--- a/data/inetnum/172.21.100.128_25
+++ b/data/inetnum/172.21.100.128_25
@@ -2,7 +2,7 @@ inetnum:            172.21.100.128 - 172.21.100.255
 cidr:               172.21.100.128/25
 netname:            SUNNET-NETWORK
 descr:              SUNNET-NETWORK-IPV4
-remarks:            Geofeed https://dn42.6700.cc/ip-geofeed.csv
+geofeed:            https://dn42.6700.cc/ip-geofeed.csv
 country:            CN
 admin-c:            SUNNET-DN42
 tech-c:             SUNNET-DN42
diff --git a/data/inetnum/172.21.100.16_29 b/data/inetnum/172.21.100.16_29
index 8c440b8cb..e49c12eb3 100644
--- a/data/inetnum/172.21.100.16_29
+++ b/data/inetnum/172.21.100.16_29
@@ -2,7 +2,7 @@ inetnum:            172.21.100.16 - 172.21.100.23
 cidr:               172.21.100.16/29
 netname:            SUNNET-NETWORK
 descr:              SUNNET-NETWORK-IPV4
-remarks:            Geofeed https://dn42.6700.cc/ip-geofeed.csv
+geofeed:            https://dn42.6700.cc/ip-geofeed.csv
 country:            CN
 admin-c:            SUNNET-DN42
 tech-c:             SUNNET-DN42
diff --git a/data/inetnum/172.21.66.0_27 b/data/inetnum/172.21.66.0_27
index 26f8de085..2b6afdaeb 100644
--- a/data/inetnum/172.21.66.0_27
+++ b/data/inetnum/172.21.66.0_27
@@ -9,4 +9,4 @@ mnt-by:             NAAIN-MNT
 status:             ASSIGNED
 source:             DN42
 nserver:            ns1.yobanirot.dn42
-remarks:            Geofeed https://yobanirot.dn42/trash/geofeed.csv
+geofeed:            https://yobanirot.dn42/trash/geofeed.csv
diff --git a/data/inetnum/172.21.85.64_27 b/data/inetnum/172.21.85.64_27
index c62e07236..aa5717e9e 100644
--- a/data/inetnum/172.21.85.64_27
+++ b/data/inetnum/172.21.85.64_27
@@ -4,7 +4,7 @@ country:            NZ
 admin-c:            RIVENSBANE-DN42
 tech-c:             RIVENSBANE-DN42
 mnt-by:             RIVENSBANE-MNT
-remarks:            Geofeed https://geofeed.rivensbane.com/dn42_geofeed.csv
+geofeed:            https://geofeed.rivensbane.com/dn42_geofeed.csv
 nserver:            nz0.ns.rivensbane.dn42
 nserver:            au1.ns.rivensbane.dn42
 nserver:            ch0.ns.rivensbane.dn42
diff --git a/data/inetnum/172.21.86.192_27 b/data/inetnum/172.21.86.192_27
index 0ba80852d..ebf596cff 100644
--- a/data/inetnum/172.21.86.192_27
+++ b/data/inetnum/172.21.86.192_27
@@ -3,7 +3,7 @@ netname:            MORAXYC-IPV4
 descr:              Moraxyc's DN42 IP space
 remarks:            Welcome to peer me on dn42@moraxyc.com!
 remarks:            More info at https://dn42.moraxyc.com
-remarks:            Geofeed https://dn42.moraxyc.com/geofeed.csv
+geofeed:            https://dn42.moraxyc.com/geofeed.csv
 country:            CN
 admin-c:            MORAXYC-DN42
 tech-c:             MORAXYC-DN42
diff --git a/data/inetnum/172.21.99.80_29 b/data/inetnum/172.21.99.80_29
index 6bc4bb893..3fd3c6d64 100644
--- a/data/inetnum/172.21.99.80_29
+++ b/data/inetnum/172.21.99.80_29
@@ -9,4 +9,4 @@ mnt-by:             NAAIN-MNT
 status:             ASSIGNED
 source:             DN42
 nserver:            ns1.yobanirot.dn42
-remarks:            Geofeed https://yobanirot.dn42/trash/geofeed.csv
+geofeed:            https://yobanirot.dn42/trash/geofeed.csv
diff --git a/data/inetnum/172.21.99.88_29 b/data/inetnum/172.21.99.88_29
index 3ca2ec29d..2b3f627a4 100644
--- a/data/inetnum/172.21.99.88_29
+++ b/data/inetnum/172.21.99.88_29
@@ -2,7 +2,7 @@ inetnum:            172.21.99.88 - 172.21.99.95
 cidr:               172.21.99.88/29
 nserver:            ns1.xiaoxi654.dn42
 descr:              Izumi Network IPv4 Backbone
-remarks:            Geofeed https://xiaoxi654.dn42/objects/geofeed.csv
+geofeed:            https://xiaoxi654.dn42/objects/geofeed.csv
 netname:            IZUMINET-IPV4
 country:            CN
 admin-c:            XIAOXI654-DN42
diff --git a/data/inetnum/172.22.105.0_28 b/data/inetnum/172.22.105.0_28
index a375467d6..3556ebf89 100644
--- a/data/inetnum/172.22.105.0_28
+++ b/data/inetnum/172.22.105.0_28
@@ -1,7 +1,7 @@
 inetnum:            172.22.105.0 - 172.22.105.15
 cidr:               172.22.105.0/28
 netname:            FACTOR2431-NETWORK
-remarks:            Geofeed https://r2.factor2431.com/geofeed.csv
+geofeed:            https://r2.factor2431.com/geofeed.csv
 nserver:            ns.factor2431.dn42
 country:            CN
 admin-c:            FACTOR2431-DN42
diff --git a/data/inetnum/172.22.123.0_27 b/data/inetnum/172.22.123.0_27
index adeab6b14..7960ec134 100644
--- a/data/inetnum/172.22.123.0_27
+++ b/data/inetnum/172.22.123.0_27
@@ -9,4 +9,4 @@ status:             ASSIGNED
 nserver:            ns1.badaimweeb.dn42
 ds-rdata:           39492 13 2 A03DFC59458495C0358D8F1A1FF71EC7E2E7CA07E4F587E68C77F6C0 0847BF38
 source:             DN42
-remarks:            Geofeed https://badaimweeb.me/geofeed.csv
+geofeed:            https://badaimweeb.me/geofeed.csv
diff --git a/data/inetnum/172.22.124.64_27 b/data/inetnum/172.22.124.64_27
index 6400b7105..ad0ddb08d 100644
--- a/data/inetnum/172.22.124.64_27
+++ b/data/inetnum/172.22.124.64_27
@@ -6,7 +6,7 @@ admin-c:            GSHAPIRO-DN42
 tech-c:             GSHAPIRO-DN42
 mnt-by:             GSHAPIRO-MNT
 nserver:            ns.gshapiro.dn42
-remarks:            Geofeed https://gshapiro.net/dn42geofeed.csv
+geofeed:            https://gshapiro.net/dn42geofeed.csv
 ds-rdata:           73 13 2 F6ED9EF0A0E5A139E3D0F823E7A4E6E933BB78FB10E3796FB98619240A0872F4
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.22.130.160_27 b/data/inetnum/172.22.130.160_27
index 974857470..3f63a3d15 100644
--- a/data/inetnum/172.22.130.160_27
+++ b/data/inetnum/172.22.130.160_27
@@ -9,4 +9,4 @@ status:             ASSIGNED
 nserver:            ns1.badaimweeb.dn42
 ds-rdata:           20311 13 2 7C90AB6FFCA6AC2CA4002505F0E626C5831E721C2E3A09812793CDA5 91C9B182
 source:             DN42
-remarks:            Geofeed https://badaimweeb.me/geofeed.csv
+geofeed:            https://badaimweeb.me/geofeed.csv
diff --git a/data/inetnum/172.22.137.96_27 b/data/inetnum/172.22.137.96_27
index 37b1695eb..fe73221ec 100644
--- a/data/inetnum/172.22.137.96_27
+++ b/data/inetnum/172.22.137.96_27
@@ -7,7 +7,7 @@ admin-c:            LEZI-DN42
 tech-c:             LEZI-DN42
 mnt-by:             LEZI-MNT
 nserver:            ns.anycast.leziblog.dn42
-remarks:            Geofeed https://net.leziblog.dn42/geofeed/geofeed.csv
+geofeed:            https://net.leziblog.dn42/geofeed/geofeed.csv
 ds-rdata:           28065 13 2 B2744FACB4CBB797F9683C930BB364CE75252D0306932607F85FE72A02875814
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.22.142.128_26 b/data/inetnum/172.22.142.128_26
index 4bc7861c4..1175016aa 100644
--- a/data/inetnum/172.22.142.128_26
+++ b/data/inetnum/172.22.142.128_26
@@ -9,4 +9,4 @@ status:             ASSIGNED
 nserver:            ns1.badaimweeb.dn42
 ds-rdata:           46319 13 2 91C7305BE02039137CCE7742D8F06B73A970E8D4053BB7115FF01B80 40A77843
 source:             DN42
-remarks:            Geofeed https://badaimweeb.me/geofeed.csv
+geofeed:            https://badaimweeb.me/geofeed.csv
diff --git a/data/inetnum/172.22.159.64_26 b/data/inetnum/172.22.159.64_26
index 3ed2d742d..64b1908a3 100644
--- a/data/inetnum/172.22.159.64_26
+++ b/data/inetnum/172.22.159.64_26
@@ -1,7 +1,7 @@
 inetnum:            172.22.159.64 - 172.22.159.127
 netname:            NEDIFINITA-IPV4
 descr:              Nedifinita Network
-remarks:            Geofeed https://dn42.nedifinita.com/geofeed.csv
+geofeed:            https://dn42.nedifinita.com/geofeed.csv
 country:            US
 admin-c:            NEDIFINITA-DN42
 tech-c:             NEDIFINITA-DN42
diff --git a/data/inetnum/172.22.76.184_29 b/data/inetnum/172.22.76.184_29
index 09cb2d5fe..e451f8057 100644
--- a/data/inetnum/172.22.76.184_29
+++ b/data/inetnum/172.22.76.184_29
@@ -3,7 +3,7 @@ netname:            LANTIAN-IPV4
 descr:              Lan Tian's IP space
 remarks:            My network is open to peering; see https://lantian.pub/page/dn42
 remarks:            or directly contact me at dn42@lantian.pub
-remarks:            Geofeed https://lantian.pub/dn42-geofeed.csv
+geofeed:            https://lantian.pub/dn42-geofeed.csv
 country:            CN
 admin-c:            LANTIAN-DN42
 tech-c:             LANTIAN-DN42
diff --git a/data/inetnum/172.22.76.96_27 b/data/inetnum/172.22.76.96_27
index 53214570b..d1c4153f0 100644
--- a/data/inetnum/172.22.76.96_27
+++ b/data/inetnum/172.22.76.96_27
@@ -3,7 +3,7 @@ netname:            LANTIAN-IPV4
 descr:              Lan Tian's IP space
 remarks:            My network is open to peering; see https://lantian.pub/page/dn42
 remarks:            or directly contact me at dn42@lantian.pub
-remarks:            Geofeed https://lantian.pub/dn42-geofeed.csv
+geofeed:            https://lantian.pub/dn42-geofeed.csv
 country:            CN
 admin-c:            LANTIAN-DN42
 tech-c:             LANTIAN-DN42
diff --git a/data/inetnum/172.22.77.32_27 b/data/inetnum/172.22.77.32_27
index 2a7a90c9e..885203fbc 100644
--- a/data/inetnum/172.22.77.32_27
+++ b/data/inetnum/172.22.77.32_27
@@ -1,7 +1,7 @@
 inetnum:            172.22.77.32 - 172.22.77.63
 netname:            KSKB-DN42v4
 descr:              KSKB-DN42 Network IPv4
-remarks:            Geofeed: https://dn42.kskb.eu.org/files/dn42geofeed.csv
+geofeed:            https://dn42.kskb.eu.org/files/dn42geofeed.csv
 country:            TW
 admin-c:            KSKB-DN42
 tech-c:             KSKB-DN42
diff --git a/data/inetnum/172.22.79.192_27 b/data/inetnum/172.22.79.192_27
index 5cd315f42..cd36d1b82 100644
--- a/data/inetnum/172.22.79.192_27
+++ b/data/inetnum/172.22.79.192_27
@@ -4,7 +4,7 @@ netname:            MOOHR-NETWORK
 descr:              MOOHR NETWORK
 nserver:            ns1.2279.dn42
 nserver:            ns2.2279.dn42
-remarks:            Geofeed https://www.mhr.hk/dn42_geofeed.csv
+geofeed:            https://www.mhr.hk/dn42_geofeed.csv
 country:            HK
 admin-c:            MOOHR-DN42
 tech-c:             MOOHR-DN42
diff --git a/data/inetnum/172.23.173.184_29 b/data/inetnum/172.23.173.184_29
index 2561eedd6..93699fc85 100644
--- a/data/inetnum/172.23.173.184_29
+++ b/data/inetnum/172.23.173.184_29
@@ -1,7 +1,7 @@
 inetnum:            172.23.173.184 - 172.23.173.191
 cidr:               172.23.173.184/29
 netname:            FACTOR2431-NETWORK
-remarks:            Geofeed https://r2.factor2431.com/geofeed.csv
+geofeed:            https://r2.factor2431.com/geofeed.csv
 nserver:            ns.factor2431.dn42
 country:            CN
 admin-c:            FACTOR2431-DN42
diff --git a/data/inetnum/172.23.38.0_26 b/data/inetnum/172.23.38.0_26
index 03c28c764..c8fe16943 100644
--- a/data/inetnum/172.23.38.0_26
+++ b/data/inetnum/172.23.38.0_26
@@ -1,7 +1,7 @@
 inetnum:            172.23.38.0 - 172.23.38.63
 cidr:               172.23.38.0/26
 nserver:            ns1.buzzster.dn42
-remarks:            Geofeed http://geo.buzzster.dn42/geofeed.csv
+geofeed:            http://geo.buzzster.dn42/geofeed.csv
 netname:            BUZZSTER-NET4
 org:                ORG-BUZZSTER
 country:            ES