diff --git a/data/transit/route/bus.json b/data/transit/route/bus.json
index 6afaeff19ab..0b9d97471a6 100644
--- a/data/transit/route/bus.json
+++ b/data/transit/route/bus.json
@@ -2884,7 +2884,11 @@
       "displayName": "DDOT",
       "id": "ddot-a21cc9",
       "locationSet": {"include": ["us"]},
-      "tags": {"network": "DDOT", "route": "bus"}
+      "tags": {
+        "network": "DDOT",
+        "network:wikidata": "Q5265906",
+        "route": "bus"
+      }
     },
     {
       "displayName": "DE_CO_BUS",
@@ -2909,7 +2913,7 @@
     {
       "displayName": "Déobus",
       "id": "deobus-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "matchNames": ["réseau déobus"],
       "tags": {
         "network": "Déobus",
@@ -2951,6 +2955,7 @@
       "locationSet": {"include": ["se"]},
       "tags": {
         "network": "DinTur",
+        "network:wikidata": "Q5277826",
         "route": "bus"
       }
     },
@@ -2998,36 +3003,56 @@
       "displayName": "DLAn",
       "id": "dlan-a315fc",
       "locationSet": {"include": ["be", "nl"]},
-      "tags": {"network": "DLAn", "route": "bus"}
+      "tags": {
+        "network": "DLAn",
+        "network:wikidata": "Q614819",
+        "route": "bus"
+      }
     },
     {
       "displayName": "DLLi",
       "id": "dlli-a315fc",
       "locationSet": {"include": ["be", "nl"]},
-      "tags": {"network": "DLLi", "route": "bus"}
+      "tags": {
+        "network": "DLLi",
+        "network:wikidata": "Q614819",
+        "route": "bus"
+      }
     },
     {
       "displayName": "DLOV",
       "id": "dlov-a315fc",
       "locationSet": {"include": ["be", "nl"]},
-      "tags": {"network": "DLOV", "route": "bus"}
+      "tags": {
+        "network": "DLOV",
+        "network:wikidata": "Q614819",
+        "route": "bus"
+      }
     },
     {
       "displayName": "DLVB",
       "id": "dlvb-6974a4",
       "locationSet": {"include": ["be"]},
-      "tags": {"network": "DLVB", "route": "bus"}
+      "tags": {
+        "network": "DLVB",
+        "network:wikidata": "Q614819",
+        "route": "bus"
+      }
     },
     {
       "displayName": "DLWV",
       "id": "dlwv-6974a4",
       "locationSet": {"include": ["be"]},
-      "tags": {"network": "DLWV", "route": "bus"}
+      "tags": {
+        "network": "DLWV",
+        "network:wikidata": "Q614819",
+        "route": "bus"
+      }
     },
     {
       "displayName": "DMT",
       "id": "dmt-a45453",
-      "locationSet": {"include": ["001"]},
+      "locationSet": {"include": ["us"]},
       "tags": {"network": "DMT", "route": "bus"}
     },
     {
@@ -3056,14 +3081,10 @@
       "displayName": "DPmHK",
       "id": "dpmhk-1bafda",
       "locationSet": {"include": ["cz"]},
-      "tags": {"network": "DPmHK", "route": "bus"}
-    },
-    {
-      "displayName": "DPmHK, a.s.",
-      "id": "dpmhkas-1bafda",
-      "locationSet": {"include": ["cz"]},
+      "matchNames": ["DPmHK, a.s."],
       "tags": {
-        "network": "DPmHK, a.s.",
+        "network": "DPmHK",
+        "network:wikidata": "Q58557872",
         "route": "bus"
       }
     },
@@ -3091,6 +3112,7 @@
       "locationSet": {"include": ["ie"]},
       "tags": {
         "network": "Dublin Bus",
+        "network:wikidata": "Q1263090",
         "route": "bus"
       }
     },
@@ -3109,7 +3131,11 @@
       "displayName": "DÚK",
       "id": "duk-1bafda",
       "locationSet": {"include": ["cz"]},
-      "tags": {"network": "DÚK", "route": "bus"}
+      "tags": {
+        "network": "DÚK",
+        "network:wikidata": "Q12021691",
+        "route": "bus"
+      }
     },
     {
       "displayName": "Duluth Transit Authority",
@@ -3126,7 +3152,7 @@
     {
       "displayName": "Duobus",
       "id": "duobus-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Duobus",
         "network:wikidata": "Q29608834",
@@ -3141,6 +3167,7 @@
       "locationSet": {"include": ["ca"]},
       "tags": {
         "network": "Durham Region Transit",
+        "network:wikidata": "Q5316548",
         "route": "bus"
       }
     },
@@ -3157,7 +3184,11 @@
       "displayName": "ECAT",
       "id": "ecat-a21cc9",
       "locationSet": {"include": ["us"]},
-      "tags": {"network": "ECAT", "route": "bus"}
+      "tags": {
+        "network": "ECAT",
+        "network:wikidata": "Q5396846",
+        "route": "bus"
+      }
     },
     {
       "displayName": "elővárosi",
@@ -3235,22 +3266,24 @@
       "locationSet": {"include": ["gb"]},
       "tags": {
         "network": "Ensign Bus",
+        "network:wikidata": "Q5380010",
         "route": "bus"
       }
     },
     {
       "displayName": "Entre Seine et Forêt",
       "id": "entreseineetforet-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Entre Seine et Forêt",
+        "network:wikidata": "Q28493682",
         "route": "bus"
       }
     },
     {
       "displayName": "Envia",
       "id": "envia-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Envia",
         "network:wikidata": "Q17640157",
@@ -3262,7 +3295,7 @@
     {
       "displayName": "Envibus",
       "id": "envibus-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Envibus",
         "network:wikidata": "Q3055422",
@@ -3365,7 +3398,11 @@
       "displayName": "ETS",
       "id": "ets-50b470",
       "locationSet": {"include": ["ca"]},
-      "tags": {"network": "ETS", "route": "bus"}
+      "tags": {
+        "network": "ETS",
+        "network:wikidata": "Q3048058",
+        "route": "bus"
+      }
     },
     {
       "displayName": "ETUSA",
@@ -3376,7 +3413,7 @@
     {
       "displayName": "Évéole",
       "id": "eveole-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Évéole",
         "network:wikidata": "Q3537948",
@@ -3410,6 +3447,7 @@
       "locationSet": {"include": ["ca"]},
       "tags": {
         "network": "exo-Chambly-Richelieu-Carignan",
+        "network:wikidata": "Q5011933",
         "route": "bus"
       }
     },
@@ -3419,6 +3457,7 @@
       "locationSet": {"include": ["ca"]},
       "tags": {
         "network": "exo-L'Assomption",
+        "network:wikidata": "Q55596812",
         "route": "bus"
       }
     },
@@ -3428,6 +3467,7 @@
       "locationSet": {"include": ["ca"]},
       "tags": {
         "network": "exo-La Presqu'île",
+        "network:wikidata": "Q4801810",
         "route": "bus"
       }
     },
@@ -3437,6 +3477,7 @@
       "locationSet": {"include": ["ca"]},
       "tags": {
         "network": "exo-Laurentides",
+        "network:wikidata": "Q2994089",
         "route": "bus"
       }
     },
@@ -3446,6 +3487,7 @@
       "locationSet": {"include": ["ca"]},
       "tags": {
         "network": "exo-Le Richelain",
+        "network:wikidata": "Q2994087",
         "route": "bus"
       }
     },
@@ -3455,6 +3497,7 @@
       "locationSet": {"include": ["ca"]},
       "tags": {
         "network": "exo-Rousillon",
+        "network:wikidata": "Q2994090",
         "route": "bus"
       }
     },
@@ -3464,6 +3507,7 @@
       "locationSet": {"include": ["ca"]},
       "tags": {
         "network": "exo-Sainte-Julie",
+        "network:wikidata": "Q55611277",
         "route": "bus"
       }
     },
@@ -3473,6 +3517,7 @@
       "locationSet": {"include": ["ca"]},
       "tags": {
         "network": "exo-Sorel-Varennes",
+        "network:wikidata": "Q5011938",
         "route": "bus"
       }
     },
@@ -3482,6 +3527,7 @@
       "locationSet": {"include": ["ca"]},
       "tags": {
         "network": "exo-Sud-Ouest",
+        "network:wikidata": "Q2994092",
         "route": "bus"
       }
     },
@@ -3491,6 +3537,7 @@
       "locationSet": {"include": ["ca"]},
       "tags": {
         "network": "exo-Terrebonne-Mascouche",
+        "network:wikidata": "Q55596813",
         "route": "bus"
       }
     },
@@ -3500,6 +3547,7 @@
       "locationSet": {"include": ["ca"]},
       "tags": {
         "network": "exo-Vallée du Richelieu",
+        "network:wikidata": "Q2994091",
         "route": "bus"
       }
     },
@@ -3509,6 +3557,7 @@
       "locationSet": {"include": ["es"]},
       "tags": {
         "network": "exprés.cat",
+        "network:wikidata": "Q8847125",
         "route": "bus"
       }
     },
@@ -3551,7 +3600,7 @@
     {
       "displayName": "Express A14",
       "id": "expressa14-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Express A14",
         "network:wikidata": "Q3456679",
@@ -3590,7 +3639,7 @@
     {
       "displayName": "Facilibus Saint Gervais",
       "id": "facilibussaintgervais-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Facilibus Saint Gervais",
         "route": "bus"
@@ -3602,6 +3651,7 @@
       "locationSet": {"include": ["us"]},
       "tags": {
         "network": "Fairfax Connector",
+        "network:wikidata": "Q5430155",
         "route": "bus"
       }
     },
@@ -3623,7 +3673,7 @@
     {
       "displayName": "Fil Bleu",
       "id": "filbleu-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Fil Bleu",
         "network:wikidata": "Q3071736",
@@ -3635,16 +3685,17 @@
     {
       "displayName": "Fil Vert",
       "id": "filvert-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Fil Vert",
+        "network:wikidata": "Q3533895",
         "route": "bus"
       }
     },
     {
       "displayName": "Filéo",
       "id": "fileo-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Filéo",
         "network:wikidata": "Q3072280",
@@ -3656,7 +3707,7 @@
     {
       "displayName": "Filibus",
       "id": "filibus-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Filibus",
         "network:wikidata": "Q3456682",
@@ -3701,7 +3752,7 @@
     {
       "displayName": "Fluo Grand Est",
       "id": "fluograndest-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "matchNames": [
         "réseau 67",
         "ted",
@@ -3720,7 +3771,7 @@
     {
       "displayName": "Fluo Grand Est 67",
       "id": "fluograndest67-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Fluo Grand Est 67",
         "route": "bus"
@@ -3729,7 +3780,7 @@
     {
       "displayName": "Fluo Grand Est 88",
       "id": "fluograndest88-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Fluo Grand Est 88",
         "route": "bus"
@@ -3741,6 +3792,7 @@
       "locationSet": {"include": ["se"]},
       "tags": {
         "network": "Flygbussarna",
+        "network:wikidata": "Q775247",
         "route": "bus"
       }
     },
@@ -3748,7 +3800,11 @@
       "displayName": "Föli",
       "id": "foli-3d6501",
       "locationSet": {"include": ["fi"]},
-      "tags": {"network": "Föli", "route": "bus"}
+      "tags": {
+        "network": "Föli",
+        "network:wikidata": "Q18658772",
+        "route": "bus"
+      }
     },
     {
       "displayName": "Foothill Transit",
@@ -3756,6 +3812,7 @@
       "locationSet": {"include": ["us"]},
       "tags": {
         "network": "Foothill Transit",
+        "network:wikidata": "Q5466493",
         "route": "bus"
       }
     },
@@ -3769,92 +3826,112 @@
       }
     },
     {
-      "displayName": "fr_alezan",
+      "displayName": "Alezan",
       "id": "fralezan-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
+      "matchNames": ["fr_alezan"],
       "tags": {
-        "network": "fr_alezan",
+        "network": "Alezan",
+        "network:wikidata": "Q2834718",
         "route": "bus"
       }
     },
     {
-      "displayName": "fr_alliance",
+      "displayName": "Alliance",
       "id": "fralliance-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
+      "matchNames": ["fr_alliance"],
       "tags": {
-        "network": "fr_alliance",
+        "network": "Alliance",
+        "network:wikidata": "Q16681017",
         "route": "bus"
       }
     },
     {
-      "displayName": "fr_carcassone_agglo",
+      "displayName": "Carcassone Agglo",
       "id": "frcarcassoneagglo-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
+      "matchNames": ["fr_carcassone_agglo"],
       "tags": {
-        "network": "fr_carcassone_agglo",
+        "network": "Carcassone Agglo",
+        "network:wikidata": "Q17640155",
         "route": "bus"
       }
     },
     {
-      "displayName": "fr_lila",
+      "displayName": "Lila",
       "id": "frlila-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
+      "matchNames": ["fr_lila"],
       "tags": {
-        "network": "fr_lila",
+        "network": "Lila",
+        "network:wikidata": "Q3240211",
         "route": "bus"
       }
     },
     {
-      "displayName": "fr_SMITU",
+      "displayName": "SMITU",
       "id": "frsmitu-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
+      "matchNames": ["fr_SMITU"],
       "tags": {
-        "network": "fr_SMITU",
+        "network": "SMITU",
+        "network:wikidata": "Q16681023",
         "route": "bus"
       }
     },
     {
-      "displayName": "fr_tisseo",
+      "displayName": "Tisseo",
       "id": "frtisseo-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
+      "matchNames": ["fr_tisseo"],
       "tags": {
-        "network": "fr_tisseo",
+        "network": "Tisseo",
+        "network:wikidata": "Q3529461",
         "route": "bus"
       }
     },
     {
-      "displayName": "FR:STAR",
+      "displayName": "STAR",
       "id": "frstar-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
+      "matchNames": ["FR:STAR"],
       "tags": {
-        "network": "FR:STAR",
+        "network": "STAR",
+        "network:wikidata": "Q3480422",
         "route": "bus"
       }
     },
     {
-      "displayName": "FR:SURF",
+      "displayName": "SURF",
       "id": "frsurf-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
+      "matchNames": ["FR:SURF"],
       "tags": {
-        "network": "FR:SURF",
+        "network": "SURF",
+        "network:wikidata": "Q56310007",
         "route": "bus"
       }
     },
     {
-      "displayName": "FR:TUB",
+      "displayName": "TUB",
       "id": "frtub-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
+      "matchNames": ["FR:TUB"],
       "tags": {
-        "network": "FR:TUB",
+        "network": "TUB",
+        "network:wikidata": "Q28493264",
         "route": "bus"
       }
     },
     {
-      "displayName": "FR:Vitobus",
+      "displayName": "Vit'o Bus",
       "id": "frvitobus-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
+      "matchNames": ["FR:Vitobus"],
       "tags": {
-        "network": "FR:Vitobus",
+        "network": "Vit'o Bus",
+        "network:wikidata": "Q56309921",
         "route": "bus"
       }
     },
@@ -3870,6 +3947,7 @@
       "locationSet": {"include": ["no"]},
       "tags": {
         "network": "FRAM Ekspress",
+        "network:wikidata": "Q37946807",
         "route": "bus"
       }
     },
@@ -3879,6 +3957,7 @@
       "locationSet": {"include": ["ca"]},
       "tags": {
         "network": "Fredericton Transit",
+        "network:wikidata": "Q5499255",
         "route": "bus"
       }
     },
@@ -3901,6 +3980,7 @@
       "locationSet": {"include": ["dk"]},
       "tags": {
         "network": "FynBus",
+        "network:wikidata": "Q12313224",
         "route": "bus"
       }
     },
@@ -3908,7 +3988,11 @@
       "displayName": "GATRA",
       "id": "gatra-a21cc9",
       "locationSet": {"include": ["us"]},
-      "tags": {"network": "GATRA", "route": "bus"}
+      "tags": {
+        "network": "GATRA",
+        "network:wikidata": "Q5600434",
+        "route": "bus"
+      }
     },
     {
       "displayName": "Gbaka d'Abobo",
@@ -3941,7 +4025,11 @@
       "displayName": "GBT",
       "id": "gbt-a21cc9",
       "locationSet": {"include": ["us"]},
-      "tags": {"network": "GBT", "route": "bus"}
+      "tags": {
+        "network": "GBT",
+        "network:wikidata": "Q5600471",
+        "route": "bus"
+      }
     },
     {
       "displayName": "Génovébus",
@@ -3956,18 +4044,26 @@
       "displayName": "GET",
       "id": "get-a21cc9",
       "locationSet": {"include": ["us"]},
-      "tags": {"network": "GET", "route": "bus"}
+      "tags": {
+        "network": "GET",
+        "network:wikidata": "Q5579372",
+        "route": "bus"
+      }
     },
     {
       "displayName": "GGT",
       "id": "ggt-a21cc9",
       "locationSet": {"include": ["us"]},
-      "tags": {"network": "GGT", "route": "bus"}
+      "tags": {
+        "network": "GGT",
+        "network:wikidata": "Q525895",
+        "route": "bus"
+      }
     },
     {
       "displayName": "Ginko",
       "id": "ginko-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Ginko",
         "network:wikidata": "Q3106780",
@@ -4015,6 +4111,7 @@
       "locationSet": {"include": ["us"]},
       "tags": {
         "network": "GoCary",
+        "network:wikidata": "Q5005923",
         "route": "bus"
       }
     },
@@ -4024,13 +4121,14 @@
       "locationSet": {"include": ["us"]},
       "tags": {
         "network": "GoDurham",
+        "network:wikidata": "Q5316462",
         "route": "bus"
       }
     },
     {
       "displayName": "Goëlys",
       "id": "goelys-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Goëlys",
         "route": "bus"
@@ -4060,13 +4158,14 @@
       "locationSet": {"include": ["us"]},
       "tags": {
         "network": "GoRaleigh",
+        "network:wikidata": "Q5035469",
         "route": "bus"
       }
     },
     {
       "displayName": "Gori Bus Network",
       "id": "goribusnetwork-a45453",
-      "locationSet": {"include": ["001"]},
+      "locationSet": {"include": ["ge"]},
       "tags": {
         "network": "Gori Bus Network",
         "route": "bus"
@@ -4087,6 +4186,7 @@
       "locationSet": {"include": ["us"]},
       "tags": {
         "network": "GoTriangle",
+        "network:wikidata": "Q7840091",
         "route": "bus"
       }
     },
@@ -4111,7 +4211,7 @@
     {
       "displayName": "Grand'R",
       "id": "grandr-ed7458",
-      "locationSet": {"include": ["fr"]},
+      "locationSet": {"include": ["fx"]},
       "tags": {
         "network": "Grand'R",
         "network:wikidata": "Q3456683",
@@ -4138,18 +4238,20 @@
       }
     },
     {
-      "displayName": "Greater Sudbury Transit",
+      "displayName": "GOVA",
       "id": "greatersudburytransit-50b470",
       "locationSet": {"include": ["ca"]},
+      "matchNames": ["Greater Sudbury Transit"],
       "tags": {
-        "network": "Greater Sudbury Transit",
+        "network": "GOVA",
+        "network:wikidata": "Q5600768",
         "route": "bus"
       }
     },
     {
       "displayName": "Green Line",
       "id": "greenline-8e0970",
-      "locationSet": {"include": ["uk"]},
+      "locationSet": {"include": ["gb-eng"]},
       "tags": {
         "network": "Green Line",
         "route": "bus"
@@ -4173,6 +4275,8 @@
       "locationSet": {"include": ["us"]},
       "tags": {
         "network": "Greensboro Transit Agency",
+        "network:short": "GTA",
+        "network:wikidata": "Q5604466",
         "route": "bus"
       }
     },
@@ -4223,13 +4327,21 @@
       "displayName": "GRT",
       "id": "grt-50b470",
       "locationSet": {"include": ["ca"]},
-      "tags": {"network": "GRT", "route": "bus"}
+      "tags": {
+        "network": "GRT",
+        "network:wikidata": "Q3459117",
+        "route": "bus"
+      }
     },
     {
       "displayName": "GRTC",
       "id": "grtc-a21cc9",
       "locationSet": {"include": ["us"]},
-      "tags": {"network": "GRTC", "route": "bus"}
+      "tags": {
+        "network": "GRTC",
+        "network:wikidata": "Q5600732",
+        "route": "bus"
+      }
     },
     {
       "displayName": "Grupo Ruiz",
@@ -4246,6 +4358,7 @@
       "locationSet": {"include": ["ca"]},
       "tags": {
         "network": "Guelph Transit",
+        "network:wikidata": "Q5614797",
         "route": "bus"
       }
     },
@@ -4253,7 +4366,11 @@
       "displayName": "GVT",
       "id": "gvt-a21cc9",
       "locationSet": {"include": ["us"]},
-      "tags": {"network": "GVT", "route": "bus"}
+      "tags": {
+        "network": "GVT",
+        "network:wikidata": "Q5595228",
+        "route": "bus"
+      }
     },
     {
       "displayName": "Gwinnett County Transit",
@@ -4261,6 +4378,7 @@
       "locationSet": {"include": ["us"]},
       "tags": {
         "network": "Gwinnett County Transit",
+        "network:wikidata": "Q5623666",
         "route": "bus"
       }
     },