diff --git a/data/brands/amenity/bank.json b/data/brands/amenity/bank.json
index 5a131542720..6aa61320b51 100644
--- a/data/brands/amenity/bank.json
+++ b/data/brands/amenity/bank.json
@@ -1232,6 +1232,17 @@
         "name": "Banco del Austro"
       }
     },
+    {
+      "displayName": "Banco del Bienestar",
+      "locationSet": {"include": ["mx"]},
+      "matchNames": ["bansefi"],
+      "tags": {
+        "amenity": "bank",
+        "brand": "Banco del Bienestar",
+        "brand:wikidata": "Q5719137",
+        "name": "Banco del Bienestar"
+      }
+    },
     {
       "displayName": "Banco di Napoli",
       "id": "bancodinapoli-7b36b5",
diff --git a/data/brands/amenity/fast_food.json b/data/brands/amenity/fast_food.json
index 9a9456dfb22..7c90012d569 100644
--- a/data/brands/amenity/fast_food.json
+++ b/data/brands/amenity/fast_food.json
@@ -5006,6 +5006,7 @@
       "tags": {
         "amenity": "fast_food",
         "brand": "Pollo Feliz",
+        "brand:wikidata": "Q113187047",
         "cuisine": "chicken",
         "name": "Pollo Feliz",
         "takeaway": "yes"
diff --git a/data/brands/amenity/ice_cream.json b/data/brands/amenity/ice_cream.json
index 11073e4b3e2..0f2306e3189 100644
--- a/data/brands/amenity/ice_cream.json
+++ b/data/brands/amenity/ice_cream.json
@@ -500,6 +500,16 @@
         "name": "Naturals"
       }
     },
+    {
+      "displayName": "Nutrisa",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "amenity": "ice_cream",
+        "brand": "Nutrisa",
+        "brand:wikidata": "Q113204689",
+        "name": "Nutrisa"
+      }
+    },
     {
       "displayName": "Orange Leaf",
       "id": "orangeleaffrozenyogurt-4cfb80",
diff --git a/data/brands/amenity/pharmacy.json b/data/brands/amenity/pharmacy.json
index bc21df96ae2..d1184c588b8 100644
--- a/data/brands/amenity/pharmacy.json
+++ b/data/brands/amenity/pharmacy.json
@@ -1045,20 +1045,6 @@
         "name": "Farmácia São João"
       }
     },
-    {
-      "displayName": "Farmacia Similares",
-      "id": "farmaciasimilares-f147d5",
-      "locationSet": {
-        "include": ["cl", "gt", "mx"]
-      },
-      "tags": {
-        "amenity": "pharmacy",
-        "brand": "Farmacia Similares",
-        "brand:wikidata": "Q62564610",
-        "healthcare": "pharmacy",
-        "name": "Farmacia Similares"
-      }
-    },
     {
       "displayName": "Farmacias Ahumada",
       "id": "farmaciasahumada-af67e0",
@@ -1100,7 +1086,7 @@
       "displayName": "Farmacias del Dr. Simi",
       "id": "farmaciasdeldrsimi-f147d5",
       "locationSet": {
-        "include": ["cl", "gt", "mx"]
+        "include": ["cl", "gt"]
       },
       "tags": {
         "amenity": "pharmacy",
@@ -1138,9 +1124,9 @@
       "displayName": "Farmacias Similares",
       "id": "farmaciassimilares-f147d5",
       "locationSet": {
-        "include": ["cl", "gt", "mx"]
+        "include": ["mx"]
       },
-      "matchNames": ["similares"],
+      "matchNames": ["farmacia similares"],
       "tags": {
         "amenity": "pharmacy",
         "brand": "Farmacias Similares",
@@ -1149,6 +1135,30 @@
         "name": "Farmacias Similares"
       }
     },
+    {
+      "displayName": "Farmacias Unión",
+      "locationSet": {"include": ["mx"]},
+      "matchNames": ["farmacia union"],
+      "tags": {
+        "amenity": "pharmacy",
+        "brand": "Farmacias Unión",
+        "brand:wikidata": "Q113186201",
+        "healthcare": "pharmacy",
+        "name": "Farmacias Unión"
+      }
+    },
+    {
+      "displayName": "Farmacias Yza",
+      "locationSet": {"include": ["mx"]},
+      "matchNames": ["farmacia yza"],
+      "tags": {
+        "amenity": "pharmacy",
+        "brand": "Farmacias Yza",
+        "brand:wikidata": "Q113186480",
+        "healthcare": "pharmacy",
+        "name": "Farmacias Yza"
+      }
+    },
     {
       "displayName": "Farmacity",
       "id": "farmacity-901f91",
diff --git a/data/brands/amenity/post_office.json b/data/brands/amenity/post_office.json
index a28277dbd41..beb3824cfce 100644
--- a/data/brands/amenity/post_office.json
+++ b/data/brands/amenity/post_office.json
@@ -40,6 +40,16 @@
         "name": "DPD"
       }
     },
+    {
+      "displayName": "Estafeta",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "amenity": "post_office",
+        "brand": "Estafeta",
+        "brand:wikidata": "Q108185876",
+        "name": "Estafeta"
+      }
+    },
     {
       "displayName": "FedEx Office",
       "id": "fedexoffice-27cb18",
@@ -79,6 +89,16 @@
         "shop": "copyshop"
       }
     },
+    {
+      "displayName": "Paquetexpress",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "amenity": "post_office",
+        "brand": "Paquetexpress",
+        "brand:wikidata": "Q113207758",
+        "name": "Paquetexpress"
+      }
+    },
     {
       "displayName": "Post Office (UK)",
       "id": "postoffice-a028f7",
diff --git a/data/brands/healthcare/laboratory.json b/data/brands/healthcare/laboratory.json
index 400c3dd9f88..bf4c30350bd 100644
--- a/data/brands/healthcare/laboratory.json
+++ b/data/brands/healthcare/laboratory.json
@@ -432,6 +432,18 @@
         "name": "Sabin"
       }
     },
+    {
+      "displayName": "Salud Digna",
+      "locationSet": {
+        "include": ["mx"]
+      },
+      "tags": {
+        "brand": "Salud Digna",
+        "brand:wikidata": "Q113200677",
+        "healthcare": "laboratory",
+        "name": "Salud Digna"
+      }
+    },
     {
       "displayName": "Synevo",
       "id": "synevo-d27ce4",
diff --git a/data/brands/office/telecommunication.json b/data/brands/office/telecommunication.json
index 021f21c18e6..50ac4db2ba2 100644
--- a/data/brands/office/telecommunication.json
+++ b/data/brands/office/telecommunication.json
@@ -123,6 +123,16 @@
         "office": "telecommunication"
       }
     },
+    {
+      "displayName": "izzi",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "izzi",
+        "brand:wikidata": "Q11680385",
+        "name": "izzi",
+        "office": "telecommunication"
+      }
+    },
     {
       "displayName": "Kcell",
       "id": "kcell-4679e0",
@@ -171,6 +181,17 @@
         "office": "telecommunication"
       }
     },
+    {
+      "displayName": "Telecomm-Telégrafos",
+      "locationSet": {"include": ["mx"]},
+      "matchNames": [ "telecomm" ],
+      "tags": {
+        "brand": "Telecomm-Telégrafos",
+        "brand:wikidata": "Q9082442",
+        "name": "Telecomm-Telégrafos",
+        "office": "telecommunication"
+      }
+    },
     {
       "displayName": "Telkomsel",
       "id": "telkomsel-89d943",
@@ -182,6 +203,26 @@
         "office": "telecommunication"
       }
     },
+    {
+      "displayName": "Telmex",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Telmex",
+        "brand:wikidata": "Q1420164",
+        "name": "Telmex",
+        "office": "telecommunication"
+      }
+    },
+    {
+      "displayName": "Totalplay",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Totalplay",
+        "brand:wikidata": "Q6151102",
+        "name": "Totalplay",
+        "office": "telecommunication"
+      }
+    },
     {
       "displayName": "Ucom",
       "id": "ucom-2921eb",
diff --git a/data/brands/shop/books.json b/data/brands/shop/books.json
index 91c9c8b3504..4f5bb0dafd8 100644
--- a/data/brands/shop/books.json
+++ b/data/brands/shop/books.json
@@ -304,6 +304,20 @@
         "shop": "books"
       }
     },
+    {
+      "displayName": "Gandhi",
+      "locationSet": {"include": ["mx"]},
+      "matchNames": [
+        "librería gandhi",
+        "librerías gandhi"
+      ],
+      "tags": {
+        "brand": "Gandhi",
+        "brand:wikidata": "Q17071066",
+        "name": "Gandhi",
+        "shop": "books"
+      }
+    },
     {
       "displayName": "Giunti al Punto",
       "id": "giuntialpunto-56c580",
@@ -594,6 +608,20 @@
         "shop": "books"
       }
     },
+    {
+      "displayName": "Porrúa",
+      "locationSet": {"include": ["mx"]},
+      "matchNames": [
+        "librería porrua",
+        "librerías porrua"
+      ],
+      "tags": {
+        "brand": "Porrúa",
+        "brand:wikidata": "Q981374",
+        "name": "Porrúa",
+        "shop": "books"
+      }
+    },
     {
       "displayName": "Press & Books",
       "id": "pressandbooks-65e1d5",
diff --git a/data/brands/shop/clothes.json b/data/brands/shop/clothes.json
index af2bfaa896d..16a011740c8 100644
--- a/data/brands/shop/clothes.json
+++ b/data/brands/shop/clothes.json
@@ -1896,6 +1896,16 @@
         "shop": "clothes"
       }
     },
+    {
+      "displayName": "Cuidado con el Perro",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Cuidado con el Perro",
+        "brand:wikidata": "Q113207167",
+        "name": "Cuidado con el Perro",
+        "shop": "clothes"
+      }
+    },
     {
       "displayName": "Cycle Gear",
       "id": "cyclegear-0a21d9",
@@ -4838,6 +4848,7 @@
       ],
       "tags": {
         "brand": "Milano",
+        "brand:wikidata": "Q113263715",
         "name": "Milano",
         "shop": "clothes"
       }
@@ -5491,6 +5502,16 @@
         "shop": "clothes"
       }
     },
+    {
+      "displayName": "Optima",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Optima",
+        "brand:wikidata": "Q113207925",
+        "name": "Optima",
+        "shop": "clothes"
+      }
+    },
     {
       "displayName": "Orcanta",
       "id": "orcanta-4a3e29",
@@ -6415,6 +6436,16 @@
         "shop": "clothes"
       }
     },
+    {
+      "displayName": "Santory",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Santory",
+        "brand:wikidata": "Q113207971",
+        "name": "Santory",
+        "shop": "clothes"
+      }
+    },
     {
       "displayName": "Sarar",
       "id": "sarar-86c702",
@@ -7652,6 +7683,16 @@
         "shop": "clothes"
       }
     },
+    {
+      "displayName": "Vertiche",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Vertiche",
+        "brand:wikidata": "Q113215945",
+        "name": "Vertiche",
+        "shop": "clothes"
+      }
+    },
     {
       "displayName": "Vicomte A",
       "id": "vicomtea-4a3e29",
diff --git a/data/brands/shop/convenience.json b/data/brands/shop/convenience.json
index 369ceb16160..54b5d335d03 100644
--- a/data/brands/shop/convenience.json
+++ b/data/brands/shop/convenience.json
@@ -116,6 +116,7 @@
       "locationSet": {"include": ["mx"]},
       "tags": {
         "brand": "7/24 Mix",
+        "brand:wikidata": "Q113264389",
         "name": "7/24 Mix",
         "shop": "convenience"
       }
@@ -172,6 +173,17 @@
         "shop": "convenience"
       }
     },
+    {
+      "displayName": "Abarrotes Monterrey",
+      "locationSet": {"include": ["mx"]},
+      "matchTags": ["shop/supermarket"],
+      "tags": {
+        "brand": "Abarrotes Monterrey",
+        "brand:wikidata": "Q113182569",
+        "name": "Abarrotes Monterrey",
+        "shop": "convenience"
+      }
+    },
     {
       "displayName": "abc (Poland)",
       "id": "abc-95f41b",
@@ -425,6 +437,19 @@
         "shop": "convenience"
       }
     },
+    {
+      "displayName": "Bama",
+      "locationSet": {
+        "include": ["mx"]
+      },
+      "matchTags": ["shop/supermarket"],
+      "tags": {
+        "brand": "Bama",
+        "brand:wikidata": "Q113182024",
+        "name": "Bama",
+        "shop": "convenience"
+      }
+    },
     {
       "displayName": "BellStores",
       "id": "bellstores-147d98",
@@ -2375,6 +2400,19 @@
         "shop": "convenience"
       }
     },
+    {
+      "displayName": "Neto",
+      "locationSet": {
+        "include": ["mx"]
+      },
+      "matchTags": ["shop/supermarket"],
+      "tags": {
+        "brand": "Neto",
+        "brand:wikidata": "Q113205593",
+        "name": "Neto",
+        "shop": "convenience"
+      }
+    },
     {
       "displayName": "NewDays",
       "id": "newdays-652b3e",
@@ -3194,6 +3232,19 @@
         "shop": "convenience"
       }
     },
+    {
+      "displayName": "Super Sánchez",
+      "locationSet": {
+        "include": ["mx"]
+      },
+      "matchTags": ["shop/supermarket"],
+      "tags": {
+        "brand": "Super Sánchez",
+        "brand:wikidata": "Q113182316",
+        "name": "Super Sánchez",
+        "shop": "convenience"
+      }
+    },
     {
       "displayName": "T. SN",
       "id": "tsn-80468a",
@@ -3300,6 +3351,19 @@
         "shop": "convenience"
       }
     },
+    {
+      "displayName": "Tiendas 3B",
+      "locationSet": {
+        "include": ["mx"]
+      },
+      "matchTags": ["shop/supermarket"],
+      "tags": {
+        "brand": "Tiendas 3B",
+        "brand:wikidata": "Q113217378",
+        "name": "Tiendas 3B",
+        "shop": "convenience"
+      }
+    },
     {
       "displayName": "Tiger Mart",
       "id": "tigermart-4d6b4b",
diff --git a/data/brands/shop/curtain.json b/data/brands/shop/curtain.json
index 34eaa51e912..45f1171e777 100644
--- a/data/brands/shop/curtain.json
+++ b/data/brands/shop/curtain.json
@@ -16,6 +16,16 @@
         "name": "Heytens",
         "shop": "curtain"
       }
+    },
+    {
+      "displayName": "Vianney",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Vianney",
+        "brand:wikidata": "Q113203804",
+        "name": "Vianney",
+        "shop": "curtain"
+      }
     }
   ]
 }
diff --git a/data/brands/shop/dairy.json b/data/brands/shop/dairy.json
index 49b80dc0ba5..ed496ac2fdd 100644
--- a/data/brands/shop/dairy.json
+++ b/data/brands/shop/dairy.json
@@ -20,6 +20,16 @@
         "shop": "dairy"
       }
     },
+    {
+      "displayName": "Liconsa",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Liconsa",
+        "brand:wikidata": "Q16147815",
+        "name": "Liconsa",
+        "shop": "dairy"
+      }
+    },
     {
       "displayName": "Mother Dairy",
       "id": "motherdairy-6e9671",
diff --git a/data/brands/shop/department_store.json b/data/brands/shop/department_store.json
index 861f5d5a941..6902d1b6634 100644
--- a/data/brands/shop/department_store.json
+++ b/data/brands/shop/department_store.json
@@ -332,6 +332,16 @@
         "shop": "department_store"
       }
     },
+    {
+      "displayName": "Del Sol",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Del Sol",
+        "brand:wikidata": "Q113207674",
+        "name": "Del Sol",
+        "shop": "department_store"
+      }
+    },
     {
       "displayName": "Dillard's",
       "id": "dillards-592fe0",
@@ -453,6 +463,16 @@
         "shop": "department_store"
       }
     },
+    {
+      "displayName": "Famsa",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Famsa",
+        "brand:wikidata": "Q5612214",
+        "name": "Famsa",
+        "shop": "department_store"
+      }
+    },
     {
       "displayName": "Fast Shop",
       "id": "fastshop-7a47e3",
@@ -1041,6 +1061,16 @@
         "shop": "department_store"
       }
     },
+    {
+      "displayName": "Palacio de Hierro",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Palacio de Hierro",
+        "brand:wikidata": "Q5351735",
+        "name": "Palacio de Hierro",
+        "shop": "department_store"
+      }
+    },
     {
       "displayName": "Pernambucanas",
       "id": "pernambucanas-7a47e3",
@@ -1126,6 +1156,16 @@
         "shop": "department_store"
       }
     },
+    {
+      "displayName": "Sanborns",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Sanborns",
+        "brand:wikidata": "Q113206386",
+        "name": "Sanborns",
+        "shop": "department_store"
+      }
+    },
     {
       "displayName": "Sears",
       "id": "sears-ce56c0",
@@ -1331,6 +1371,16 @@
         "shop": "department_store"
       }
     },
+    {
+      "displayName": "Woolworth (Del Sol)",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Del Sol",
+        "brand:wikidata": "Q113207674",
+        "name": "Woolworth",
+        "shop": "department_store"
+      }
+    },
     {
       "displayName": "롯데백화점",
       "id": "lottedepartmentstore-84c155",
diff --git a/data/brands/shop/fabric.json b/data/brands/shop/fabric.json
index 88e957cffaa..cc11c89e16d 100644
--- a/data/brands/shop/fabric.json
+++ b/data/brands/shop/fabric.json
@@ -31,6 +31,16 @@
         "shop": "fabric"
       }
     },
+    {
+      "displayName": "Modatelas",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Modatelas",
+        "brand:wikidata": "Q113188070",
+        "name": "Modatelas",
+        "shop": "fabric"
+      }
+    },
     {
       "displayName": "Mondial Tissus",
       "id": "mondialtissus-0a56b6",
@@ -52,6 +62,7 @@
       "locationSet": {"include": ["mx"]},
       "tags": {
         "brand": "Parisina",
+        "brand:wikidata": "Q113187331",
         "name": "Parisina",
         "shop": "fabric"
       }
diff --git a/data/brands/shop/furniture.json b/data/brands/shop/furniture.json
index 0abf992daf4..1ff63609da2 100644
--- a/data/brands/shop/furniture.json
+++ b/data/brands/shop/furniture.json
@@ -415,6 +415,16 @@
         "shop": "furniture"
       }
     },
+    {
+      "displayName": "Muebles Dico",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Muebles Dico",
+        "brand:wikidata": "Q113204615",
+        "name": "Muebles Dico",
+        "shop": "furniture"
+      }
+    },
     {
       "displayName": "Domayne",
       "id": "domayne-0da980",
diff --git a/data/brands/shop/hardware.json b/data/brands/shop/hardware.json
index e3c607ece32..603056c0b20 100644
--- a/data/brands/shop/hardware.json
+++ b/data/brands/shop/hardware.json
@@ -185,6 +185,16 @@
         "shop": "hardware"
       }
     },
+    {
+      "displayName": "Santandreu",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Santandreu",
+        "brand:wikidata": "Q113217174",
+        "name": "Santandreu",
+        "shop": "hardware"
+      }
+    },
     {
       "displayName": "Telhanorte",
       "id": "telhanorte-6396ad",
diff --git a/data/brands/shop/mobile_phone.json b/data/brands/shop/mobile_phone.json
index 9f214e0d030..90e0c2fecc4 100644
--- a/data/brands/shop/mobile_phone.json
+++ b/data/brands/shop/mobile_phone.json
@@ -351,6 +351,16 @@
         "shop": "mobile_phone"
       }
     },
+    {
+      "displayName": "iShop Mixup",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "iShop Mixup",
+        "brand:wikidata": "Q113206326",
+        "name": "iShop Mixup",
+        "shop": "mobile_phone"
+      }
+    },
     {
       "displayName": "Koodo",
       "id": "koodo-947b24",
diff --git a/data/brands/shop/optician.json b/data/brands/shop/optician.json
index f87c0ff1334..15b54249211 100644
--- a/data/brands/shop/optician.json
+++ b/data/brands/shop/optician.json
@@ -231,6 +231,16 @@
         "shop": "optician"
       }
     },
+    {
+      "displayName": "Devlyn",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Devlyn",
+        "brand:wikidata": "Q113203949",
+        "name": "Devlyn",
+        "shop": "optician"
+      }
+    },
     {
       "displayName": "Écouter Voir",
       "id": "ecoutervoir-8cd79e",
diff --git a/data/brands/shop/paint.json b/data/brands/shop/paint.json
index 2d7985ac340..53d0fbfcddb 100644
--- a/data/brands/shop/paint.json
+++ b/data/brands/shop/paint.json
@@ -166,6 +166,18 @@
         "shop": "paint"
       }
     },
+    {
+      "displayName": "Sayer",
+      "locationSet": {
+        "include": ["mx"]
+      },
+      "tags": {
+        "brand": "Sayer",
+        "brand:wikidata": "Q426553",
+        "name": "Sayer",
+        "shop": "paint"
+      }
+    },
     {
       "displayName": "Sherwin-Williams",
       "id": "sherwinwilliams-573ec1",
diff --git a/data/brands/shop/pawnbroker.json b/data/brands/shop/pawnbroker.json
index 57da6351fdc..57dad7d6c61 100644
--- a/data/brands/shop/pawnbroker.json
+++ b/data/brands/shop/pawnbroker.json
@@ -73,6 +73,18 @@
         "short_name": "Cebuana"
       }
     },
+    {
+      "displayName": "Fundación Dondé",
+      "locationSet": {"include": ["mx"]},
+      "matchNames": ["donde"],
+      "tags": {
+        "brand": "Fundación Dondé",
+        "brand:wikidata": "Q113203720",
+        "name": "Fundación Dondé",
+        "shop": "pawnbroker",
+        "short_name": "Dondé"
+      }
+    },
     {
       "displayName": "Exchange",
       "id": "exchange-a6b41f",
@@ -138,6 +150,16 @@
         "shop": "pawnbroker"
       }
     },
+    {
+      "displayName": "Nacional Monte de Piedad",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Nacional Monte de Piedad",
+        "brand:wikidata": "Q3402106",
+        "name": "Nacional Monte de Piedad",
+        "shop": "pawnbroker"
+      }
+    },
     {
       "displayName": "Palawan Pawnshop",
       "id": "palawanpawnshop-6d9487",
diff --git a/data/brands/shop/shoes.json b/data/brands/shop/shoes.json
index 0341b9340c7..e5af7f0f22f 100644
--- a/data/brands/shop/shoes.json
+++ b/data/brands/shop/shoes.json
@@ -322,6 +322,16 @@
         "shop": "shoes"
       }
     },
+    {
+      "displayName": "Cklass",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Cklass",
+        "brand:wikidata": "Q113204501",
+        "name": "Cklass",
+        "shop": "shoes"
+      }
+    },
     {
       "displayName": "Cole Haan",
       "id": "colehaan-c5ede1",
diff --git a/data/brands/shop/stationery.json b/data/brands/shop/stationery.json
index 6f4ed1c2044..69a8463a5ff 100644
--- a/data/brands/shop/stationery.json
+++ b/data/brands/shop/stationery.json
@@ -63,6 +63,18 @@
         "shop": "stationery"
       }
     },
+    {
+      "displayName": "Compucopias",
+      "locationSet": {
+        "include": ["mx"]
+      },
+      "tags": {
+        "brand": "Compucopias",
+        "brand:wikidata": "Q113186055",
+        "name": "Compucopias",
+        "shop": "stationery"
+      }
+    },
     {
       "displayName": "Folder",
       "id": "folder-e0984f",
@@ -244,6 +256,18 @@
         "shop": "stationery"
       }
     },
+    {
+      "displayName": "Tony",
+      "locationSet": {
+        "include": ["mx"]
+      },
+      "tags": {
+        "brand": "Tony",
+        "brand:wikidata": "Q113217034",
+        "name": "Tony",
+        "shop": "stationery"
+      }
+    },
     {
       "displayName": "Warehouse Stationery",
       "id": "warehousestationery-a34cb3",
diff --git a/data/brands/shop/supermarket.json b/data/brands/shop/supermarket.json
index 97741ad5dff..95357529988 100644
--- a/data/brands/shop/supermarket.json
+++ b/data/brands/shop/supermarket.json
@@ -4339,6 +4339,7 @@
       "locationSet": {"include": ["mx"]},
       "tags": {
         "brand": "Mi Bodega Aurrera",
+        "brand:wikidata": "Q3365858",
         "name": "Mi Bodega Aurrera",
         "shop": "supermarket"
       }
@@ -5492,6 +5493,7 @@
       "matchNames": ["super mercados s-mart"],
       "tags": {
         "brand": "S-Mart",
+        "brand:wikidata": "Q7387069",
         "name": "S-Mart",
         "shop": "supermarket"
       }
@@ -5595,6 +5597,16 @@
         "shop": "supermarket"
       }
     },
+    {
+      "displayName": "Selecto Chedraui",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Chedraui",
+        "brand:wikidata": "Q2961952",
+        "name": "Selecto Chedraui",
+        "shop": "supermarket"
+      }
+    },
     {
       "displayName": "Selver",
       "id": "selver-e21b3b",
@@ -6092,6 +6104,26 @@
         "shop": "supermarket"
       }
     },
+    {
+      "displayName": "Super Che",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Chedraui",
+        "brand:wikidata": "Q2961952",
+        "name": "Super Che",
+        "shop": "supermarket"
+      }
+    },
+    {
+      "displayName": "Super Chedraui",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Chedraui",
+        "brand:wikidata": "Q2961952",
+        "name": "Super Chedraui",
+        "shop": "supermarket"
+      }
+    },
     {
       "displayName": "Super del Norte",
       "id": "superdelnorte-9b2dfb",
@@ -6126,6 +6158,16 @@
         "shop": "supermarket"
       }
     },
+    {
+      "displayName": "Super Selecto Chedraui",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Chedraui",
+        "brand:wikidata": "Q2961952",
+        "name": "Super Selecto Chedraui",
+        "shop": "supermarket"
+      }
+    },
     {
       "displayName": "Super U",
       "id": "superu-c16b1c",
@@ -6171,6 +6213,16 @@
         "shop": "supermarket"
       }
     },
+    {
+      "displayName": "Supercito Chedraui",
+      "locationSet": {"include": ["mx"]},
+      "tags": {
+        "brand": "Chedraui",
+        "brand:wikidata": "Q2961952",
+        "name": "Supercito Chedraui",
+        "shop": "supermarket"
+      }
+    },
     {
       "displayName": "Supercor",
       "id": "supercor-d9bffc",
@@ -6194,6 +6246,17 @@
         "shop": "supermarket"
       }
     },
+    {
+      "displayName": "SuperISSSTE",
+      "locationSet": {"include": ["mx"]},
+      "matchTags": ["shop/convenience"],
+      "tags": {
+        "brand": "SuperISSSTE",
+        "brand:wikidata": "Q113205941",
+        "name": "SuperISSSTE",
+        "shop": "supermarket"
+      }
+    },
     {
       "displayName": "Supermercati Zazzeron",
       "id": "supermercatizazzeron-0cb133",
@@ -6816,11 +6879,23 @@
         "shop": "supermarket"
       }
     },
+    {
+      "displayName": "Walmart Express",
+      "locationSet": {
+        "include": ["mx"],
+      },
+      "tags": {
+        "brand": "Walmart",
+        "brand:wikidata": "Q483551",
+        "name": "Walmart Express",
+        "shop": "supermarket"
+      }
+    },
     {
       "displayName": "Walmart Neighborhood Market",
       "id": "walmartneighborhoodmarket-79cc8a",
       "locationSet": {
-        "include": ["ca", "mx", "us"]
+        "include": ["ca", "us"]
       },
       "tags": {
         "brand": "Walmart",
diff --git a/data/brands/shop/tiles.json b/data/brands/shop/tiles.json
index 4445bd0bbba..75b0f12bf4f 100644
--- a/data/brands/shop/tiles.json
+++ b/data/brands/shop/tiles.json
@@ -16,6 +16,17 @@
         "shop": "tiles"
       }
     },
+    {
+      "displayName": "Interceramic",
+      "locationSet": {"include": ["mx"]},
+      "matchTags": ["shop/diy", "shop/hardware"],
+      "tags": {
+        "brand": "Interceramic",
+        "brand:wikidata": "Q113203429",
+        "name": "Interceramic",
+        "shop": "tiles"
+      }
+    },
     {
       "displayName": "Tile Giant",
       "id": "tilegiant-d8218f",
diff --git a/data/brands/shop/variety_store.json b/data/brands/shop/variety_store.json
index 7b1b72af48e..9c3897098a6 100644
--- a/data/brands/shop/variety_store.json
+++ b/data/brands/shop/variety_store.json
@@ -756,6 +756,18 @@
         "shop": "variety_store"
       }
     },
+    {
+      "displayName": "Waldo's",
+      "locationSet": {
+        "include": ["mx"],
+      },
+      "tags": {
+        "brand": "Waldo's",
+        "brand:wikidata": "Q6166095",
+        "name": "Waldo's",
+        "shop": "variety_store"
+      }
+    },
     {
       "displayName": "Wilko",
       "id": "wilko-622078",
diff --git a/data/operators/amenity/post_office.json b/data/operators/amenity/post_office.json
index 7093e565002..481a2fe22d6 100644
--- a/data/operators/amenity/post_office.json
+++ b/data/operators/amenity/post_office.json
@@ -296,7 +296,11 @@
       "displayName": "Correos de México",
       "id": "correosdemexico-0b19e1",
       "locationSet": {"include": ["mx"]},
+      "matchNames": [
+        "sepomex"
+      ],
       "tags": {
+        "name": "Correos de México",
         "amenity": "post_office",
         "operator": "Correos de México",
         "operator:wikidata": "Q5172898"