From 1e01639c56410c47d8543fd210eddd66eb6b49f4 Mon Sep 17 00:00:00 2001
From: kempersc <sckemper@mailfence.com>
Date: Sun, 7 Dec 2025 17:47:09 +0100
Subject: [PATCH] fix(data): resolve XXX placeholder city codes to actual
 GeoNames settlements

Rename 144 custodian files from XXX placeholders to resolved city codes:
- BR (65): ASA, RBR, MAN, FAZ, MAC, VIT, FOR, GUA, BRE, GOI, SLU, BHO, XAN, CGR, CUI, etc.
- CH (24): ZUR, BER, GEN, BAL, LUC, etc.
- MX (23): MEX, GDL, MTY, PUE, etc.
- CL (9): SCL, VAL, etc.
- CZ (5): PRG, BRN, MSV, etc.
- KR (4): SEL, etc.
- GB (4): LON, etc.
- FR (3): PAR, etc.
- IN (2): DEL, etc.
- PH, JP, EE (1 each)

City codes derived from GeoNames reverse geocoding using institution coordinates.
GHCID format: {COUNTRY}-{REGION}-{CITY}-{TYPE}-{ABBREV}
---
 ...ml => BR-AC-ASA-E-UR-ufac_repository.yaml} |  30 ++-
 ...R-AC-XXX-E-UR.yaml => BR-AC-ASA-E-UR.yaml} |  30 ++-
 ...EM-fundacao_de_cultura_elias_mansour.yaml} |  30 ++-
 ...-XXX-O-FCEM.yaml => BR-AC-RBR-O-FCEM.yaml} |  30 ++-
 ...-XXX-X-CCPA.yaml => BR-AM-MAN-X-CCPA.yaml} |  30 ++-
 ....yaml => BR-AP-FAZ-E-CU-cepap_unifap.yaml} |  32 ++-
 ...R-AM-XXX-E-CU.yaml => BR-AP-FAZ-E-CU.yaml} |  32 ++-
 ....yaml => BR-AP-MAC-O-SA-secult_amapa.yaml} |  31 ++-
 ...R-AM-XXX-O-SA.yaml => BR-AP-MAC-O-SA.yaml} |  31 ++-
 ...ml => BR-BA-VIT-E-UR-ufba_repository.yaml} |  29 ++-
 ...R-BA-XXX-E-UR.yaml => BR-BA-VIT-E-UR.yaml} |  29 ++-
 ...aml => BR-CE-FOR-E-UR-ufc_repository.yaml} |  29 ++-
 ...R-CE-XXX-E-UR.yaml => BR-CE-FOR-E-UR.yaml} |  29 ++-
 ...-ES-GUA-E-UDL-ufes_digital_libraries.yaml} |  30 ++-
 ...ES-XXX-E-UDL.yaml => BR-ES-GUA-E-UDL.yaml} |  30 ++-
 ...l => BR-GO-BRE-E-UR-ufg_repositories.yaml} |  30 ++-
 ...R-GO-XXX-E-UR.yaml => BR-GO-BRE-E-UR.yaml} |  30 ++-
 ...> BR-GO-GOI-M-UGV-unesco_goias_velho.yaml} |  29 ++-
 ...GO-XXX-M-UGV.yaml => BR-GO-GOI-M-UGV.yaml} |  29 ++-
 ...LU-X-CMCN-casa_das_minascasa_de_nago.yaml} |  29 ++-
 ...-XXX-X-CMCN.yaml => BR-MA-SLU-X-CMCN.yaml} |  29 ++-
 ...dau.yaml => BR-MG-BHO-X-MG-mm_gerdau.yaml} |  32 ++-
 ...R-MI-XXX-X-MG.yaml => BR-MG-BHO-X-MG.yaml} |  32 ++-
 ...MG-XAN-X-GKP-guarani_kaiowa_projects.yaml} |  32 ++-
 ...MA-XXX-X-GKP.yaml => BR-MG-XAN-X-GKP.yaml} |  32 ++-
 ...=> BR-MI-BHO-E-UTL-ufmg_tainacan_lab.yaml} | 233 +++++++++--------
 ...MI-XXX-E-UTL.yaml => BR-MI-BHO-E-UTL.yaml} | 233 +++++++++--------
 ... => BR-MS-CGR-E-UR-ufms_repositories.yaml} |  32 ++-
 ...R-MA-XXX-E-UR.yaml => BR-MS-CGR-E-UR.yaml} |  32 ++-
 ...mt.yaml => BR-MT-CUI-M-MU-musearufmt.yaml} |  32 ++-
 ...R-MA-XXX-M-MU.yaml => BR-MT-CUI-M-MU.yaml} |  32 ++-
 ...uepb.yaml => BR-PB-CGR-E-UU-ufpbuepb.yaml} |  32 ++-
 ...R-PA-XXX-E-UU.yaml => BR-PB-CGR-E-UU.yaml} |  32 ++-
 ...R-CE-XXX-O-MC.yaml => BR-PE-FDN-O-MC.yaml} |  32 ++-
 ...hgp.yaml => BR-PE-REC-X-MI-mepeiahgp.yaml} |  29 ++-
 ...R-PE-XXX-X-MI.yaml => BR-PE-REC-X-MI.yaml} |  29 ++-
 ...umdham.yaml => BR-PI-SRN-X-F-fumdham.yaml} |  30 ++-
 ...{BR-PI-XXX-X-F.yaml => BR-PI-SRN-X-F.yaml} |  30 ++-
 ...marmam.yaml => BR-RJ-CEN-M-MM-marmam.yaml} |  32 ++-
 ...R-RI-XXX-M-MM.yaml => BR-RJ-CEN-M-MM.yaml} |  32 ++-
 ...=> BR-RJ-CEN-X-HD-hemeroteca_digital.yaml} |  32 ++-
 ...R-TO-XXX-X-HD.yaml => BR-RJ-CEN-X-HD.yaml} |  32 ++-
 ...yaml => BR-RJ-RDJ-A-DA-deap_archives.yaml} |  32 ++-
 ...R-PA-XXX-A-DA.yaml => BR-RJ-RDJ-A-DA.yaml} |  32 ++-
 ...R-ES-XXX-A-SA.yaml => BR-RJ-RDJ-A-SA.yaml} |  32 ++-
 ...> BR-RR-REC-X-II-instituto_insikiran.yaml} |  31 ++-
 ...R-RO-XXX-X-II.yaml => BR-RR-REC-X-II.yaml} |  31 ++-
 ...me.yaml => BR-RS-PAL-E-UL-ufrgs_lume.yaml} |  32 ++-
 ...R-RI-XXX-E-UL.yaml => BR-RS-PAL-E-UL.yaml} |  32 ++-
 ... => BR-SC-FLO-E-UDA-ufsc_digital_art.yaml} |  32 ++-
 ...SA-XXX-E-UDA.yaml => BR-SC-FLO-E-UDA.yaml} |  32 ++-
 ...cipac.yaml => BR-SP-GAR-O-FI-fpcipac.yaml} |  32 ++-
 ...R-BA-XXX-O-FI.yaml => BR-SP-GAR-O-FI.yaml} |  32 ++-
 ...l => BR-SP-LSD-E-UUU-uspunicampunesp.yaml} |  33 ++-
 ...SA-XXX-E-UUU.yaml => BR-SP-LSD-E-UUU.yaml} |  33 ++-
 ...-O-F-fcrb.yaml => BR-SP-RVD-O-F-fcrb.yaml} |  32 ++-
 ...{BR-RI-XXX-O-F.yaml => BR-SP-RVD-O-F.yaml} |  32 ++-
 ...-A-apesp.yaml => BR-SP-SPA-X-A-apesp.yaml} |  31 ++-
 ...{BR-SA-XXX-X-A.yaml => BR-SP-SPA-X-A.yaml} |  31 ++-
 ...SP-SPA-X-TI-tainacan_implementations.yaml} |  32 ++-
 ...R-SA-XXX-X-TI.yaml => BR-SP-SPA-X-TI.yaml} |  32 ++-
 ...R-TO-XXX-R-JH.yaml => BR-TO-JAL-R-JH.yaml} |  29 ++-
 ...l => BR-TO-PAL-O-ST-secult_tocantins.yaml} |  30 ++-
 ...R-TO-XXX-O-ST.yaml => BR-TO-PAL-O-ST.yaml} |  30 ++-
 ...l => BR-TO-SFD-R-JH-jalapao_heritage.yaml} |  30 ++-
 ...ational_schweizer_sektion_bibliothek.yaml} |  29 ++-
 ...BE-XXX-M-BHM.yaml => CH-BE-BER-M-BHM.yaml} |  29 ++-
 ...H-BL-XXX-L-GO.yaml => CH-BL-OBE-L-GO.yaml} |  29 ++-
 ...UGKFPSB.yaml => CH-BS-BAS-L-RUGKFPSB.yaml} |  38 ++-
 ...FR-XXX-L-BPS.yaml => CH-FR-FRI-L-BPS.yaml} |  29 ++-
 ...XX-A-ACDAV.yaml => CH-GE-GEN-A-ACDAV.yaml} |  29 ++-
 ...-XXX-A-RTSR.yaml => CH-GE-GEN-A-RTSR.yaml} |  29 ++-
 ...MDEGM.yaml => CH-GE-GEN-L-AIMPAMDEGM.yaml} |  38 ++-
 ...XX-U-SCSPB.yaml => CH-GE-GEN-U-SCSPB.yaml} |  31 ++-
 ...ZG-XXX-L-PSM.yaml => CH-GR-MAR-L-PSM.yaml} |  31 ++-
 ...GR-XXX-U-MCR.yaml => CH-GR-MVI-U-MCR.yaml} |  29 ++-
 ...LU-XXX-A-SKL.yaml => CH-LU-LUZ-A-SKL.yaml} |  29 ++-
 ...-XXX-L-OKLB.yaml => CH-LU-LUZ-L-OKLB.yaml} |  29 ++-
 ...H-LU-XXX-A-GH.yaml => CH-LU-SEM-A-GH.yaml} |  29 ++-
 ...NE-XXX-L-BPN.yaml => CH-NE-NEU-L-BPN.yaml} |  29 ++-
 ...-XXX-L-LABD.yaml => CH-SH-BAR-L-LABD.yaml} |  31 ++-
 ...-XXX-A-ASCT.yaml => CH-TI-BEL-A-ASCT.yaml} |  29 ++-
 ...H-TI-XXX-A-AP.yaml => CH-TI-RUV-A-AP.yaml} |  29 ++-
 ...VD-XXX-L-BGB.yaml => CH-VD-BUS-L-BGB.yaml} |  29 ++-
 ...{CH-GE-XXX-L-M.yaml => CH-VS-VIS-L-M.yaml} |  31 ++-
 ...-L-ZHZBSA.yaml => CH-ZH-BAE-L-ZHZBSA.yaml} |  29 ++-
 ...-XXX-L-SGBU.yaml => CH-ZH-OBE-L-SGBU.yaml} |  31 ++-
 ...-L-UZEIEB.yaml => CH-ZH-ZUE-L-UZEIEB.yaml} |  29 ++-
 ...ibliothek_zurich_phonetik_bibliothek.yaml} |  29 ++-
 ...L-TA-XXX-A-DA.yaml => CL-AP-GUA-A-DA.yaml} |  32 ++-
 ...L-CO-XXX-A-EA.yaml => CL-AP-GUA-A-EA.yaml} |  31 ++-
 ...XX-A-BMSAS.yaml => CL-CU-SAN-A-BMSAS.yaml} | 233 +++++++++--------
 ...CH-XXX-X-CIH.yaml => CL-LL-TDP-X-CIH.yaml} |  31 ++-
 ...CH-XXX-R-FIP.yaml => CL-LR-ANC-R-FIP.yaml} |  31 ++-
 ...-XXX-O-SNPC.yaml => CL-MA-REC-O-SNPC.yaml} |  32 ++-
 ...L-LO-XXX-A-AN.yaml => CL-MA-SAN-A-AN.yaml} |  31 ++-
 ...IS-XXX-L-WML.yaml => CL-TA-HRO-L-WML.yaml} |  31 ++-
 ...SA-XXX-R-FBP.yaml => CL-TA-SFE-R-FBP.yaml} |  31 ++-
 ...10-XXX-A-VHA.yaml => CZ-52-DLI-A-VHA.yaml} |  34 ++-
 ...Z-10-XXX-A-AS.yaml => CZ-52-LIT-A-AS.yaml} |  34 ++-
 ...10-XXX-A-ABS.yaml => CZ-52-PRA-A-ABS.yaml} |  34 ++-
 ...-AÚAČBVV.yaml => CZ-78-BRN-A-AÚAČBVV.yaml} |  34 ++-
 ...-XXX-M-MJOK.yaml => CZ-79-NET-M-MJOK.yaml} |  34 ++-
 ...52-XXX-M-MBN.yaml => CZ-82-MSK-M-MBN.yaml} |  34 ++-
 ...52-XXX-M-MBČ.yaml => CZ-82-MSV-M-MBČ.yaml} |  34 ++-
 ...E-01-TAL-A-TCA-tallinn_city_archives.yaml} |  34 ++-
 ...e_of_cinematography_and_animated_pic.yaml} |  35 ++-
 ...XX-A-NCCAP.yaml => FR-11-P1O-A-NCCAP.yaml} |  35 ++-
 ...tional_industrial_property_institute.yaml} | 118 ++++-----
 ...NG-CUB-M-RMG-royal_museums_greenwich.yaml} |  34 ++-
 ...M-XXX-M-RMG.yaml => GB-ENG-CUB-M-RMG.yaml} |  34 ++-
 ...-ENG-KCR-O-BLB-british_library_board.yaml} |  34 ++-
 ...M-XXX-O-BLB.yaml => GB-ENG-KCR-O-BLB.yaml} |  34 ++-
 ...L-KBOL-khuda_bakhsh_oriental_library.yaml} |  34 ++-
 ...-XXX-L-KBOL.yaml => IN-34-BAN-L-KBOL.yaml} |  34 ++-
 ...-L-OITUBL.yaml => JP-32-MTI-L-OITUBL.yaml} |  31 ++-
 ...ive_association_of_the_national_debt.yaml} |  35 ++-
 ...-A-CANDRM.yaml => KR-11-SAJ-A-CANDRM.yaml} |  35 ++-
 ...ml => KR-11-SEO-C-DI-the_dong_a_ilbo.yaml} |  32 ++-
 ...R-11-XXX-C-DI.yaml => KR-11-SEO-C-DI.yaml} |  32 ++-
 ...A-XXX-X-ISC.yaml => MX-BCS-LPA-X-ISC.yaml} |  32 ++-
 ...A-XXX-X-CDP.yaml => MX-CAM-CAL-X-CDP.yaml} |  31 ++-
 ...A-XXX-A-CCA.yaml => MX-CAM-CAM-A-CCA.yaml} |  31 ++-
 ...-ZA-XXX-A-CA.yaml => MX-CMX-BNO-A-CA.yaml} |  32 ++-
 ...-ZA-XXX-O-CR.yaml => MX-CMX-BNO-O-CR.yaml} |  32 ++-
 ...-ZA-XXX-A-IA.yaml => MX-CMX-COY-A-IA.yaml} |  32 ++-
 ...XXX-X-PCIC.yaml => MX-CMX-CUA-X-PCIC.yaml} |  32 ++-
 ...H-XXX-A-ILA.yaml => MX-CMX-MEX-A-ILA.yaml} |  32 ++-
 ...preme_court_of_justice_of_the_nation.yaml} |  33 ++-
 ...-ZA-XXX-L-LC.yaml => MX-CMX-MEX-L-LC.yaml} |  32 ++-
 ...A-XXX-M-CMN.yaml => MX-CMX-MHI-M-CMN.yaml} |  32 ++-
 ...-ZA-XXX-X-FT.yaml => MX-CMX-SLU-X-FT.yaml} |  32 ++-
 ...-ZA-XXX-A-AA.yaml => MX-CMX-TLA-A-AA.yaml} |  32 ++-
 ...H-XXX-M-PSM.yaml => MX-COA-SDO-M-PSM.yaml} |  32 ++-
 ...-ZA-XXX-A-FN.yaml => MX-HID-PDS-A-FN.yaml} |  31 ++-
 ...-ZA-XXX-X-SN.yaml => MX-HID-PDS-X-SN.yaml} |  31 ++-
 ...XXX-A-GAQR.yaml => MX-ROO-CHE-A-GAQR.yaml} |  32 ++-
 ...U-XXX-M-CCM.yaml => MX-ROO-CHE-M-CCM.yaml} |  31 ++-
 ...-SI-XXX-O-UR.yaml => MX-SIN-LLI-O-UR.yaml} |  32 ++-
 ...XXX-X-ITCA.yaml => MX-TAM-CVI-X-ITCA.yaml} |  32 ++-
 ...X-ZA-XXX-X-FD.yaml => MX-ZA-LAN-X-FD.yaml} | 233 +++++++++--------
 ...ZA-XXX-X-DFC.yaml => MX-ZA-PRO-X-DFC.yaml} | 243 +++++++++---------
 ...XXX-X-IRPM.yaml => MX-ZAC-CSC-X-IRPM.yaml} |  32 ++-
 ...0-XXX-O-NMP.yaml => PH-NCR-MAN-O-NMP.yaml} |  35 ++-
 144 files changed, 4274 insertions(+), 1358 deletions(-)
 rename data/custodian/{BR-AC-XXX-E-UR-ufac_repository.yaml => BR-AC-ASA-E-UR-ufac_repository.yaml} (83%)
 rename data/custodian/{BR-AC-XXX-E-UR.yaml => BR-AC-ASA-E-UR.yaml} (83%)
 rename data/custodian/{BR-AC-XXX-O-FCEM-fundacao_de_cultura_elias_mansour.yaml => BR-AC-RBR-O-FCEM-fundacao_de_cultura_elias_mansour.yaml} (82%)
 rename data/custodian/{BR-AC-XXX-O-FCEM.yaml => BR-AC-RBR-O-FCEM.yaml} (84%)
 rename data/custodian/{BR-AM-XXX-X-CCPA.yaml => BR-AM-MAN-X-CCPA.yaml} (83%)
 rename data/custodian/{BR-AM-XXX-E-CU-cepap_unifap.yaml => BR-AP-FAZ-E-CU-cepap_unifap.yaml} (82%)
 rename data/custodian/{BR-AM-XXX-E-CU.yaml => BR-AP-FAZ-E-CU.yaml} (82%)
 rename data/custodian/{BR-AM-XXX-O-SA-secult_amapa.yaml => BR-AP-MAC-O-SA-secult_amapa.yaml} (82%)
 rename data/custodian/{BR-AM-XXX-O-SA.yaml => BR-AP-MAC-O-SA.yaml} (83%)
 rename data/custodian/{BR-BA-XXX-E-UR-ufba_repository.yaml => BR-BA-VIT-E-UR-ufba_repository.yaml} (83%)
 rename data/custodian/{BR-BA-XXX-E-UR.yaml => BR-BA-VIT-E-UR.yaml} (84%)
 rename data/custodian/{BR-CE-XXX-E-UR-ufc_repository.yaml => BR-CE-FOR-E-UR-ufc_repository.yaml} (83%)
 rename data/custodian/{BR-CE-XXX-E-UR.yaml => BR-CE-FOR-E-UR.yaml} (84%)
 rename data/custodian/{BR-ES-XXX-E-UDL-ufes_digital_libraries.yaml => BR-ES-GUA-E-UDL-ufes_digital_libraries.yaml} (82%)
 rename data/custodian/{BR-ES-XXX-E-UDL.yaml => BR-ES-GUA-E-UDL.yaml} (83%)
 rename data/custodian/{BR-GO-XXX-E-UR-ufg_repositories.yaml => BR-GO-BRE-E-UR-ufg_repositories.yaml} (82%)
 rename data/custodian/{BR-GO-XXX-E-UR.yaml => BR-GO-BRE-E-UR.yaml} (83%)
 rename data/custodian/{BR-GO-XXX-M-UGV-unesco_goias_velho.yaml => BR-GO-GOI-M-UGV-unesco_goias_velho.yaml} (82%)
 rename data/custodian/{BR-GO-XXX-M-UGV.yaml => BR-GO-GOI-M-UGV.yaml} (83%)
 rename data/custodian/{BR-MA-XXX-X-CMCN-casa_das_minascasa_de_nago.yaml => BR-MA-SLU-X-CMCN-casa_das_minascasa_de_nago.yaml} (82%)
 rename data/custodian/{BR-MA-XXX-X-CMCN.yaml => BR-MA-SLU-X-CMCN.yaml} (83%)
 rename data/custodian/{BR-MI-XXX-X-MG-mm_gerdau.yaml => BR-MG-BHO-X-MG-mm_gerdau.yaml} (82%)
 rename data/custodian/{BR-MI-XXX-X-MG.yaml => BR-MG-BHO-X-MG.yaml} (82%)
 rename data/custodian/{BR-MA-XXX-X-GKP-guarani_kaiowa_projects.yaml => BR-MG-XAN-X-GKP-guarani_kaiowa_projects.yaml} (82%)
 rename data/custodian/{BR-MA-XXX-X-GKP.yaml => BR-MG-XAN-X-GKP.yaml} (83%)
 rename data/custodian/{BR-MI-XXX-E-UTL-ufmg_tainacan_lab.yaml => BR-MI-BHO-E-UTL-ufmg_tainacan_lab.yaml} (88%)
 rename data/custodian/{BR-MI-XXX-E-UTL.yaml => BR-MI-BHO-E-UTL.yaml} (88%)
 rename data/custodian/{BR-MA-XXX-E-UR-ufms_repositories.yaml => BR-MS-CGR-E-UR-ufms_repositories.yaml} (82%)
 rename data/custodian/{BR-MA-XXX-E-UR.yaml => BR-MS-CGR-E-UR.yaml} (82%)
 rename data/custodian/{BR-MA-XXX-M-MU-musearufmt.yaml => BR-MT-CUI-M-MU-musearufmt.yaml} (82%)
 rename data/custodian/{BR-MA-XXX-M-MU.yaml => BR-MT-CUI-M-MU.yaml} (82%)
 rename data/custodian/{BR-PA-XXX-E-UU-ufpbuepb.yaml => BR-PB-CGR-E-UU-ufpbuepb.yaml} (82%)
 rename data/custodian/{BR-PA-XXX-E-UU.yaml => BR-PB-CGR-E-UU.yaml} (83%)
 rename data/custodian/{BR-CE-XXX-O-MC.yaml => BR-PE-FDN-O-MC.yaml} (84%)
 rename data/custodian/{BR-PE-XXX-X-MI-mepeiahgp.yaml => BR-PE-REC-X-MI-mepeiahgp.yaml} (83%)
 rename data/custodian/{BR-PE-XXX-X-MI.yaml => BR-PE-REC-X-MI.yaml} (83%)
 rename data/custodian/{BR-PI-XXX-X-F-fumdham.yaml => BR-PI-SRN-X-F-fumdham.yaml} (82%)
 rename data/custodian/{BR-PI-XXX-X-F.yaml => BR-PI-SRN-X-F.yaml} (83%)
 rename data/custodian/{BR-RI-XXX-M-MM-marmam.yaml => BR-RJ-CEN-M-MM-marmam.yaml} (82%)
 rename data/custodian/{BR-RI-XXX-M-MM.yaml => BR-RJ-CEN-M-MM.yaml} (82%)
 rename data/custodian/{BR-TO-XXX-X-HD-hemeroteca_digital.yaml => BR-RJ-CEN-X-HD-hemeroteca_digital.yaml} (82%)
 rename data/custodian/{BR-TO-XXX-X-HD.yaml => BR-RJ-CEN-X-HD.yaml} (83%)
 rename data/custodian/{BR-PA-XXX-A-DA-deap_archives.yaml => BR-RJ-RDJ-A-DA-deap_archives.yaml} (82%)
 rename data/custodian/{BR-PA-XXX-A-DA.yaml => BR-RJ-RDJ-A-DA.yaml} (82%)
 rename data/custodian/{BR-ES-XXX-A-SA.yaml => BR-RJ-RDJ-A-SA.yaml} (84%)
 rename data/custodian/{BR-RO-XXX-X-II-instituto_insikiran.yaml => BR-RR-REC-X-II-instituto_insikiran.yaml} (82%)
 rename data/custodian/{BR-RO-XXX-X-II.yaml => BR-RR-REC-X-II.yaml} (83%)
 rename data/custodian/{BR-RI-XXX-E-UL-ufrgs_lume.yaml => BR-RS-PAL-E-UL-ufrgs_lume.yaml} (82%)
 rename data/custodian/{BR-RI-XXX-E-UL.yaml => BR-RS-PAL-E-UL.yaml} (82%)
 rename data/custodian/{BR-SA-XXX-E-UDA-ufsc_digital_art.yaml => BR-SC-FLO-E-UDA-ufsc_digital_art.yaml} (82%)
 rename data/custodian/{BR-SA-XXX-E-UDA.yaml => BR-SC-FLO-E-UDA.yaml} (82%)
 rename data/custodian/{BR-BA-XXX-O-FI-fpcipac.yaml => BR-SP-GAR-O-FI-fpcipac.yaml} (82%)
 rename data/custodian/{BR-BA-XXX-O-FI.yaml => BR-SP-GAR-O-FI.yaml} (82%)
 rename data/custodian/{BR-SA-XXX-E-UUU-uspunicampunesp.yaml => BR-SP-LSD-E-UUU-uspunicampunesp.yaml} (81%)
 rename data/custodian/{BR-SA-XXX-E-UUU.yaml => BR-SP-LSD-E-UUU.yaml} (82%)
 rename data/custodian/{BR-RI-XXX-O-F-fcrb.yaml => BR-SP-RVD-O-F-fcrb.yaml} (82%)
 rename data/custodian/{BR-RI-XXX-O-F.yaml => BR-SP-RVD-O-F.yaml} (82%)
 rename data/custodian/{BR-SA-XXX-X-A-apesp.yaml => BR-SP-SPA-X-A-apesp.yaml} (82%)
 rename data/custodian/{BR-SA-XXX-X-A.yaml => BR-SP-SPA-X-A.yaml} (83%)
 rename data/custodian/{BR-SA-XXX-X-TI-tainacan_implementations.yaml => BR-SP-SPA-X-TI-tainacan_implementations.yaml} (82%)
 rename data/custodian/{BR-SA-XXX-X-TI.yaml => BR-SP-SPA-X-TI.yaml} (83%)
 rename data/custodian/{BR-TO-XXX-R-JH.yaml => BR-TO-JAL-R-JH.yaml} (83%)
 rename data/custodian/{BR-TO-XXX-O-ST-secult_tocantins.yaml => BR-TO-PAL-O-ST-secult_tocantins.yaml} (82%)
 rename data/custodian/{BR-TO-XXX-O-ST.yaml => BR-TO-PAL-O-ST.yaml} (83%)
 rename data/custodian/{BR-TO-XXX-R-JH-jalapao_heritage.yaml => BR-TO-SFD-R-JH-jalapao_heritage.yaml} (82%)
 rename data/custodian/{CH-BE-XXX-L-AISSB-amnesty_international_schweizer_sektion_bibliothek.yaml => CH-BE-BER-L-AISSB-amnesty_international_schweizer_sektion_bibliothek.yaml} (77%)
 rename data/custodian/{CH-BE-XXX-M-BHM.yaml => CH-BE-BER-M-BHM.yaml} (78%)
 rename data/custodian/{CH-BL-XXX-L-GO.yaml => CH-BL-OBE-L-GO.yaml} (79%)
 rename data/custodian/{CH-BS-XXX-L-RUGKFPSB.yaml => CH-BS-BAS-L-RUGKFPSB.yaml} (75%)
 rename data/custodian/{CH-FR-XXX-L-BPS.yaml => CH-FR-FRI-L-BPS.yaml} (80%)
 rename data/custodian/{CH-GE-XXX-A-ACDAV.yaml => CH-GE-GEN-A-ACDAV.yaml} (78%)
 rename data/custodian/{CH-GE-XXX-A-RTSR.yaml => CH-GE-GEN-A-RTSR.yaml} (79%)
 rename data/custodian/{CH-GE-XXX-L-AIMPAMDEGM.yaml => CH-GE-GEN-L-AIMPAMDEGM.yaml} (75%)
 rename data/custodian/{CH-NE-XXX-U-SCSPB.yaml => CH-GE-GEN-U-SCSPB.yaml} (78%)
 rename data/custodian/{CH-ZG-XXX-L-PSM.yaml => CH-GR-MAR-L-PSM.yaml} (78%)
 rename data/custodian/{CH-GR-XXX-U-MCR.yaml => CH-GR-MVI-U-MCR.yaml} (79%)
 rename data/custodian/{CH-LU-XXX-A-SKL.yaml => CH-LU-LUZ-A-SKL.yaml} (80%)
 rename data/custodian/{CH-LU-XXX-L-OKLB.yaml => CH-LU-LUZ-L-OKLB.yaml} (79%)
 rename data/custodian/{CH-LU-XXX-A-GH.yaml => CH-LU-SEM-A-GH.yaml} (78%)
 rename data/custodian/{CH-NE-XXX-L-BPN.yaml => CH-NE-NEU-L-BPN.yaml} (79%)
 rename data/custodian/{CH-SG-XXX-L-LABD.yaml => CH-SH-BAR-L-LABD.yaml} (79%)
 rename data/custodian/{CH-TI-XXX-A-ASCT.yaml => CH-TI-BEL-A-ASCT.yaml} (78%)
 rename data/custodian/{CH-TI-XXX-A-AP.yaml => CH-TI-RUV-A-AP.yaml} (77%)
 rename data/custodian/{CH-VD-XXX-L-BGB.yaml => CH-VD-BUS-L-BGB.yaml} (79%)
 rename data/custodian/{CH-GE-XXX-L-M.yaml => CH-VS-VIS-L-M.yaml} (79%)
 rename data/custodian/{CH-ZH-XXX-L-ZHZBSA.yaml => CH-ZH-BAE-L-ZHZBSA.yaml} (79%)
 rename data/custodian/{CH-VS-XXX-L-SGBU.yaml => CH-ZH-OBE-L-SGBU.yaml} (78%)
 rename data/custodian/{CH-ZH-XXX-L-UZEIEB.yaml => CH-ZH-ZUE-L-UZEIEB.yaml} (79%)
 rename data/custodian/{CH-ZH-XXX-L-UZPB-universitatsbibliothek_zurich_phonetik_bibliothek.yaml => CH-ZH-ZUE-L-UZPB-universitatsbibliothek_zurich_phonetik_bibliothek.yaml} (79%)
 rename data/custodian/{CL-TA-XXX-A-DA.yaml => CL-AP-GUA-A-DA.yaml} (83%)
 rename data/custodian/{CL-CO-XXX-A-EA.yaml => CL-AP-GUA-A-EA.yaml} (83%)
 rename data/custodian/{CL-CU-XXX-A-BMSAS.yaml => CL-CU-SAN-A-BMSAS.yaml} (88%)
 rename data/custodian/{CL-CH-XXX-X-CIH.yaml => CL-LL-TDP-X-CIH.yaml} (82%)
 rename data/custodian/{CL-CH-XXX-R-FIP.yaml => CL-LR-ANC-R-FIP.yaml} (84%)
 rename data/custodian/{CL-AR-XXX-O-SNPC.yaml => CL-MA-REC-O-SNPC.yaml} (84%)
 rename data/custodian/{CL-LO-XXX-A-AN.yaml => CL-MA-SAN-A-AN.yaml} (83%)
 rename data/custodian/{CL-IS-XXX-L-WML.yaml => CL-TA-HRO-L-WML.yaml} (83%)
 rename data/custodian/{CL-SA-XXX-R-FBP.yaml => CL-TA-SFE-R-FBP.yaml} (84%)
 rename data/custodian/{CZ-10-XXX-A-VHA.yaml => CZ-52-DLI-A-VHA.yaml} (83%)
 rename data/custodian/{CZ-10-XXX-A-AS.yaml => CZ-52-LIT-A-AS.yaml} (82%)
 rename data/custodian/{CZ-10-XXX-A-ABS.yaml => CZ-52-PRA-A-ABS.yaml} (82%)
 rename data/custodian/{CZ-64-XXX-A-AÚAČBVV.yaml => CZ-78-BRN-A-AÚAČBVV.yaml} (83%)
 rename data/custodian/{CZ-31-XXX-M-MJOK.yaml => CZ-79-NET-M-MJOK.yaml} (82%)
 rename data/custodian/{CZ-52-XXX-M-MBN.yaml => CZ-82-MSK-M-MBN.yaml} (82%)
 rename data/custodian/{CZ-52-XXX-M-MBČ.yaml => CZ-82-MSV-M-MBČ.yaml} (82%)
 rename data/custodian/{EE-37-XXX-A-TCA-tallinn_city_archives.yaml => EE-01-TAL-A-TCA-tallinn_city_archives.yaml} (64%)
 rename data/custodian/{FR-IDF-XXX-A-NCCAP-national_centre_of_cinematography_and_animated_pic.yaml => FR-11-P1O-A-NCCAP-national_centre_of_cinematography_and_animated_pic.yaml} (66%)
 rename data/custodian/{FR-IDF-XXX-A-NCCAP.yaml => FR-11-P1O-A-NCCAP.yaml} (67%)
 rename data/custodian/{FR-92-XXX-A-NIPI-national_industrial_property_institute.yaml => FR-92-COU-A-NIPI-national_industrial_property_institute.yaml} (78%)
 rename data/custodian/{GB-UKM-XXX-M-RMG-royal_museums_greenwich.yaml => GB-ENG-CUB-M-RMG-royal_museums_greenwich.yaml} (65%)
 rename data/custodian/{GB-UKM-XXX-M-RMG.yaml => GB-ENG-CUB-M-RMG.yaml} (65%)
 rename data/custodian/{GB-UKM-XXX-O-BLB-british_library_board.yaml => GB-ENG-KCR-O-BLB-british_library_board.yaml} (65%)
 rename data/custodian/{GB-UKM-XXX-O-BLB.yaml => GB-ENG-KCR-O-BLB.yaml} (66%)
 rename data/custodian/{IN-BR-XXX-L-KBOL-khuda_bakhsh_oriental_library.yaml => IN-34-BAN-L-KBOL-khuda_bakhsh_oriental_library.yaml} (65%)
 rename data/custodian/{IN-BR-XXX-L-KBOL.yaml => IN-34-BAN-L-KBOL.yaml} (66%)
 rename data/custodian/{JP-OS-XXX-L-OITUBL.yaml => JP-32-MTI-L-OITUBL.yaml} (81%)
 rename data/custodian/{KR-27-XXX-A-CANDRM-the_commemorative_association_of_the_national_debt.yaml => KR-11-SAJ-A-CANDRM-the_commemorative_association_of_the_national_debt.yaml} (65%)
 rename data/custodian/{KR-27-XXX-A-CANDRM.yaml => KR-11-SAJ-A-CANDRM.yaml} (66%)
 rename data/custodian/{KR-11-XXX-C-DI-the_dong_a_ilbo.yaml => KR-11-SEO-C-DI-the_dong_a_ilbo.yaml} (65%)
 rename data/custodian/{KR-11-XXX-C-DI.yaml => KR-11-SEO-C-DI.yaml} (66%)
 rename data/custodian/{MX-BA-XXX-X-ISC.yaml => MX-BCS-LPA-X-ISC.yaml} (82%)
 rename data/custodian/{MX-CA-XXX-X-CDP.yaml => MX-CAM-CAL-X-CDP.yaml} (83%)
 rename data/custodian/{MX-CA-XXX-A-CCA.yaml => MX-CAM-CAM-A-CCA.yaml} (82%)
 rename data/custodian/{MX-ZA-XXX-A-CA.yaml => MX-CMX-BNO-A-CA.yaml} (83%)
 rename data/custodian/{MX-ZA-XXX-O-CR.yaml => MX-CMX-BNO-O-CR.yaml} (82%)
 rename data/custodian/{MX-ZA-XXX-A-IA.yaml => MX-CMX-COY-A-IA.yaml} (82%)
 rename data/custodian/{MX-AG-XXX-X-PCIC.yaml => MX-CMX-CUA-X-PCIC.yaml} (81%)
 rename data/custodian/{MX-CH-XXX-A-ILA.yaml => MX-CMX-MEX-A-ILA.yaml} (81%)
 rename data/custodian/{MX-CMX-XXX-A-SCJN-supreme_court_of_justice_of_the_nation.yaml => MX-CMX-MEX-A-SCJN-supreme_court_of_justice_of_the_nation.yaml} (67%)
 rename data/custodian/{MX-ZA-XXX-L-LC.yaml => MX-CMX-MEX-L-LC.yaml} (80%)
 rename data/custodian/{MX-ZA-XXX-M-CMN.yaml => MX-CMX-MHI-M-CMN.yaml} (81%)
 rename data/custodian/{MX-ZA-XXX-X-FT.yaml => MX-CMX-SLU-X-FT.yaml} (81%)
 rename data/custodian/{MX-ZA-XXX-A-AA.yaml => MX-CMX-TLA-A-AA.yaml} (81%)
 rename data/custodian/{MX-CH-XXX-M-PSM.yaml => MX-COA-SDO-M-PSM.yaml} (80%)
 rename data/custodian/{MX-ZA-XXX-A-FN.yaml => MX-HID-PDS-A-FN.yaml} (84%)
 rename data/custodian/{MX-ZA-XXX-X-SN.yaml => MX-HID-PDS-X-SN.yaml} (82%)
 rename data/custodian/{MX-QU-XXX-A-GAQR.yaml => MX-ROO-CHE-A-GAQR.yaml} (82%)
 rename data/custodian/{MX-QU-XXX-M-CCM.yaml => MX-ROO-CHE-M-CCM.yaml} (83%)
 rename data/custodian/{MX-SI-XXX-O-UR.yaml => MX-SIN-LLI-O-UR.yaml} (82%)
 rename data/custodian/{MX-TA-XXX-X-ITCA.yaml => MX-TAM-CVI-X-ITCA.yaml} (82%)
 rename data/custodian/{MX-ZA-XXX-X-FD.yaml => MX-ZA-LAN-X-FD.yaml} (87%)
 rename data/custodian/{MX-ZA-XXX-X-DFC.yaml => MX-ZA-PRO-X-DFC.yaml} (84%)
 rename data/custodian/{MX-ZA-XXX-X-IRPM.yaml => MX-ZAC-CSC-X-IRPM.yaml} (82%)
 rename data/custodian/{PH-00-XXX-O-NMP.yaml => PH-NCR-MAN-O-NMP.yaml} (64%)

diff --git a/data/custodian/BR-AC-XXX-E-UR-ufac_repository.yaml b/data/custodian/BR-AC-ASA-E-UR-ufac_repository.yaml
similarity index 83%
rename from data/custodian/BR-AC-XXX-E-UR-ufac_repository.yaml
rename to data/custodian/BR-AC-ASA-E-UR-ufac_repository.yaml
index 7cad612e82..141153e533 100644
--- a/data/custodian/BR-AC-XXX-E-UR-ufac_repository.yaml
+++ b/data/custodian/BR-AC-ASA-E-UR-ufac_repository.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: ACRE
 processing_timestamp: '2025-12-06T23:39:01.618537+00:00'
 ghcid:
-  ghcid_current: BR-AC-XXX-E-UR-ufac_repository
+  ghcid_current: BR-AC-ASA-E-UR-ufac_repository
   ghcid_original: BR-AC-XXX-E-UR-ufac_repository
   ghcid_uuid: 1584508e-4e29-57d0-a55c-5527f316282e
   ghcid_uuid_sha256: e13697b5-6c8c-8162-c38b-0151e3160ba3
@@ -35,22 +35,35 @@ ghcid:
   record_id: e038deb7-6716-4096-a3e6-378b97c3808d
   generation_timestamp: '2025-12-06T23:39:01.618537+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: AC
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Acre
+    city_code: ASA
+    city_name: Alto Santo
+    geonames_id: 3731285
+    feature_code: PPL
+    google_place_id: ChIJ5XQFw_-Mf5ERLt4FYPsUMoU
+    latitude: -9.9565564
+    longitude: -67.8649033
+    resolution_date: '2025-12-07T16:38:34.624725+00:00'
   ghcid_history:
   - ghcid: BR-AC-XXX-E-UR-ufac_repository
     ghcid_numeric: 16228325112742211938
     valid_from: '2025-12-06T23:39:01.618537+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:34.624725+00:00'
+  - ghcid: BR-AC-ASA-E-UR-ufac_repository
+    ghcid_numeric: 16228325112742211938
+    valid_from: '2025-12-07T16:38:34.624725+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Alto Santo (AC)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFAC Repository
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-AC-XXX-E-UR-ufac_repository
+  identifier_value: BR-AC-ASA-E-UR-ufac_repository
 - identifier_scheme: GHCID_UUID
   identifier_value: 1584508e-4e29-57d0-a55c-5527f316282e
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.618537+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ5XQFw_-Mf5ERLt4FYPsUMoU
+  formatted_address: BR-364, Km 04 - Distrito Industrial, Rio Branco - AC, 69920-900,
+    Brazil
+  website: http://www.ufac.br/
+  latitude: -9.9565564
+  longitude: -67.8649033
+  enriched_at: '2025-12-07T16:38:34.624725+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-AC-XXX-E-UR.yaml b/data/custodian/BR-AC-ASA-E-UR.yaml
similarity index 83%
rename from data/custodian/BR-AC-XXX-E-UR.yaml
rename to data/custodian/BR-AC-ASA-E-UR.yaml
index 95f664414a..7a5c0bb909 100644
--- a/data/custodian/BR-AC-XXX-E-UR.yaml
+++ b/data/custodian/BR-AC-ASA-E-UR.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: ACRE
 processing_timestamp: '2025-12-06T23:35:51.775457+00:00'
 ghcid:
-  ghcid_current: BR-AC-XXX-E-UR
+  ghcid_current: BR-AC-ASA-E-UR
   ghcid_original: BR-AC-XXX-E-UR
   ghcid_uuid: b0957ed6-6ba1-50be-9633-189192a39d97
   ghcid_uuid_sha256: 023db4bb-3875-8c12-1321-79db2942a1be
@@ -35,22 +35,35 @@ ghcid:
   record_id: e3fa42e9-b05b-4d85-a0ca-8983f78ae34c
   generation_timestamp: '2025-12-06T23:35:51.775457+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: AC
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Acre
+    city_code: ASA
+    city_name: Alto Santo
+    geonames_id: 3731285
+    feature_code: PPL
+    google_place_id: ChIJ5XQFw_-Mf5ERLt4FYPsUMoU
+    latitude: -9.9565564
+    longitude: -67.8649033
+    resolution_date: '2025-12-07T16:38:35.223625+00:00'
   ghcid_history:
   - ghcid: BR-AC-XXX-E-UR
     ghcid_numeric: 161483877854284818
     valid_from: '2025-12-06T23:35:51.775457+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:35.223625+00:00'
+  - ghcid: BR-AC-ASA-E-UR
+    ghcid_numeric: 161483877854284818
+    valid_from: '2025-12-07T16:38:35.223625+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Alto Santo (AC)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFAC Repository
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-AC-XXX-E-UR
+  identifier_value: BR-AC-ASA-E-UR
 - identifier_scheme: GHCID_UUID
   identifier_value: b0957ed6-6ba1-50be-9633-189192a39d97
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.775457+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ5XQFw_-Mf5ERLt4FYPsUMoU
+  formatted_address: BR-364, Km 04 - Distrito Industrial, Rio Branco - AC, 69920-900,
+    Brazil
+  website: http://www.ufac.br/
+  latitude: -9.9565564
+  longitude: -67.8649033
+  enriched_at: '2025-12-07T16:38:35.223625+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-AC-XXX-O-FCEM-fundacao_de_cultura_elias_mansour.yaml b/data/custodian/BR-AC-RBR-O-FCEM-fundacao_de_cultura_elias_mansour.yaml
similarity index 82%
rename from data/custodian/BR-AC-XXX-O-FCEM-fundacao_de_cultura_elias_mansour.yaml
rename to data/custodian/BR-AC-RBR-O-FCEM-fundacao_de_cultura_elias_mansour.yaml
index 81da2e148e..bceba2d2bd 100644
--- a/data/custodian/BR-AC-XXX-O-FCEM-fundacao_de_cultura_elias_mansour.yaml
+++ b/data/custodian/BR-AC-RBR-O-FCEM-fundacao_de_cultura_elias_mansour.yaml
@@ -31,7 +31,7 @@ original_entry:
     region: ACRE
 processing_timestamp: '2025-12-06T23:39:01.615779+00:00'
 ghcid:
-  ghcid_current: BR-AC-XXX-O-FCEM-fundacao_de_cultura_elias_mansour
+  ghcid_current: BR-AC-RBR-O-FCEM-fundacao_de_cultura_elias_mansour
   ghcid_original: BR-AC-XXX-O-FCEM-fundacao_de_cultura_elias_mansour
   ghcid_uuid: ad62984a-5238-5a8b-aee5-c7029a2e0243
   ghcid_uuid_sha256: f73a5bab-ec9b-89d1-09bf-28bc4aa5f2dc
@@ -39,22 +39,35 @@ ghcid:
   record_id: f85c8485-9208-4390-b3bc-c4f0f79dcd87
   generation_timestamp: '2025-12-06T23:39:01.615779+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: AC
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Acre
+    city_code: RBR
+    city_name: Rio Branco
+    geonames_id: 3662574
+    feature_code: PPLA
+    google_place_id: ChIJBWgQSAeNf5ERowa60fZxxpw
+    latitude: -9.980623999999999
+    longitude: -67.80782889999999
+    resolution_date: '2025-12-07T16:38:35.844479+00:00'
   ghcid_history:
   - ghcid: BR-AC-XXX-O-FCEM-fundacao_de_cultura_elias_mansour
     ghcid_numeric: 17814652069984545233
     valid_from: '2025-12-06T23:39:01.615779+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:35.844479+00:00'
+  - ghcid: BR-AC-RBR-O-FCEM-fundacao_de_cultura_elias_mansour
+    ghcid_numeric: 17814652069984545233
+    valid_from: '2025-12-07T16:38:35.844479+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Rio Branco (AC)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Fundação de Cultura Elias Mansour
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-AC-XXX-O-FCEM-fundacao_de_cultura_elias_mansour
+  identifier_value: BR-AC-RBR-O-FCEM-fundacao_de_cultura_elias_mansour
 - identifier_scheme: GHCID_UUID
   identifier_value: ad62984a-5238-5a8b-aee5-c7029a2e0243
 - identifier_scheme: GHCID_UUID_SHA256
@@ -136,3 +149,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.615779+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJBWgQSAeNf5ERowa60fZxxpw
+  formatted_address: R. Vinte e Quatro de Janeiro, 154 - 6 de Agosto, Rio Branco -
+    AC, 69905-596, Brazil
+  website: null
+  latitude: -9.980623999999999
+  longitude: -67.80782889999999
+  enriched_at: '2025-12-07T16:38:35.844479+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-AC-XXX-O-FCEM.yaml b/data/custodian/BR-AC-RBR-O-FCEM.yaml
similarity index 84%
rename from data/custodian/BR-AC-XXX-O-FCEM.yaml
rename to data/custodian/BR-AC-RBR-O-FCEM.yaml
index d184292069..6bfc28be6f 100644
--- a/data/custodian/BR-AC-XXX-O-FCEM.yaml
+++ b/data/custodian/BR-AC-RBR-O-FCEM.yaml
@@ -31,7 +31,7 @@ original_entry:
     region: ACRE
 processing_timestamp: '2025-12-06T23:35:51.766073+00:00'
 ghcid:
-  ghcid_current: BR-AC-XXX-O-FCEM
+  ghcid_current: BR-AC-RBR-O-FCEM
   ghcid_original: BR-AC-XXX-O-FCEM
   ghcid_uuid: cb6089c0-385c-5735-b7e8-a9378cea1b39
   ghcid_uuid_sha256: 018e6897-dca5-8eb7-131f-30301fbde4ec
@@ -39,22 +39,35 @@ ghcid:
   record_id: 53a1dea3-be89-4f74-8d8f-33eb05552722
   generation_timestamp: '2025-12-06T23:35:51.766073+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: AC
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Acre
+    city_code: RBR
+    city_name: Rio Branco
+    geonames_id: 3662574
+    feature_code: PPLA
+    google_place_id: ChIJBWgQSAeNf5ERowa60fZxxpw
+    latitude: -9.980623999999999
+    longitude: -67.80782889999999
+    resolution_date: '2025-12-07T16:38:36.461574+00:00'
   ghcid_history:
   - ghcid: BR-AC-XXX-O-FCEM
     ghcid_numeric: 112142042182020791
     valid_from: '2025-12-06T23:35:51.766073+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:36.461574+00:00'
+  - ghcid: BR-AC-RBR-O-FCEM
+    ghcid_numeric: 112142042182020791
+    valid_from: '2025-12-07T16:38:36.461574+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Rio Branco (AC)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Fundação de Cultura Elias Mansour
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-AC-XXX-O-FCEM
+  identifier_value: BR-AC-RBR-O-FCEM
 - identifier_scheme: GHCID_UUID
   identifier_value: cb6089c0-385c-5735-b7e8-a9378cea1b39
 - identifier_scheme: GHCID_UUID_SHA256
@@ -136,3 +149,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.766073+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJBWgQSAeNf5ERowa60fZxxpw
+  formatted_address: R. Vinte e Quatro de Janeiro, 154 - 6 de Agosto, Rio Branco -
+    AC, 69905-596, Brazil
+  website: null
+  latitude: -9.980623999999999
+  longitude: -67.80782889999999
+  enriched_at: '2025-12-07T16:38:36.461574+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-AM-XXX-X-CCPA.yaml b/data/custodian/BR-AM-MAN-X-CCPA.yaml
similarity index 83%
rename from data/custodian/BR-AM-XXX-X-CCPA.yaml
rename to data/custodian/BR-AM-MAN-X-CCPA.yaml
index ef83853719..bc622972cd 100644
--- a/data/custodian/BR-AM-XXX-X-CCPA.yaml
+++ b/data/custodian/BR-AM-MAN-X-CCPA.yaml
@@ -31,7 +31,7 @@ original_entry:
     region: AMAZONAS
 processing_timestamp: '2025-12-06T23:35:51.806947+00:00'
 ghcid:
-  ghcid_current: BR-AM-XXX-X-CCPA
+  ghcid_current: BR-AM-MAN-X-CCPA
   ghcid_original: BR-AM-XXX-X-CCPA
   ghcid_uuid: a1bed358-4cbf-51e8-afee-8f73060259b1
   ghcid_uuid_sha256: a562ae3a-4d7c-8634-a662-e8a9a2c1d385
@@ -39,22 +39,35 @@ ghcid:
   record_id: 786b4594-17af-41cd-89bf-f0e1e7a5df4f
   generation_timestamp: '2025-12-06T23:35:51.806947+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: AM
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Amazonas
+    city_code: MAN
+    city_name: Manaus
+    geonames_id: 3663517
+    feature_code: PPLA
+    google_place_id: ChIJpaxV3bcZbJIRpt-NslHxhFs
+    latitude: -3.1330887
+    longitude: -59.9874181
+    resolution_date: '2025-12-07T16:38:39.772026+00:00'
   ghcid_history:
   - ghcid: BR-AM-XXX-X-CCPA
     ghcid_numeric: 11917279129407120948
     valid_from: '2025-12-06T23:35:51.806947+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:39.772026+00:00'
+  - ghcid: BR-AM-MAN-X-CCPA
+    ghcid_numeric: 11917279129407120948
+    valid_from: '2025-12-07T16:38:39.772026+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Manaus (AM)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Centro Cultural Povos da Amazônia
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-AM-XXX-X-CCPA
+  identifier_value: BR-AM-MAN-X-CCPA
 - identifier_scheme: GHCID_UUID
   identifier_value: a1bed358-4cbf-51e8-afee-8f73060259b1
 - identifier_scheme: GHCID_UUID_SHA256
@@ -149,3 +162,12 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q18277695
   wikidata_label_en: Centro Cultural Povos da Amazônia
+google_maps_enrichment:
+  place_id: ChIJpaxV3bcZbJIRpt-NslHxhFs
+  formatted_address: Distrito Industrial I - Av. Silves, 2222 - Crespo, Manaus - AM,
+    69073-270, Brazil
+  website: https://cultura.am.gov.br/espacos-culturais/centros-culturais/centro-cultural-dos-povos-da-amazonia/
+  latitude: -3.1330887
+  longitude: -59.9874181
+  enriched_at: '2025-12-07T16:38:39.772026+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-AM-XXX-E-CU-cepap_unifap.yaml b/data/custodian/BR-AP-FAZ-E-CU-cepap_unifap.yaml
similarity index 82%
rename from data/custodian/BR-AM-XXX-E-CU-cepap_unifap.yaml
rename to data/custodian/BR-AP-FAZ-E-CU-cepap_unifap.yaml
index 2ef1f1bb84..bd3132c879 100644
--- a/data/custodian/BR-AM-XXX-E-CU-cepap_unifap.yaml
+++ b/data/custodian/BR-AP-FAZ-E-CU-cepap_unifap.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: AMAPÁ
 processing_timestamp: '2025-12-06T23:39:01.629386+00:00'
 ghcid:
-  ghcid_current: BR-AM-XXX-E-CU-cepap_unifap
+  ghcid_current: BR-AP-FAZ-E-CU-cepap_unifap
   ghcid_original: BR-AM-XXX-E-CU-cepap_unifap
   ghcid_uuid: 96f803c5-ebc4-5792-be5f-04ba03682970
   ghcid_uuid_sha256: 700fe60f-c8e7-8dd6-0a19-b076653ca886
@@ -35,22 +35,35 @@ ghcid:
   record_id: 630f9912-995e-4a40-8b0c-e56c4d5b709d
   generation_timestamp: '2025-12-06T23:39:01.629386+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: AM
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: AP
+    region_name: Amapá
+    city_code: FAZ
+    city_name: Fazendinha
+    geonames_id: 8551316
+    feature_code: PPL
+    google_place_id: ChIJR_U5ghoenpIRhy_rByMktaw
+    latitude: -0.007175
+    longitude: -51.083168199999996
+    resolution_date: '2025-12-07T16:38:37.162660+00:00'
   ghcid_history:
   - ghcid: BR-AM-XXX-E-CU-cepap_unifap
     ghcid_numeric: 8074925612368113110
     valid_from: '2025-12-06T23:39:01.629386+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:37.162660+00:00'
+  - ghcid: BR-AP-FAZ-E-CU-cepap_unifap
+    ghcid_numeric: 8074925612368113110
+    valid_from: '2025-12-07T16:38:37.162660+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Fazendinha (AP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: CEPAP-UNIFAP
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-AM-XXX-E-CU-cepap_unifap
+  identifier_value: BR-AP-FAZ-E-CU-cepap_unifap
 - identifier_scheme: GHCID_UUID
   identifier_value: 96f803c5-ebc4-5792-be5f-04ba03682970
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.629386+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJR_U5ghoenpIRhy_rByMktaw
+  formatted_address: Rod. Josmar Chaves Pinto, 3450-3660 - Jardim Equatorial, Macapá
+    - AP, Brazil
+  website: http://www2.unifap.br/cepap/
+  latitude: -0.007175
+  longitude: -51.083168199999996
+  enriched_at: '2025-12-07T16:38:37.162660+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-AM-XXX-E-CU.yaml b/data/custodian/BR-AP-FAZ-E-CU.yaml
similarity index 82%
rename from data/custodian/BR-AM-XXX-E-CU.yaml
rename to data/custodian/BR-AP-FAZ-E-CU.yaml
index 2511e498df..75b94eb9e0 100644
--- a/data/custodian/BR-AM-XXX-E-CU.yaml
+++ b/data/custodian/BR-AP-FAZ-E-CU.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: AMAPÁ
 processing_timestamp: '2025-12-06T23:35:51.801565+00:00'
 ghcid:
-  ghcid_current: BR-AM-XXX-E-CU
+  ghcid_current: BR-AP-FAZ-E-CU
   ghcid_original: BR-AM-XXX-E-CU
   ghcid_uuid: f7019f9a-fca4-5b3e-b6d0-1283e8dc9434
   ghcid_uuid_sha256: 230f7d7b-8c6e-82c1-8025-d2d46d63ab20
@@ -35,22 +35,35 @@ ghcid:
   record_id: faff798a-7dd1-4a54-9c3c-9a996ab4a122
   generation_timestamp: '2025-12-06T23:35:51.801565+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: AM
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: AP
+    region_name: Amapá
+    city_code: FAZ
+    city_name: Fazendinha
+    geonames_id: 8551316
+    feature_code: PPL
+    google_place_id: ChIJR_U5ghoenpIRhy_rByMktaw
+    latitude: -0.007175
+    longitude: -51.083168199999996
+    resolution_date: '2025-12-07T16:38:37.775014+00:00'
   ghcid_history:
   - ghcid: BR-AM-XXX-E-CU
     ghcid_numeric: 2526375885568611009
     valid_from: '2025-12-06T23:35:51.801565+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:37.775014+00:00'
+  - ghcid: BR-AP-FAZ-E-CU
+    ghcid_numeric: 2526375885568611009
+    valid_from: '2025-12-07T16:38:37.775014+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Fazendinha (AP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: CEPAP-UNIFAP
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-AM-XXX-E-CU
+  identifier_value: BR-AP-FAZ-E-CU
 - identifier_scheme: GHCID_UUID
   identifier_value: f7019f9a-fca4-5b3e-b6d0-1283e8dc9434
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.801565+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJR_U5ghoenpIRhy_rByMktaw
+  formatted_address: Rod. Josmar Chaves Pinto, 3450-3660 - Jardim Equatorial, Macapá
+    - AP, Brazil
+  website: http://www2.unifap.br/cepap/
+  latitude: -0.007175
+  longitude: -51.083168199999996
+  enriched_at: '2025-12-07T16:38:37.775014+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-AM-XXX-O-SA-secult_amapa.yaml b/data/custodian/BR-AP-MAC-O-SA-secult_amapa.yaml
similarity index 82%
rename from data/custodian/BR-AM-XXX-O-SA-secult_amapa.yaml
rename to data/custodian/BR-AP-MAC-O-SA-secult_amapa.yaml
index 9c546dccd5..0165dfeea7 100644
--- a/data/custodian/BR-AM-XXX-O-SA-secult_amapa.yaml
+++ b/data/custodian/BR-AP-MAC-O-SA-secult_amapa.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: AMAPÁ
 processing_timestamp: '2025-12-06T23:39:01.623971+00:00'
 ghcid:
-  ghcid_current: BR-AM-XXX-O-SA-secult_amapa
+  ghcid_current: BR-AP-MAC-O-SA-secult_amapa
   ghcid_original: BR-AM-XXX-O-SA-secult_amapa
   ghcid_uuid: 0fd6ea82-8c66-52ef-a3fa-d9f08fbb0847
   ghcid_uuid_sha256: 47cea54b-3f4d-82da-8eef-fc8e4c6ef578
@@ -35,22 +35,35 @@ ghcid:
   record_id: 9254bff5-855c-456a-bcdb-0302fc299e64
   generation_timestamp: '2025-12-06T23:39:01.623971+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: AM
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: AP
+    region_name: Amapá
+    city_code: MAC
+    city_name: Macapa
+    geonames_id: 3396016
+    feature_code: PPLA
+    google_place_id: ChIJD4NWgy7hYY0Rlhsfd_lD3lw
+    latitude: 0.0346905
+    longitude: -51.0683611
+    resolution_date: '2025-12-07T16:38:38.483629+00:00'
   ghcid_history:
   - ghcid: BR-AM-XXX-O-SA-secult_amapa
     ghcid_numeric: 5174254764498473690
     valid_from: '2025-12-06T23:39:01.623971+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:38.483629+00:00'
+  - ghcid: BR-AP-MAC-O-SA-secult_amapa
+    ghcid_numeric: 5174254764498473690
+    valid_from: '2025-12-07T16:38:38.483629+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Macapa (AP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: SECULT Amapá
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-AM-XXX-O-SA-secult_amapa
+  identifier_value: BR-AP-MAC-O-SA-secult_amapa
 - identifier_scheme: GHCID_UUID
   identifier_value: 0fd6ea82-8c66-52ef-a3fa-d9f08fbb0847
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.623971+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJD4NWgy7hYY0Rlhsfd_lD3lw
+  formatted_address: R. Prof. Tostes, 1579 - Central, Macapá - AP, 68900-022, Brazil
+  website: https://secult.portal.ap.gov.br/
+  latitude: 0.0346905
+  longitude: -51.0683611
+  enriched_at: '2025-12-07T16:38:38.483629+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-AM-XXX-O-SA.yaml b/data/custodian/BR-AP-MAC-O-SA.yaml
similarity index 83%
rename from data/custodian/BR-AM-XXX-O-SA.yaml
rename to data/custodian/BR-AP-MAC-O-SA.yaml
index 189a47697c..dcd43f0ca4 100644
--- a/data/custodian/BR-AM-XXX-O-SA.yaml
+++ b/data/custodian/BR-AP-MAC-O-SA.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: AMAPÁ
 processing_timestamp: '2025-12-06T23:35:51.790068+00:00'
 ghcid:
-  ghcid_current: BR-AM-XXX-O-SA
+  ghcid_current: BR-AP-MAC-O-SA
   ghcid_original: BR-AM-XXX-O-SA
   ghcid_uuid: 6392db21-7e7e-5d29-ba4a-7125cfb06563
   ghcid_uuid_sha256: 258b43e8-ec4f-8eca-47f3-5bf6d9e0a48f
@@ -35,22 +35,35 @@ ghcid:
   record_id: 6f28913f-d212-4752-a8b2-391aa17773b8
   generation_timestamp: '2025-12-06T23:35:51.790068+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: AM
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: AP
+    region_name: Amapá
+    city_code: MAC
+    city_name: Macapa
+    geonames_id: 3396016
+    feature_code: PPLA
+    google_place_id: ChIJD4NWgy7hYY0Rlhsfd_lD3lw
+    latitude: 0.0346905
+    longitude: -51.0683611
+    resolution_date: '2025-12-07T16:38:39.089414+00:00'
   ghcid_history:
   - ghcid: BR-AM-XXX-O-SA
     ghcid_numeric: 2705330668842225354
     valid_from: '2025-12-06T23:35:51.790068+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:39.089414+00:00'
+  - ghcid: BR-AP-MAC-O-SA
+    ghcid_numeric: 2705330668842225354
+    valid_from: '2025-12-07T16:38:39.089414+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Macapa (AP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: SECULT Amapá
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-AM-XXX-O-SA
+  identifier_value: BR-AP-MAC-O-SA
 - identifier_scheme: GHCID_UUID
   identifier_value: 6392db21-7e7e-5d29-ba4a-7125cfb06563
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.790068+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJD4NWgy7hYY0Rlhsfd_lD3lw
+  formatted_address: R. Prof. Tostes, 1579 - Central, Macapá - AP, 68900-022, Brazil
+  website: https://secult.portal.ap.gov.br/
+  latitude: 0.0346905
+  longitude: -51.0683611
+  enriched_at: '2025-12-07T16:38:39.089414+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-BA-XXX-E-UR-ufba_repository.yaml b/data/custodian/BR-BA-VIT-E-UR-ufba_repository.yaml
similarity index 83%
rename from data/custodian/BR-BA-XXX-E-UR-ufba_repository.yaml
rename to data/custodian/BR-BA-VIT-E-UR-ufba_repository.yaml
index 7852fcf511..8990223ce9 100644
--- a/data/custodian/BR-BA-XXX-E-UR-ufba_repository.yaml
+++ b/data/custodian/BR-BA-VIT-E-UR-ufba_repository.yaml
@@ -31,7 +31,7 @@ original_entry:
     region: BAHIA
 processing_timestamp: '2025-12-06T23:39:01.642802+00:00'
 ghcid:
-  ghcid_current: BR-BA-XXX-E-UR-ufba_repository
+  ghcid_current: BR-BA-VIT-E-UR-ufba_repository
   ghcid_original: BR-BA-XXX-E-UR-ufba_repository
   ghcid_uuid: 02f8a882-41ac-5c2a-84a3-fa25f8ffa63d
   ghcid_uuid_sha256: af6ce676-f36b-8aad-b6ef-b4a0e54aaa46
@@ -39,22 +39,35 @@ ghcid:
   record_id: 5f1f30dd-db14-48be-bbd0-3869bd1ea64d
   generation_timestamp: '2025-12-06T23:39:01.642802+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: BA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Bahia
+    city_code: VIT
+    city_name: Vitoria
+    geonames_id: 3474066
+    feature_code: PPL
+    google_place_id: ChIJd1TXVmEDFgcRVvioW0TNll8
+    latitude: -13.003675999999999
+    longitude: -38.5100127
+    resolution_date: '2025-12-07T16:38:40.505720+00:00'
   ghcid_history:
   - ghcid: BR-BA-XXX-E-UR-ufba_repository
     ghcid_numeric: 12640731652686588589
     valid_from: '2025-12-06T23:39:01.642802+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:40.505720+00:00'
+  - ghcid: BR-BA-VIT-E-UR-ufba_repository
+    ghcid_numeric: 12640731652686588589
+    valid_from: '2025-12-07T16:38:40.505720+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Vitoria (BA)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFBA Repository
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-BA-XXX-E-UR-ufba_repository
+  identifier_value: BR-BA-VIT-E-UR-ufba_repository
 - identifier_scheme: GHCID_UUID
   identifier_value: 02f8a882-41ac-5c2a-84a3-fa25f8ffa63d
 - identifier_scheme: GHCID_UUID_SHA256
@@ -136,3 +149,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.642802+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJd1TXVmEDFgcRVvioW0TNll8
+  formatted_address: Av. Milton Santos, s/nº - Ondina, Salvador - BA, 40170-110, Brazil
+  website: null
+  latitude: -13.003675999999999
+  longitude: -38.5100127
+  enriched_at: '2025-12-07T16:38:40.505720+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-BA-XXX-E-UR.yaml b/data/custodian/BR-BA-VIT-E-UR.yaml
similarity index 84%
rename from data/custodian/BR-BA-XXX-E-UR.yaml
rename to data/custodian/BR-BA-VIT-E-UR.yaml
index 48915c925f..294ca84e5c 100644
--- a/data/custodian/BR-BA-XXX-E-UR.yaml
+++ b/data/custodian/BR-BA-VIT-E-UR.yaml
@@ -31,7 +31,7 @@ original_entry:
     region: BAHIA
 processing_timestamp: '2025-12-06T23:35:51.821097+00:00'
 ghcid:
-  ghcid_current: BR-BA-XXX-E-UR
+  ghcid_current: BR-BA-VIT-E-UR
   ghcid_original: BR-BA-XXX-E-UR
   ghcid_uuid: 7c9b7557-3755-5026-9982-cea9f43f7ecc
   ghcid_uuid_sha256: 9f8244a1-ed4f-8e9d-6e0a-2f6f22e22477
@@ -39,22 +39,35 @@ ghcid:
   record_id: 0b217f10-9b64-457d-8ccf-cdb34a40eeb0
   generation_timestamp: '2025-12-06T23:35:51.821097+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: BA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Bahia
+    city_code: VIT
+    city_name: Vitoria
+    geonames_id: 3474066
+    feature_code: PPL
+    google_place_id: ChIJd1TXVmEDFgcRVvioW0TNll8
+    latitude: -13.003675999999999
+    longitude: -38.5100127
+    resolution_date: '2025-12-07T16:38:41.175828+00:00'
   ghcid_history:
   - ghcid: BR-BA-XXX-E-UR
     ghcid_numeric: 11493824661264768669
     valid_from: '2025-12-06T23:35:51.821097+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:41.175828+00:00'
+  - ghcid: BR-BA-VIT-E-UR
+    ghcid_numeric: 11493824661264768669
+    valid_from: '2025-12-07T16:38:41.175828+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Vitoria (BA)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFBA Repository
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-BA-XXX-E-UR
+  identifier_value: BR-BA-VIT-E-UR
 - identifier_scheme: GHCID_UUID
   identifier_value: 7c9b7557-3755-5026-9982-cea9f43f7ecc
 - identifier_scheme: GHCID_UUID_SHA256
@@ -136,3 +149,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.821097+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJd1TXVmEDFgcRVvioW0TNll8
+  formatted_address: Av. Milton Santos, s/nº - Ondina, Salvador - BA, 40170-110, Brazil
+  website: null
+  latitude: -13.003675999999999
+  longitude: -38.5100127
+  enriched_at: '2025-12-07T16:38:41.175828+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-CE-XXX-E-UR-ufc_repository.yaml b/data/custodian/BR-CE-FOR-E-UR-ufc_repository.yaml
similarity index 83%
rename from data/custodian/BR-CE-XXX-E-UR-ufc_repository.yaml
rename to data/custodian/BR-CE-FOR-E-UR-ufc_repository.yaml
index 9295be2142..47a8de4235 100644
--- a/data/custodian/BR-CE-XXX-E-UR-ufc_repository.yaml
+++ b/data/custodian/BR-CE-FOR-E-UR-ufc_repository.yaml
@@ -31,7 +31,7 @@ original_entry:
     region: CEARÁ
 processing_timestamp: '2025-12-06T23:39:01.645307+00:00'
 ghcid:
-  ghcid_current: BR-CE-XXX-E-UR-ufc_repository
+  ghcid_current: BR-CE-FOR-E-UR-ufc_repository
   ghcid_original: BR-CE-XXX-E-UR-ufc_repository
   ghcid_uuid: 3cc83034-bc8a-5983-bc30-3de74df662bb
   ghcid_uuid_sha256: 8c61161f-08d2-8052-514b-bac9898e3d5f
@@ -39,22 +39,35 @@ ghcid:
   record_id: f4ae11a7-0be8-46d4-b1aa-9d518670d211
   generation_timestamp: '2025-12-06T23:39:01.645307+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: CE
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Ceará
+    city_code: FOR
+    city_name: Fortaleza
+    geonames_id: 3399415
+    feature_code: PPLA
+    google_place_id: ChIJYzn8hOdLxwcRNdmZtMOQYEw
+    latitude: -3.7466621
+    longitude: -38.5737448
+    resolution_date: '2025-12-07T16:38:43.179458+00:00'
   ghcid_history:
   - ghcid: BR-CE-XXX-E-UR-ufc_repository
     ghcid_numeric: 10115390560598650962
     valid_from: '2025-12-06T23:39:01.645307+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:43.179458+00:00'
+  - ghcid: BR-CE-FOR-E-UR-ufc_repository
+    ghcid_numeric: 10115390560598650962
+    valid_from: '2025-12-07T16:38:43.179458+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Fortaleza (CE)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFC Repository
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-CE-XXX-E-UR-ufc_repository
+  identifier_value: BR-CE-FOR-E-UR-ufc_repository
 - identifier_scheme: GHCID_UUID
   identifier_value: 3cc83034-bc8a-5983-bc30-3de74df662bb
 - identifier_scheme: GHCID_UUID_SHA256
@@ -136,3 +149,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.645307+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJYzn8hOdLxwcRNdmZtMOQYEw
+  formatted_address: R. 5, 100 - Pres. Kennedy, Fortaleza - CE, 60355-636, Brazil
+  website: http://www.ufc.br/
+  latitude: -3.7466621
+  longitude: -38.5737448
+  enriched_at: '2025-12-07T16:38:43.179458+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-CE-XXX-E-UR.yaml b/data/custodian/BR-CE-FOR-E-UR.yaml
similarity index 84%
rename from data/custodian/BR-CE-XXX-E-UR.yaml
rename to data/custodian/BR-CE-FOR-E-UR.yaml
index 896be6cbd9..0c12e3d616 100644
--- a/data/custodian/BR-CE-XXX-E-UR.yaml
+++ b/data/custodian/BR-CE-FOR-E-UR.yaml
@@ -31,7 +31,7 @@ original_entry:
     region: CEARÁ
 processing_timestamp: '2025-12-06T23:35:51.826694+00:00'
 ghcid:
-  ghcid_current: BR-CE-XXX-E-UR
+  ghcid_current: BR-CE-FOR-E-UR
   ghcid_original: BR-CE-XXX-E-UR
   ghcid_uuid: c7c09954-3eac-561f-b119-b09d79273143
   ghcid_uuid_sha256: 48901eb5-70c2-8d44-4b06-b7a12bfd2e3f
@@ -39,22 +39,35 @@ ghcid:
   record_id: 3678012c-de0a-4cd4-a482-04a89f898757
   generation_timestamp: '2025-12-06T23:35:51.826694+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: CE
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Ceará
+    city_code: FOR
+    city_name: Fortaleza
+    geonames_id: 3399415
+    feature_code: PPLA
+    google_place_id: ChIJYzn8hOdLxwcRNdmZtMOQYEw
+    latitude: -3.7466621
+    longitude: -38.5737448
+    resolution_date: '2025-12-07T16:38:44.017251+00:00'
   ghcid_history:
   - ghcid: BR-CE-XXX-E-UR
     ghcid_numeric: 5228712932006862148
     valid_from: '2025-12-06T23:35:51.826694+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:44.017251+00:00'
+  - ghcid: BR-CE-FOR-E-UR
+    ghcid_numeric: 5228712932006862148
+    valid_from: '2025-12-07T16:38:44.017251+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Fortaleza (CE)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFC Repository
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-CE-XXX-E-UR
+  identifier_value: BR-CE-FOR-E-UR
 - identifier_scheme: GHCID_UUID
   identifier_value: c7c09954-3eac-561f-b119-b09d79273143
 - identifier_scheme: GHCID_UUID_SHA256
@@ -136,3 +149,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.826694+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJYzn8hOdLxwcRNdmZtMOQYEw
+  formatted_address: R. 5, 100 - Pres. Kennedy, Fortaleza - CE, 60355-636, Brazil
+  website: http://www.ufc.br/
+  latitude: -3.7466621
+  longitude: -38.5737448
+  enriched_at: '2025-12-07T16:38:44.017251+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-ES-XXX-E-UDL-ufes_digital_libraries.yaml b/data/custodian/BR-ES-GUA-E-UDL-ufes_digital_libraries.yaml
similarity index 82%
rename from data/custodian/BR-ES-XXX-E-UDL-ufes_digital_libraries.yaml
rename to data/custodian/BR-ES-GUA-E-UDL-ufes_digital_libraries.yaml
index 2c807dcd61..789bbcbb37 100644
--- a/data/custodian/BR-ES-XXX-E-UDL-ufes_digital_libraries.yaml
+++ b/data/custodian/BR-ES-GUA-E-UDL-ufes_digital_libraries.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: ESPÍRITO SANTO
 processing_timestamp: '2025-12-06T23:39:01.656229+00:00'
 ghcid:
-  ghcid_current: BR-ES-XXX-E-UDL-ufes_digital_libraries
+  ghcid_current: BR-ES-GUA-E-UDL-ufes_digital_libraries
   ghcid_original: BR-ES-XXX-E-UDL-ufes_digital_libraries
   ghcid_uuid: 05cb0bad-43cf-548c-986e-f2e4ddbb0334
   ghcid_uuid_sha256: f66bd533-082a-8627-2d96-23439882bb7a
@@ -35,22 +35,35 @@ ghcid:
   record_id: 79ad7735-ba23-4aa6-876a-955fe39850a4
   generation_timestamp: '2025-12-06T23:39:01.656229+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: ES
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Espírito Santo
+    city_code: GUA
+    city_name: Guajuru
+    geonames_id: 3473471
+    feature_code: PPL
+    google_place_id: ChIJ_TSjRAEYuAAR6ynoGRnu8rM
+    latitude: -20.2768435
+    longitude: -40.3044234
+    resolution_date: '2025-12-07T16:38:46.293557+00:00'
   ghcid_history:
   - ghcid: BR-ES-XXX-E-UDL-ufes_digital_libraries
     ghcid_numeric: 17756520370995389991
     valid_from: '2025-12-06T23:39:01.656229+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:46.293557+00:00'
+  - ghcid: BR-ES-GUA-E-UDL-ufes_digital_libraries
+    ghcid_numeric: 17756520370995389991
+    valid_from: '2025-12-07T16:38:46.293557+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Guajuru (ES)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFES Digital Libraries
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-ES-XXX-E-UDL-ufes_digital_libraries
+  identifier_value: BR-ES-GUA-E-UDL-ufes_digital_libraries
 - identifier_scheme: GHCID_UUID
   identifier_value: 05cb0bad-43cf-548c-986e-f2e4ddbb0334
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.656229+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ_TSjRAEYuAAR6ynoGRnu8rM
+  formatted_address: Av. Fernando Ferrari, 514 - Goiabeiras, Vitória - ES, 29075-910,
+    Brazil
+  website: https://biblioteca.ufes.br/
+  latitude: -20.2768435
+  longitude: -40.3044234
+  enriched_at: '2025-12-07T16:38:46.293557+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-ES-XXX-E-UDL.yaml b/data/custodian/BR-ES-GUA-E-UDL.yaml
similarity index 83%
rename from data/custodian/BR-ES-XXX-E-UDL.yaml
rename to data/custodian/BR-ES-GUA-E-UDL.yaml
index 9d34388261..43bf9dcced 100644
--- a/data/custodian/BR-ES-XXX-E-UDL.yaml
+++ b/data/custodian/BR-ES-GUA-E-UDL.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: ESPÍRITO SANTO
 processing_timestamp: '2025-12-06T23:35:51.843393+00:00'
 ghcid:
-  ghcid_current: BR-ES-XXX-E-UDL
+  ghcid_current: BR-ES-GUA-E-UDL
   ghcid_original: BR-ES-XXX-E-UDL
   ghcid_uuid: 7f790535-d83f-500a-81e9-061bcedceedf
   ghcid_uuid_sha256: c9bacf5c-029a-8965-0d46-074bd2a48a86
@@ -35,22 +35,35 @@ ghcid:
   record_id: 8a6c60f4-e8d2-4d34-91c5-e8926f1abe58
   generation_timestamp: '2025-12-06T23:35:51.843393+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: ES
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Espírito Santo
+    city_code: GUA
+    city_name: Guajuru
+    geonames_id: 3473471
+    feature_code: PPL
+    google_place_id: ChIJ_TSjRAEYuAAR6ynoGRnu8rM
+    latitude: -20.2768435
+    longitude: -40.3044234
+    resolution_date: '2025-12-07T16:38:46.942964+00:00'
   ghcid_history:
   - ghcid: BR-ES-XXX-E-UDL
     ghcid_numeric: 14536158741379311973
     valid_from: '2025-12-06T23:35:51.843393+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:46.942964+00:00'
+  - ghcid: BR-ES-GUA-E-UDL
+    ghcid_numeric: 14536158741379311973
+    valid_from: '2025-12-07T16:38:46.942964+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Guajuru (ES)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFES Digital Libraries
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-ES-XXX-E-UDL
+  identifier_value: BR-ES-GUA-E-UDL
 - identifier_scheme: GHCID_UUID
   identifier_value: 7f790535-d83f-500a-81e9-061bcedceedf
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.843393+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ_TSjRAEYuAAR6ynoGRnu8rM
+  formatted_address: Av. Fernando Ferrari, 514 - Goiabeiras, Vitória - ES, 29075-910,
+    Brazil
+  website: https://biblioteca.ufes.br/
+  latitude: -20.2768435
+  longitude: -40.3044234
+  enriched_at: '2025-12-07T16:38:46.942964+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-GO-XXX-E-UR-ufg_repositories.yaml b/data/custodian/BR-GO-BRE-E-UR-ufg_repositories.yaml
similarity index 82%
rename from data/custodian/BR-GO-XXX-E-UR-ufg_repositories.yaml
rename to data/custodian/BR-GO-BRE-E-UR-ufg_repositories.yaml
index d400943a5c..d4daa9dfbc 100644
--- a/data/custodian/BR-GO-XXX-E-UR-ufg_repositories.yaml
+++ b/data/custodian/BR-GO-BRE-E-UR-ufg_repositories.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: GOIÁS
 processing_timestamp: '2025-12-06T23:39:01.661162+00:00'
 ghcid:
-  ghcid_current: BR-GO-XXX-E-UR-ufg_repositories
+  ghcid_current: BR-GO-BRE-E-UR-ufg_repositories
   ghcid_original: BR-GO-XXX-E-UR-ufg_repositories
   ghcid_uuid: f7d2490e-55fb-5865-b7cf-767bb03d49f7
   ghcid_uuid_sha256: ad3dd100-5f2d-8c62-8432-9036ab7e1b42
@@ -35,22 +35,35 @@ ghcid:
   record_id: 07542308-c74b-4015-a79a-2f4618a4b124
   generation_timestamp: '2025-12-06T23:39:01.661162+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: GO
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Goiás
+    city_code: BRE
+    city_name: Bom Retiro
+    geonames_id: 12975579
+    feature_code: PPL
+    google_place_id: ChIJR8o_Di70XpMRPZAGz41-STc
+    latitude: -16.6062069
+    longitude: -49.2614624
+    resolution_date: '2025-12-07T16:38:47.643436+00:00'
   ghcid_history:
   - ghcid: BR-GO-XXX-E-UR-ufg_repositories
     ghcid_numeric: 12483363541667892322
     valid_from: '2025-12-06T23:39:01.661162+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:47.643436+00:00'
+  - ghcid: BR-GO-BRE-E-UR-ufg_repositories
+    ghcid_numeric: 12483363541667892322
+    valid_from: '2025-12-07T16:38:47.643436+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Bom Retiro (GO)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFG Repositories
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-GO-XXX-E-UR-ufg_repositories
+  identifier_value: BR-GO-BRE-E-UR-ufg_repositories
 - identifier_scheme: GHCID_UUID
   identifier_value: f7d2490e-55fb-5865-b7cf-767bb03d49f7
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.661162+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJR8o_Di70XpMRPZAGz41-STc
+  formatted_address: Av. Esperança, s/n - Chácaras de Recreio Samambaia, Goiânia -
+    GO, 74690-900, Brazil
+  website: https://www.ufg.br/
+  latitude: -16.6062069
+  longitude: -49.2614624
+  enriched_at: '2025-12-07T16:38:47.643436+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-GO-XXX-E-UR.yaml b/data/custodian/BR-GO-BRE-E-UR.yaml
similarity index 83%
rename from data/custodian/BR-GO-XXX-E-UR.yaml
rename to data/custodian/BR-GO-BRE-E-UR.yaml
index ca9a3bee3f..6387f8df43 100644
--- a/data/custodian/BR-GO-XXX-E-UR.yaml
+++ b/data/custodian/BR-GO-BRE-E-UR.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: GOIÁS
 processing_timestamp: '2025-12-06T23:35:51.851097+00:00'
 ghcid:
-  ghcid_current: BR-GO-XXX-E-UR
+  ghcid_current: BR-GO-BRE-E-UR
   ghcid_original: BR-GO-XXX-E-UR
   ghcid_uuid: 522b63d4-fa44-5138-836b-7b3204751fae
   ghcid_uuid_sha256: e13342ea-49b4-87c9-e72a-04a0c4b2f349
@@ -35,22 +35,35 @@ ghcid:
   record_id: e7f162bd-96f0-47bd-a83a-5eb63f4c49e8
   generation_timestamp: '2025-12-06T23:35:51.851097+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: GO
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Goiás
+    city_code: BRE
+    city_name: Bom Retiro
+    geonames_id: 12975579
+    feature_code: PPL
+    google_place_id: ChIJR8o_Di70XpMRPZAGz41-STc
+    latitude: -16.6062069
+    longitude: -49.2614624
+    resolution_date: '2025-12-07T16:38:48.278028+00:00'
   ghcid_history:
   - ghcid: BR-GO-XXX-E-UR
     ghcid_numeric: 16227387456372365257
     valid_from: '2025-12-06T23:35:51.851097+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:48.278028+00:00'
+  - ghcid: BR-GO-BRE-E-UR
+    ghcid_numeric: 16227387456372365257
+    valid_from: '2025-12-07T16:38:48.278028+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Bom Retiro (GO)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFG Repositories
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-GO-XXX-E-UR
+  identifier_value: BR-GO-BRE-E-UR
 - identifier_scheme: GHCID_UUID
   identifier_value: 522b63d4-fa44-5138-836b-7b3204751fae
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.851097+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJR8o_Di70XpMRPZAGz41-STc
+  formatted_address: Av. Esperança, s/n - Chácaras de Recreio Samambaia, Goiânia -
+    GO, 74690-900, Brazil
+  website: https://www.ufg.br/
+  latitude: -16.6062069
+  longitude: -49.2614624
+  enriched_at: '2025-12-07T16:38:48.278028+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-GO-XXX-M-UGV-unesco_goias_velho.yaml b/data/custodian/BR-GO-GOI-M-UGV-unesco_goias_velho.yaml
similarity index 82%
rename from data/custodian/BR-GO-XXX-M-UGV-unesco_goias_velho.yaml
rename to data/custodian/BR-GO-GOI-M-UGV-unesco_goias_velho.yaml
index 2e08c77e37..403d06a77c 100644
--- a/data/custodian/BR-GO-XXX-M-UGV-unesco_goias_velho.yaml
+++ b/data/custodian/BR-GO-GOI-M-UGV-unesco_goias_velho.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: GOIÁS
 processing_timestamp: '2025-12-06T23:39:01.658683+00:00'
 ghcid:
-  ghcid_current: BR-GO-XXX-M-UGV-unesco_goias_velho
+  ghcid_current: BR-GO-GOI-M-UGV-unesco_goias_velho
   ghcid_original: BR-GO-XXX-M-UGV-unesco_goias_velho
   ghcid_uuid: de82e366-9240-52ae-8920-06cd5bff1dbb
   ghcid_uuid_sha256: 7a9bfe1e-e7e0-8815-33dd-f6bf5558a1a2
@@ -35,22 +35,35 @@ ghcid:
   record_id: 53acc233-9a75-47ec-9025-7a5b1f2efc12
   generation_timestamp: '2025-12-06T23:39:01.658683+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: GO
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Goiás
+    city_code: GOI
+    city_name: Goias
+    geonames_id: 3462374
+    feature_code: PPL
+    google_place_id: ChIJLydQzwp5Z5MReDWFEQXBbjg
+    latitude: -15.934047999999999
+    longitude: -50.140446999999995
+    resolution_date: '2025-12-07T16:38:49.051420+00:00'
   ghcid_history:
   - ghcid: BR-GO-XXX-M-UGV-unesco_goias_velho
     ghcid_numeric: 8834934502710077461
     valid_from: '2025-12-06T23:39:01.658683+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:49.051420+00:00'
+  - ghcid: BR-GO-GOI-M-UGV-unesco_goias_velho
+    ghcid_numeric: 8834934502710077461
+    valid_from: '2025-12-07T16:38:49.051420+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Goias (GO)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UNESCO Goiás Velho
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-GO-XXX-M-UGV-unesco_goias_velho
+  identifier_value: BR-GO-GOI-M-UGV-unesco_goias_velho
 - identifier_scheme: GHCID_UUID
   identifier_value: de82e366-9240-52ae-8920-06cd5bff1dbb
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.658683+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJLydQzwp5Z5MReDWFEQXBbjg
+  formatted_address: 15°56'02. 50°08'25. - R. 6, 6"S - Goiás, GO, 76600-000, Brazil
+  website: null
+  latitude: -15.934047999999999
+  longitude: -50.140446999999995
+  enriched_at: '2025-12-07T16:38:49.051420+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-GO-XXX-M-UGV.yaml b/data/custodian/BR-GO-GOI-M-UGV.yaml
similarity index 83%
rename from data/custodian/BR-GO-XXX-M-UGV.yaml
rename to data/custodian/BR-GO-GOI-M-UGV.yaml
index 4713b46c1a..ea3f31d7a3 100644
--- a/data/custodian/BR-GO-XXX-M-UGV.yaml
+++ b/data/custodian/BR-GO-GOI-M-UGV.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: GOIÁS
 processing_timestamp: '2025-12-06T23:35:51.848587+00:00'
 ghcid:
-  ghcid_current: BR-GO-XXX-M-UGV
+  ghcid_current: BR-GO-GOI-M-UGV
   ghcid_original: BR-GO-XXX-M-UGV
   ghcid_uuid: 3d18dd41-c4c8-5713-8ff2-8b0e1506725b
   ghcid_uuid_sha256: 6fc66f25-d600-867a-9914-92de625d1256
@@ -35,22 +35,35 @@ ghcid:
   record_id: 6f6472cd-fc69-456e-bb4c-8c48ef5fcc5b
   generation_timestamp: '2025-12-06T23:35:51.848587+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: GO
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Goiás
+    city_code: GOI
+    city_name: Goias
+    geonames_id: 3462374
+    feature_code: PPL
+    google_place_id: ChIJLydQzwp5Z5MReDWFEQXBbjg
+    latitude: -15.934047999999999
+    longitude: -50.140446999999995
+    resolution_date: '2025-12-07T16:38:49.806523+00:00'
   ghcid_history:
   - ghcid: BR-GO-XXX-M-UGV
     ghcid_numeric: 8054247191893517946
     valid_from: '2025-12-06T23:35:51.848587+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:49.806523+00:00'
+  - ghcid: BR-GO-GOI-M-UGV
+    ghcid_numeric: 8054247191893517946
+    valid_from: '2025-12-07T16:38:49.806523+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Goias (GO)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UNESCO Goiás Velho
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-GO-XXX-M-UGV
+  identifier_value: BR-GO-GOI-M-UGV
 - identifier_scheme: GHCID_UUID
   identifier_value: 3d18dd41-c4c8-5713-8ff2-8b0e1506725b
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.848587+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJLydQzwp5Z5MReDWFEQXBbjg
+  formatted_address: 15°56'02. 50°08'25. - R. 6, 6"S - Goiás, GO, 76600-000, Brazil
+  website: null
+  latitude: -15.934047999999999
+  longitude: -50.140446999999995
+  enriched_at: '2025-12-07T16:38:49.806523+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-MA-XXX-X-CMCN-casa_das_minascasa_de_nago.yaml b/data/custodian/BR-MA-SLU-X-CMCN-casa_das_minascasa_de_nago.yaml
similarity index 82%
rename from data/custodian/BR-MA-XXX-X-CMCN-casa_das_minascasa_de_nago.yaml
rename to data/custodian/BR-MA-SLU-X-CMCN-casa_das_minascasa_de_nago.yaml
index 94d0b6f166..79fcf4eda0 100644
--- a/data/custodian/BR-MA-XXX-X-CMCN-casa_das_minascasa_de_nago.yaml
+++ b/data/custodian/BR-MA-SLU-X-CMCN-casa_das_minascasa_de_nago.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: MARANHÃO
 processing_timestamp: '2025-12-06T23:39:01.669760+00:00'
 ghcid:
-  ghcid_current: BR-MA-XXX-X-CMCN-casa_das_minascasa_de_nago
+  ghcid_current: BR-MA-SLU-X-CMCN-casa_das_minascasa_de_nago
   ghcid_original: BR-MA-XXX-X-CMCN-casa_das_minascasa_de_nago
   ghcid_uuid: bef09f28-bd74-54e1-85a1-0aefb75a84b8
   ghcid_uuid_sha256: df59c0e0-c2f8-86dc-fd61-b6cbd340e868
@@ -35,22 +35,35 @@ ghcid:
   record_id: c4ef9734-c490-4a30-9d54-a20468e6b69d
   generation_timestamp: '2025-12-06T23:39:01.669760+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: MA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Maranhão
+    city_code: SLU
+    city_name: Sao Luis
+    geonames_id: 3388368
+    feature_code: PPLA
+    google_place_id: ChIJ8cJkRkGP9gcRtnmY3N7rYms
+    latitude: -2.5378179999999997
+    longitude: -44.2987361
+    resolution_date: '2025-12-07T16:38:53.288355+00:00'
   ghcid_history:
   - ghcid: BR-MA-XXX-X-CMCN-casa_das_minascasa_de_nago
     ghcid_numeric: 16094106814961481436
     valid_from: '2025-12-06T23:39:01.669760+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:53.288355+00:00'
+  - ghcid: BR-MA-SLU-X-CMCN-casa_das_minascasa_de_nago
+    ghcid_numeric: 16094106814961481436
+    valid_from: '2025-12-07T16:38:53.288355+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Sao Luis (MA)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Casa das Minas/Casa de Nagô
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-MA-XXX-X-CMCN-casa_das_minascasa_de_nago
+  identifier_value: BR-MA-SLU-X-CMCN-casa_das_minascasa_de_nago
 - identifier_scheme: GHCID_UUID
   identifier_value: bef09f28-bd74-54e1-85a1-0aefb75a84b8
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.669760+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ8cJkRkGP9gcRtnmY3N7rYms
+  formatted_address: R. das Criolas, 799 - Centro, São Luís - MA, 65015-090, Brazil
+  website: null
+  latitude: -2.5378179999999997
+  longitude: -44.2987361
+  enriched_at: '2025-12-07T16:38:53.288355+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-MA-XXX-X-CMCN.yaml b/data/custodian/BR-MA-SLU-X-CMCN.yaml
similarity index 83%
rename from data/custodian/BR-MA-XXX-X-CMCN.yaml
rename to data/custodian/BR-MA-SLU-X-CMCN.yaml
index 0d0b1b6818..115b7ba58a 100644
--- a/data/custodian/BR-MA-XXX-X-CMCN.yaml
+++ b/data/custodian/BR-MA-SLU-X-CMCN.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: MARANHÃO
 processing_timestamp: '2025-12-06T23:35:51.862196+00:00'
 ghcid:
-  ghcid_current: BR-MA-XXX-X-CMCN
+  ghcid_current: BR-MA-SLU-X-CMCN
   ghcid_original: BR-MA-XXX-X-CMCN
   ghcid_uuid: 3d2391b0-2769-5ac7-836e-e8eb641e489d
   ghcid_uuid_sha256: 3bd6e0ca-805f-8042-b65e-f59f5d522e59
@@ -35,22 +35,35 @@ ghcid:
   record_id: 3f700fff-5261-44b9-9c49-aecabfdea346
   generation_timestamp: '2025-12-06T23:35:51.862196+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: MA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Maranhão
+    city_code: SLU
+    city_name: Sao Luis
+    geonames_id: 3388368
+    feature_code: PPLA
+    google_place_id: ChIJ8cJkRkGP9gcRtnmY3N7rYms
+    latitude: -2.5378179999999997
+    longitude: -44.2987361
+    resolution_date: '2025-12-07T16:38:53.936950+00:00'
   ghcid_history:
   - ghcid: BR-MA-XXX-X-CMCN
     ghcid_numeric: 4311880853595566146
     valid_from: '2025-12-06T23:35:51.862196+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:53.936950+00:00'
+  - ghcid: BR-MA-SLU-X-CMCN
+    ghcid_numeric: 4311880853595566146
+    valid_from: '2025-12-07T16:38:53.936950+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Sao Luis (MA)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Casa das Minas/Casa de Nagô
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-MA-XXX-X-CMCN
+  identifier_value: BR-MA-SLU-X-CMCN
 - identifier_scheme: GHCID_UUID
   identifier_value: 3d2391b0-2769-5ac7-836e-e8eb641e489d
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.862196+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ8cJkRkGP9gcRtnmY3N7rYms
+  formatted_address: R. das Criolas, 799 - Centro, São Luís - MA, 65015-090, Brazil
+  website: null
+  latitude: -2.5378179999999997
+  longitude: -44.2987361
+  enriched_at: '2025-12-07T16:38:53.936950+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-MI-XXX-X-MG-mm_gerdau.yaml b/data/custodian/BR-MG-BHO-X-MG-mm_gerdau.yaml
similarity index 82%
rename from data/custodian/BR-MI-XXX-X-MG-mm_gerdau.yaml
rename to data/custodian/BR-MG-BHO-X-MG-mm_gerdau.yaml
index b71a6df280..4f0a073e30 100644
--- a/data/custodian/BR-MI-XXX-X-MG-mm_gerdau.yaml
+++ b/data/custodian/BR-MG-BHO-X-MG-mm_gerdau.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: MINAS GERAIS
 processing_timestamp: '2025-12-06T23:39:01.690168+00:00'
 ghcid:
-  ghcid_current: BR-MI-XXX-X-MG-mm_gerdau
+  ghcid_current: BR-MG-BHO-X-MG-mm_gerdau
   ghcid_original: BR-MI-XXX-X-MG-mm_gerdau
   ghcid_uuid: 1861cde6-7927-5fe4-9b73-6d746ce4dc64
   ghcid_uuid_sha256: 66a3aa00-d693-86de-1e1d-ce69528dd762
@@ -35,22 +35,35 @@ ghcid:
   record_id: dcdc1255-c6c5-409c-b77f-c46483d1b191
   generation_timestamp: '2025-12-06T23:39:01.690168+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: MI
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: MG
+    region_name: Minas Gerais
+    city_code: BHO
+    city_name: Belo Horizonte
+    geonames_id: 3470127
+    feature_code: PPLA
+    google_place_id: ChIJOzlj092ZpgAR-mL6VtTxMtY
+    latitude: -19.9316955
+    longitude: -43.9387508
+    resolution_date: '2025-12-07T16:38:57.447074+00:00'
   ghcid_history:
   - ghcid: BR-MI-XXX-X-MG-mm_gerdau
     ghcid_numeric: 7395941933649172190
     valid_from: '2025-12-06T23:39:01.690168+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:57.447074+00:00'
+  - ghcid: BR-MG-BHO-X-MG-mm_gerdau
+    ghcid_numeric: 7395941933649172190
+    valid_from: '2025-12-07T16:38:57.447074+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Belo Horizonte (MG)'
 custodian_name:
   claim_type: custodian_name
   claim_value: MM Gerdau
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-MI-XXX-X-MG-mm_gerdau
+  identifier_value: BR-MG-BHO-X-MG-mm_gerdau
 - identifier_scheme: GHCID_UUID
   identifier_value: 1861cde6-7927-5fe4-9b73-6d746ce4dc64
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.690168+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJOzlj092ZpgAR-mL6VtTxMtY
+  formatted_address: Praça da Liberdade, 680 - Funcionários, Belo Horizonte - MG,
+    30140-010, Brazil
+  website: http://www.mmgerdau.org.br/
+  latitude: -19.9316955
+  longitude: -43.9387508
+  enriched_at: '2025-12-07T16:38:57.447074+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-MI-XXX-X-MG.yaml b/data/custodian/BR-MG-BHO-X-MG.yaml
similarity index 82%
rename from data/custodian/BR-MI-XXX-X-MG.yaml
rename to data/custodian/BR-MG-BHO-X-MG.yaml
index 2254a38a1f..ed7f6e4e49 100644
--- a/data/custodian/BR-MI-XXX-X-MG.yaml
+++ b/data/custodian/BR-MG-BHO-X-MG.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: MINAS GERAIS
 processing_timestamp: '2025-12-06T23:35:51.888461+00:00'
 ghcid:
-  ghcid_current: BR-MI-XXX-X-MG
+  ghcid_current: BR-MG-BHO-X-MG
   ghcid_original: BR-MI-XXX-X-MG
   ghcid_uuid: 45c6c9de-eaee-5e31-a7b6-b6a4a29bd1e0
   ghcid_uuid_sha256: 446b203a-47c3-8ff4-785a-6ffbfe8e7b87
@@ -35,22 +35,35 @@ ghcid:
   record_id: f68afce8-0359-40d6-aaee-06a0526aa000
   generation_timestamp: '2025-12-06T23:35:51.888461+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: MI
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: MG
+    region_name: Minas Gerais
+    city_code: BHO
+    city_name: Belo Horizonte
+    geonames_id: 3470127
+    feature_code: PPLA
+    google_place_id: ChIJOzlj092ZpgAR-mL6VtTxMtY
+    latitude: -19.9316955
+    longitude: -43.9387508
+    resolution_date: '2025-12-07T16:38:58.104466+00:00'
   ghcid_history:
   - ghcid: BR-MI-XXX-X-MG
     ghcid_numeric: 4930069651771338740
     valid_from: '2025-12-06T23:35:51.888461+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:58.104466+00:00'
+  - ghcid: BR-MG-BHO-X-MG
+    ghcid_numeric: 4930069651771338740
+    valid_from: '2025-12-07T16:38:58.104466+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Belo Horizonte (MG)'
 custodian_name:
   claim_type: custodian_name
   claim_value: MM Gerdau
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-MI-XXX-X-MG
+  identifier_value: BR-MG-BHO-X-MG
 - identifier_scheme: GHCID_UUID
   identifier_value: 45c6c9de-eaee-5e31-a7b6-b6a4a29bd1e0
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.888461+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJOzlj092ZpgAR-mL6VtTxMtY
+  formatted_address: Praça da Liberdade, 680 - Funcionários, Belo Horizonte - MG,
+    30140-010, Brazil
+  website: http://www.mmgerdau.org.br/
+  latitude: -19.9316955
+  longitude: -43.9387508
+  enriched_at: '2025-12-07T16:38:58.104466+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-MA-XXX-X-GKP-guarani_kaiowa_projects.yaml b/data/custodian/BR-MG-XAN-X-GKP-guarani_kaiowa_projects.yaml
similarity index 82%
rename from data/custodian/BR-MA-XXX-X-GKP-guarani_kaiowa_projects.yaml
rename to data/custodian/BR-MG-XAN-X-GKP-guarani_kaiowa_projects.yaml
index 4c94d8b0e7..bfb376ffb2 100644
--- a/data/custodian/BR-MA-XXX-X-GKP-guarani_kaiowa_projects.yaml
+++ b/data/custodian/BR-MG-XAN-X-GKP-guarani_kaiowa_projects.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: MATO GROSSO DO SUL
 processing_timestamp: '2025-12-06T23:39:01.677361+00:00'
 ghcid:
-  ghcid_current: BR-MA-XXX-X-GKP-guarani_kaiowa_projects
+  ghcid_current: BR-MG-XAN-X-GKP-guarani_kaiowa_projects
   ghcid_original: BR-MA-XXX-X-GKP-guarani_kaiowa_projects
   ghcid_uuid: 52c99552-ceec-5bc8-b2b4-39c72c169c91
   ghcid_uuid_sha256: 421963e5-b482-888c-765f-ba48a6bb5fd6
@@ -35,22 +35,35 @@ ghcid:
   record_id: b6492569-3a10-478e-8b6a-a8a48f8d7fda
   generation_timestamp: '2025-12-06T23:39:01.677361+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: MA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: MG
+    region_name: Minas Gerais
+    city_code: XAN
+    city_name: Xangrila
+    geonames_id: 8643527
+    feature_code: PPL
+    google_place_id: ChIJX4SSRP-TpgARk_CTiY-AnRY
+    latitude: -19.884707199999998
+    longitude: -44.0235242
+    resolution_date: '2025-12-07T16:38:54.630924+00:00'
   ghcid_history:
   - ghcid: BR-MA-XXX-X-GKP-guarani_kaiowa_projects
     ghcid_numeric: 4762947919148112012
     valid_from: '2025-12-06T23:39:01.677361+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:54.630924+00:00'
+  - ghcid: BR-MG-XAN-X-GKP-guarani_kaiowa_projects
+    ghcid_numeric: 4762947919148112012
+    valid_from: '2025-12-07T16:38:54.630924+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Xangrila (MG)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Guarani-Kaiowá Projects
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-MA-XXX-X-GKP-guarani_kaiowa_projects
+  identifier_value: BR-MG-XAN-X-GKP-guarani_kaiowa_projects
 - identifier_scheme: GHCID_UUID
   identifier_value: 52c99552-ceec-5bc8-b2b4-39c72c169c91
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.677361+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJX4SSRP-TpgARk_CTiY-AnRY
+  formatted_address: R. Rodrigues da Cunha, 914 - São Joaquim, Contagem - MG, 32113-340,
+    Brazil
+  website: null
+  latitude: -19.884707199999998
+  longitude: -44.0235242
+  enriched_at: '2025-12-07T16:38:54.630924+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-MA-XXX-X-GKP.yaml b/data/custodian/BR-MG-XAN-X-GKP.yaml
similarity index 83%
rename from data/custodian/BR-MA-XXX-X-GKP.yaml
rename to data/custodian/BR-MG-XAN-X-GKP.yaml
index 5928c73a5e..c1c73e4ca3 100644
--- a/data/custodian/BR-MA-XXX-X-GKP.yaml
+++ b/data/custodian/BR-MG-XAN-X-GKP.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: MATO GROSSO DO SUL
 processing_timestamp: '2025-12-06T23:35:51.872876+00:00'
 ghcid:
-  ghcid_current: BR-MA-XXX-X-GKP
+  ghcid_current: BR-MG-XAN-X-GKP
   ghcid_original: BR-MA-XXX-X-GKP
   ghcid_uuid: d943ad9f-cf9e-53a8-8093-c4f5ad3cf564
   ghcid_uuid_sha256: 7fa32134-ed6d-87b5-ff21-6946f18a28c7
@@ -35,22 +35,35 @@ ghcid:
   record_id: 6a6f03da-21f1-4895-936c-af4660bc187a
   generation_timestamp: '2025-12-06T23:35:51.872876+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: MA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: MG
+    region_name: Minas Gerais
+    city_code: XAN
+    city_name: Xangrila
+    geonames_id: 8643527
+    feature_code: PPL
+    google_place_id: ChIJX4SSRP-TpgARk_CTiY-AnRY
+    latitude: -19.884707199999998
+    longitude: -44.0235242
+    resolution_date: '2025-12-07T16:38:55.393582+00:00'
   ghcid_history:
   - ghcid: BR-MA-XXX-X-GKP
     ghcid_numeric: 9197231375226070965
     valid_from: '2025-12-06T23:35:51.872876+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:55.393582+00:00'
+  - ghcid: BR-MG-XAN-X-GKP
+    ghcid_numeric: 9197231375226070965
+    valid_from: '2025-12-07T16:38:55.393582+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Xangrila (MG)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Guarani-Kaiowá Projects
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-MA-XXX-X-GKP
+  identifier_value: BR-MG-XAN-X-GKP
 - identifier_scheme: GHCID_UUID
   identifier_value: d943ad9f-cf9e-53a8-8093-c4f5ad3cf564
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.872876+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJX4SSRP-TpgARk_CTiY-AnRY
+  formatted_address: R. Rodrigues da Cunha, 914 - São Joaquim, Contagem - MG, 32113-340,
+    Brazil
+  website: null
+  latitude: -19.884707199999998
+  longitude: -44.0235242
+  enriched_at: '2025-12-07T16:38:55.393582+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-MI-XXX-E-UTL-ufmg_tainacan_lab.yaml b/data/custodian/BR-MI-BHO-E-UTL-ufmg_tainacan_lab.yaml
similarity index 88%
rename from data/custodian/BR-MI-XXX-E-UTL-ufmg_tainacan_lab.yaml
rename to data/custodian/BR-MI-BHO-E-UTL-ufmg_tainacan_lab.yaml
index f9389819a6..83b0edb7ec 100644
--- a/data/custodian/BR-MI-XXX-E-UTL-ufmg_tainacan_lab.yaml
+++ b/data/custodian/BR-MI-BHO-E-UTL-ufmg_tainacan_lab.yaml
@@ -1,53 +1,96 @@
-original_entry:
-  name: UFMG Tainacan Lab
-  institution_type: EDUCATION_PROVIDER
-  source: CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
-  identifiers:
-  - identifier_scheme: GHCID
-    identifier_value: BR-MG-XXX-E-UTL
-  - identifier_scheme: GHCID_NUMERIC
-    identifier_value: '12840343882751256357'
-  - &id001
-    identifier_scheme: OLD_ID
-    identifier_value: https://w3id.org/heritage/custodian/br/ufmg-tainacan-lab
-  - identifier_scheme: GHCID_UUID
-    identifier_value: 5ce7af22-178b-513d-8ec6-0d84cd016a81
-    identifier_url: urn:uuid:5ce7af22-178b-513d-8ec6-0d84cd016a81
-  - identifier_scheme: GHCID_UUID_SHA256
-    identifier_value: b23210ba-f53f-8725-b6b1-8967118aaa2b
-    identifier_url: urn:uuid:b23210ba-f53f-8725-b6b1-8967118aaa2b
-  - identifier_scheme: RECORD_ID
-    identifier_value: 019a58fd-3226-75d2-a0d2-900b91512f20
-    identifier_url: urn:uuid:019a58fd-3226-75d2-a0d2-900b91512f20
-  - &id002
-    identifier_scheme: OLD_ID
-    identifier_value: 12840343882751256357
-  locations:
-  - country: BR
-    region: MINAS GERAIS
-processing_timestamp: '2025-12-06T23:39:01.682312+00:00'
-ghcid:
-  ghcid_current: BR-MI-XXX-E-UTL-ufmg_tainacan_lab
-  ghcid_original: BR-MI-XXX-E-UTL-ufmg_tainacan_lab
-  ghcid_uuid: 9dcee694-81b2-5309-a27a-628488d0205e
-  ghcid_uuid_sha256: 13070e5d-e801-83f1-03cd-cc25bae08688
-  ghcid_numeric: 1371080408044741617
-  record_id: 167ba1b7-a62d-42d6-92cd-d91ff4ce72a9
-  generation_timestamp: '2025-12-06T23:39:01.682312+00:00'
-  location_resolution:
-    country_code: BR
-    region_code: MI
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
-  ghcid_history:
-  - ghcid: BR-MI-XXX-E-UTL-ufmg_tainacan_lab
-    ghcid_numeric: 1371080408044741617
-    valid_from: '2025-12-06T23:39:01.682312+00:00'
-    reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+ch_annotator:
+  annotation_metadata:
+    confidence_score: 0.7
+    verification_date: null
+    verified: false
+    verified_by: null
+  annotation_provenance:
+    annotation_agent: opencode-claude-sonnet-4
+    annotation_date: '2025-12-06T21:13:56.173868+00:00'
+    annotation_method: retroactive CH-Annotator application via batch script
+    source_file: latin_american_institutions_AUTHORITATIVE.yaml
+  convention_id: ch_annotator-v1_7_0
+  convention_version: 1.7.0
+  entity_claims:
+  - claim_type: full_name
+    claim_value: UFMG Tainacan Lab
+    confidence: 0.7
+    property_uri: skos:prefLabel
+    provenance:
+      agent: claude-conversation
+      context_convention: ch_annotator-v1_7_0
+      namespace: glam
+      path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
+      timestamp: '2025-11-06T08:25:13.555330+00:00'
+  - claim_type: institution_type
+    claim_value: EDUCATION_PROVIDER
+    confidence: 0.95
+    property_uri: rdf:type
+    provenance:
+      agent: claude-conversation
+      context_convention: ch_annotator-v1_7_0
+      namespace: glam
+      path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
+      timestamp: '2025-11-06T08:25:13.555330+00:00'
+  - claim_type: ghcid
+    claim_value: BR-MG-XXX-E-UTL
+    confidence: 1.0
+    property_uri: glam:ghcid
+    provenance:
+      agent: claude-conversation
+      context_convention: ch_annotator-v1_7_0
+      namespace: glam
+      path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
+      timestamp: '2025-11-06T08:25:13.555330+00:00'
+  entity_classification:
+    alternative_classes:
+    - org:FormalOrganization
+    - rov:RegisteredOrganization
+    - glam:HeritageCustodian
+    hypernym: GRP
+    hypernym_label: GROUP
+    ontology_class: schema:EducationalOrganization
+    subtype: GRP.EDU
+    subtype_label: EDUCATION_PROVIDER
+  extraction_provenance:
+    agent: claude-conversation
+    context_convention: ch_annotator-v1_7_0
+    namespace: glam
+    path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
+    timestamp: '2025-11-06T08:25:13.555330+00:00'
+  integration_note:
+    created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
+    creation_date: '2025-12-06T23:39:01.682312+00:00'
+    creation_method: create_custodian_from_ch_annotator.py
 custodian_name:
   claim_type: custodian_name
   claim_value: UFMG Tainacan Lab
   source_type: ch_annotator
+ghcid:
+  generation_timestamp: '2025-12-06T23:39:01.682312+00:00'
+  ghcid_current: BR-MG-BHO-E-UTL-ufmg_tainacan_lab
+  ghcid_history:
+  - ghcid: BR-MI-XXX-E-UTL-ufmg_tainacan_lab
+    ghcid_numeric: 1371080408044741617
+    reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_from: '2025-12-06T23:39:01.682312+00:00'
+  ghcid_numeric: 1371080408044741617
+  ghcid_original: BR-MI-XXX-E-UTL-ufmg_tainacan_lab
+  ghcid_uuid: 9dcee694-81b2-5309-a27a-628488d0205e
+  ghcid_uuid_sha256: 13070e5d-e801-83f1-03cd-cc25bae08688
+  location_resolution:
+    city_code: BHO
+    city_name: Belo Horizonte
+    country_code: BR
+    geonames_id: 3470127
+    latitude: -19.9191
+    longitude: -43.9386
+    method: MANUAL_RESEARCH
+    notes: UFMG (Federal University of Minas Gerais) is in Belo Horizonte
+    region_code: MG
+    region_name: Minas Gerais
+    resolution_date: '2025-12-07T16:44:07.061598+00:00'
+  record_id: 167ba1b7-a62d-42d6-92cd-d91ff4ce72a9
 identifiers:
 - identifier_scheme: GHCID
   identifier_value: BR-MI-XXX-E-UTL-ufmg_tainacan_lab
@@ -59,75 +102,39 @@ identifiers:
   identifier_value: '1371080408044741617'
 - identifier_scheme: RECORD_ID
   identifier_value: 167ba1b7-a62d-42d6-92cd-d91ff4ce72a9
-- *id001
-- *id002
+- &id001
+  identifier_scheme: OLD_ID
+  identifier_value: https://w3id.org/heritage/custodian/br/ufmg-tainacan-lab
+- &id002
+  identifier_scheme: OLD_ID
+  identifier_value: 12840343882751256357
+original_entry:
+  identifiers:
+  - identifier_scheme: GHCID
+    identifier_value: BR-MG-XXX-E-UTL
+  - identifier_scheme: GHCID_NUMERIC
+    identifier_value: '12840343882751256357'
+  - *id001
+  - identifier_scheme: GHCID_UUID
+    identifier_url: urn:uuid:5ce7af22-178b-513d-8ec6-0d84cd016a81
+    identifier_value: 5ce7af22-178b-513d-8ec6-0d84cd016a81
+  - identifier_scheme: GHCID_UUID_SHA256
+    identifier_url: urn:uuid:b23210ba-f53f-8725-b6b1-8967118aaa2b
+    identifier_value: b23210ba-f53f-8725-b6b1-8967118aaa2b
+  - identifier_scheme: RECORD_ID
+    identifier_url: urn:uuid:019a58fd-3226-75d2-a0d2-900b91512f20
+    identifier_value: 019a58fd-3226-75d2-a0d2-900b91512f20
+  - *id002
+  institution_type: EDUCATION_PROVIDER
+  locations:
+  - country: BR
+    region: MINAS GERAIS
+  name: UFMG Tainacan Lab
+  source: CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+processing_timestamp: '2025-12-06T23:39:01.682312+00:00'
 provenance:
+  confidence_score: 0.7
   data_source: CONVERSATION_NLP
   data_tier: TIER_4_INFERRED
   extraction_date: '2025-11-06T08:25:13.555330+00:00'
   extraction_method: 'Created from CH-Annotator file: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml'
-  confidence_score: 0.7
-ch_annotator:
-  convention_id: ch_annotator-v1_7_0
-  convention_version: 1.7.0
-  entity_classification:
-    hypernym: GRP
-    hypernym_label: GROUP
-    subtype: GRP.EDU
-    subtype_label: EDUCATION_PROVIDER
-    ontology_class: schema:EducationalOrganization
-    alternative_classes:
-    - org:FormalOrganization
-    - rov:RegisteredOrganization
-    - glam:HeritageCustodian
-  extraction_provenance:
-    namespace: glam
-    path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
-    timestamp: '2025-11-06T08:25:13.555330+00:00'
-    agent: claude-conversation
-    context_convention: ch_annotator-v1_7_0
-  annotation_provenance:
-    annotation_agent: opencode-claude-sonnet-4
-    annotation_date: '2025-12-06T21:13:56.173868+00:00'
-    annotation_method: retroactive CH-Annotator application via batch script
-    source_file: latin_american_institutions_AUTHORITATIVE.yaml
-  annotation_metadata:
-    confidence_score: 0.7
-    verified: false
-    verification_date: null
-    verified_by: null
-  entity_claims:
-  - claim_type: full_name
-    claim_value: UFMG Tainacan Lab
-    property_uri: skos:prefLabel
-    provenance:
-      namespace: glam
-      path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
-      timestamp: '2025-11-06T08:25:13.555330+00:00'
-      agent: claude-conversation
-      context_convention: ch_annotator-v1_7_0
-    confidence: 0.7
-  - claim_type: institution_type
-    claim_value: EDUCATION_PROVIDER
-    property_uri: rdf:type
-    provenance:
-      namespace: glam
-      path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
-      timestamp: '2025-11-06T08:25:13.555330+00:00'
-      agent: claude-conversation
-      context_convention: ch_annotator-v1_7_0
-    confidence: 0.95
-  - claim_type: ghcid
-    claim_value: BR-MG-XXX-E-UTL
-    property_uri: glam:ghcid
-    provenance:
-      namespace: glam
-      path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
-      timestamp: '2025-11-06T08:25:13.555330+00:00'
-      agent: claude-conversation
-      context_convention: ch_annotator-v1_7_0
-    confidence: 1.0
-  integration_note:
-    created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
-    creation_date: '2025-12-06T23:39:01.682312+00:00'
-    creation_method: create_custodian_from_ch_annotator.py
diff --git a/data/custodian/BR-MI-XXX-E-UTL.yaml b/data/custodian/BR-MI-BHO-E-UTL.yaml
similarity index 88%
rename from data/custodian/BR-MI-XXX-E-UTL.yaml
rename to data/custodian/BR-MI-BHO-E-UTL.yaml
index 33acdec990..db97106153 100644
--- a/data/custodian/BR-MI-XXX-E-UTL.yaml
+++ b/data/custodian/BR-MI-BHO-E-UTL.yaml
@@ -1,53 +1,96 @@
-original_entry:
-  name: UFMG Tainacan Lab
-  institution_type: EDUCATION_PROVIDER
-  source: CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
-  identifiers:
-  - identifier_scheme: GHCID
-    identifier_value: BR-MG-XXX-E-UTL
-  - identifier_scheme: GHCID_NUMERIC
-    identifier_value: '12840343882751256357'
-  - &id001
-    identifier_scheme: OLD_ID
-    identifier_value: https://w3id.org/heritage/custodian/br/ufmg-tainacan-lab
-  - identifier_scheme: GHCID_UUID
-    identifier_value: 5ce7af22-178b-513d-8ec6-0d84cd016a81
-    identifier_url: urn:uuid:5ce7af22-178b-513d-8ec6-0d84cd016a81
-  - identifier_scheme: GHCID_UUID_SHA256
-    identifier_value: b23210ba-f53f-8725-b6b1-8967118aaa2b
-    identifier_url: urn:uuid:b23210ba-f53f-8725-b6b1-8967118aaa2b
-  - identifier_scheme: RECORD_ID
-    identifier_value: 019a58fd-3226-75d2-a0d2-900b91512f20
-    identifier_url: urn:uuid:019a58fd-3226-75d2-a0d2-900b91512f20
-  - &id002
-    identifier_scheme: OLD_ID
-    identifier_value: 12840343882751256357
-  locations:
-  - country: BR
-    region: MINAS GERAIS
-processing_timestamp: '2025-12-06T23:35:51.880783+00:00'
-ghcid:
-  ghcid_current: BR-MI-XXX-E-UTL
-  ghcid_original: BR-MI-XXX-E-UTL
-  ghcid_uuid: 562718ae-1d5c-57d7-9829-db40b4242ad1
-  ghcid_uuid_sha256: 4f4a44fc-5d32-87bd-c800-efcba8b8407d
-  ghcid_numeric: 5713454927958947773
-  record_id: 3c8e1c49-716c-40ea-a283-a208686138b7
-  generation_timestamp: '2025-12-06T23:35:51.880783+00:00'
-  location_resolution:
-    country_code: BR
-    region_code: MI
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
-  ghcid_history:
-  - ghcid: BR-MI-XXX-E-UTL
-    ghcid_numeric: 5713454927958947773
-    valid_from: '2025-12-06T23:35:51.880783+00:00'
-    reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+ch_annotator:
+  annotation_metadata:
+    confidence_score: 0.7
+    verification_date: null
+    verified: false
+    verified_by: null
+  annotation_provenance:
+    annotation_agent: opencode-claude-sonnet-4
+    annotation_date: '2025-12-06T21:13:56.173868+00:00'
+    annotation_method: retroactive CH-Annotator application via batch script
+    source_file: latin_american_institutions_AUTHORITATIVE.yaml
+  convention_id: ch_annotator-v1_7_0
+  convention_version: 1.7.0
+  entity_claims:
+  - claim_type: full_name
+    claim_value: UFMG Tainacan Lab
+    confidence: 0.7
+    property_uri: skos:prefLabel
+    provenance:
+      agent: claude-conversation
+      context_convention: ch_annotator-v1_7_0
+      namespace: glam
+      path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
+      timestamp: '2025-11-06T08:25:13.555330+00:00'
+  - claim_type: institution_type
+    claim_value: EDUCATION_PROVIDER
+    confidence: 0.95
+    property_uri: rdf:type
+    provenance:
+      agent: claude-conversation
+      context_convention: ch_annotator-v1_7_0
+      namespace: glam
+      path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
+      timestamp: '2025-11-06T08:25:13.555330+00:00'
+  - claim_type: ghcid
+    claim_value: BR-MG-XXX-E-UTL
+    confidence: 1.0
+    property_uri: glam:ghcid
+    provenance:
+      agent: claude-conversation
+      context_convention: ch_annotator-v1_7_0
+      namespace: glam
+      path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
+      timestamp: '2025-11-06T08:25:13.555330+00:00'
+  entity_classification:
+    alternative_classes:
+    - org:FormalOrganization
+    - rov:RegisteredOrganization
+    - glam:HeritageCustodian
+    hypernym: GRP
+    hypernym_label: GROUP
+    ontology_class: schema:EducationalOrganization
+    subtype: GRP.EDU
+    subtype_label: EDUCATION_PROVIDER
+  extraction_provenance:
+    agent: claude-conversation
+    context_convention: ch_annotator-v1_7_0
+    namespace: glam
+    path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
+    timestamp: '2025-11-06T08:25:13.555330+00:00'
+  integration_note:
+    created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
+    creation_date: '2025-12-06T23:35:51.880783+00:00'
+    creation_method: create_custodian_from_ch_annotator.py
 custodian_name:
   claim_type: custodian_name
   claim_value: UFMG Tainacan Lab
   source_type: ch_annotator
+ghcid:
+  generation_timestamp: '2025-12-06T23:35:51.880783+00:00'
+  ghcid_current: BR-MG-BHO-E-UTL
+  ghcid_history:
+  - ghcid: BR-MI-XXX-E-UTL
+    ghcid_numeric: 5713454927958947773
+    reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_from: '2025-12-06T23:35:51.880783+00:00'
+  ghcid_numeric: 5713454927958947773
+  ghcid_original: BR-MI-XXX-E-UTL
+  ghcid_uuid: 562718ae-1d5c-57d7-9829-db40b4242ad1
+  ghcid_uuid_sha256: 4f4a44fc-5d32-87bd-c800-efcba8b8407d
+  location_resolution:
+    city_code: BHO
+    city_name: Belo Horizonte
+    country_code: BR
+    geonames_id: 3470127
+    latitude: -19.9191
+    longitude: -43.9386
+    method: MANUAL_RESEARCH
+    notes: UFMG (Federal University of Minas Gerais) is in Belo Horizonte
+    region_code: MG
+    region_name: Minas Gerais
+    resolution_date: '2025-12-07T16:44:07.052938+00:00'
+  record_id: 3c8e1c49-716c-40ea-a283-a208686138b7
 identifiers:
 - identifier_scheme: GHCID
   identifier_value: BR-MI-XXX-E-UTL
@@ -59,75 +102,39 @@ identifiers:
   identifier_value: '5713454927958947773'
 - identifier_scheme: RECORD_ID
   identifier_value: 3c8e1c49-716c-40ea-a283-a208686138b7
-- *id001
-- *id002
+- &id001
+  identifier_scheme: OLD_ID
+  identifier_value: https://w3id.org/heritage/custodian/br/ufmg-tainacan-lab
+- &id002
+  identifier_scheme: OLD_ID
+  identifier_value: 12840343882751256357
+original_entry:
+  identifiers:
+  - identifier_scheme: GHCID
+    identifier_value: BR-MG-XXX-E-UTL
+  - identifier_scheme: GHCID_NUMERIC
+    identifier_value: '12840343882751256357'
+  - *id001
+  - identifier_scheme: GHCID_UUID
+    identifier_url: urn:uuid:5ce7af22-178b-513d-8ec6-0d84cd016a81
+    identifier_value: 5ce7af22-178b-513d-8ec6-0d84cd016a81
+  - identifier_scheme: GHCID_UUID_SHA256
+    identifier_url: urn:uuid:b23210ba-f53f-8725-b6b1-8967118aaa2b
+    identifier_value: b23210ba-f53f-8725-b6b1-8967118aaa2b
+  - identifier_scheme: RECORD_ID
+    identifier_url: urn:uuid:019a58fd-3226-75d2-a0d2-900b91512f20
+    identifier_value: 019a58fd-3226-75d2-a0d2-900b91512f20
+  - *id002
+  institution_type: EDUCATION_PROVIDER
+  locations:
+  - country: BR
+    region: MINAS GERAIS
+  name: UFMG Tainacan Lab
+  source: CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+processing_timestamp: '2025-12-06T23:35:51.880783+00:00'
 provenance:
+  confidence_score: 0.7
   data_source: CONVERSATION_NLP
   data_tier: TIER_4_INFERRED
   extraction_date: '2025-11-06T08:25:13.555330+00:00'
   extraction_method: 'Created from CH-Annotator file: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml'
-  confidence_score: 0.7
-ch_annotator:
-  convention_id: ch_annotator-v1_7_0
-  convention_version: 1.7.0
-  entity_classification:
-    hypernym: GRP
-    hypernym_label: GROUP
-    subtype: GRP.EDU
-    subtype_label: EDUCATION_PROVIDER
-    ontology_class: schema:EducationalOrganization
-    alternative_classes:
-    - org:FormalOrganization
-    - rov:RegisteredOrganization
-    - glam:HeritageCustodian
-  extraction_provenance:
-    namespace: glam
-    path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
-    timestamp: '2025-11-06T08:25:13.555330+00:00'
-    agent: claude-conversation
-    context_convention: ch_annotator-v1_7_0
-  annotation_provenance:
-    annotation_agent: opencode-claude-sonnet-4
-    annotation_date: '2025-12-06T21:13:56.173868+00:00'
-    annotation_method: retroactive CH-Annotator application via batch script
-    source_file: latin_american_institutions_AUTHORITATIVE.yaml
-  annotation_metadata:
-    confidence_score: 0.7
-    verified: false
-    verification_date: null
-    verified_by: null
-  entity_claims:
-  - claim_type: full_name
-    claim_value: UFMG Tainacan Lab
-    property_uri: skos:prefLabel
-    provenance:
-      namespace: glam
-      path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
-      timestamp: '2025-11-06T08:25:13.555330+00:00'
-      agent: claude-conversation
-      context_convention: ch_annotator-v1_7_0
-    confidence: 0.7
-  - claim_type: institution_type
-    claim_value: EDUCATION_PROVIDER
-    property_uri: rdf:type
-    provenance:
-      namespace: glam
-      path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
-      timestamp: '2025-11-06T08:25:13.555330+00:00'
-      agent: claude-conversation
-      context_convention: ch_annotator-v1_7_0
-    confidence: 0.95
-  - claim_type: ghcid
-    claim_value: BR-MG-XXX-E-UTL
-    property_uri: glam:ghcid
-    provenance:
-      namespace: glam
-      path: /conversations/2025-09-22T14-40-15-0102c00a-4c0a-4488-bdca-5dd9fb94c9c5
-      timestamp: '2025-11-06T08:25:13.555330+00:00'
-      agent: claude-conversation
-      context_convention: ch_annotator-v1_7_0
-    confidence: 1.0
-  integration_note:
-    created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
-    creation_date: '2025-12-06T23:35:51.880783+00:00'
-    creation_method: create_custodian_from_ch_annotator.py
diff --git a/data/custodian/BR-MA-XXX-E-UR-ufms_repositories.yaml b/data/custodian/BR-MS-CGR-E-UR-ufms_repositories.yaml
similarity index 82%
rename from data/custodian/BR-MA-XXX-E-UR-ufms_repositories.yaml
rename to data/custodian/BR-MS-CGR-E-UR-ufms_repositories.yaml
index 93ba374c22..31e3f35051 100644
--- a/data/custodian/BR-MA-XXX-E-UR-ufms_repositories.yaml
+++ b/data/custodian/BR-MS-CGR-E-UR-ufms_repositories.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: MATO GROSSO DO SUL
 processing_timestamp: '2025-12-06T23:39:01.679825+00:00'
 ghcid:
-  ghcid_current: BR-MA-XXX-E-UR-ufms_repositories
+  ghcid_current: BR-MS-CGR-E-UR-ufms_repositories
   ghcid_original: BR-MA-XXX-E-UR-ufms_repositories
   ghcid_uuid: eca86b33-eba5-5932-8650-8def05b7c3bd
   ghcid_uuid_sha256: 173f015f-9f25-8e82-2eea-f8824bdd63f3
@@ -35,22 +35,35 @@ ghcid:
   record_id: 7b781cf8-e210-4410-bf4f-1e68cd631b96
   generation_timestamp: '2025-12-06T23:39:01.679825+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: MA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: MS
+    region_name: Mato Grosso do Sul
+    city_code: CGR
+    city_name: Campo Grande
+    geonames_id: 3467747
+    feature_code: PPLA
+    google_place_id: ChIJgcQcpPnlhpQRoY7t5r5dN48
+    latitude: -20.5044138
+    longitude: -54.614135
+    resolution_date: '2025-12-07T16:38:50.505800+00:00'
   ghcid_history:
   - ghcid: BR-MA-XXX-E-UR-ufms_repositories
     ghcid_numeric: 1675059096608693890
     valid_from: '2025-12-06T23:39:01.679825+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:50.505800+00:00'
+  - ghcid: BR-MS-CGR-E-UR-ufms_repositories
+    ghcid_numeric: 1675059096608693890
+    valid_from: '2025-12-07T16:38:50.505800+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Campo Grande (MS)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFMS Repositories
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-MA-XXX-E-UR-ufms_repositories
+  identifier_value: BR-MS-CGR-E-UR-ufms_repositories
 - identifier_scheme: GHCID_UUID
   identifier_value: eca86b33-eba5-5932-8650-8def05b7c3bd
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.679825+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJgcQcpPnlhpQRoY7t5r5dN48
+  formatted_address: Cidade Universitária - Av. Costa e Silva - Pioneiros, Campo Grande
+    - MS, 79070-900, Brazil
+  website: http://www.ufms.br/
+  latitude: -20.5044138
+  longitude: -54.614135
+  enriched_at: '2025-12-07T16:38:50.505800+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-MA-XXX-E-UR.yaml b/data/custodian/BR-MS-CGR-E-UR.yaml
similarity index 82%
rename from data/custodian/BR-MA-XXX-E-UR.yaml
rename to data/custodian/BR-MS-CGR-E-UR.yaml
index 9256de2af5..17ddbff5e9 100644
--- a/data/custodian/BR-MA-XXX-E-UR.yaml
+++ b/data/custodian/BR-MS-CGR-E-UR.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: MATO GROSSO DO SUL
 processing_timestamp: '2025-12-06T23:35:51.878341+00:00'
 ghcid:
-  ghcid_current: BR-MA-XXX-E-UR
+  ghcid_current: BR-MS-CGR-E-UR
   ghcid_original: BR-MA-XXX-E-UR
   ghcid_uuid: 9ae57f42-b4bc-5b98-bbc5-106a1996ea25
   ghcid_uuid_sha256: 8014c8bf-3919-88fc-1ec2-aae6bfa0d2ee
@@ -35,22 +35,35 @@ ghcid:
   record_id: ee83fc1f-e234-4738-9a7a-f812f68745c6
   generation_timestamp: '2025-12-06T23:35:51.878341+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: MA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: MS
+    region_name: Mato Grosso do Sul
+    city_code: CGR
+    city_name: Campo Grande
+    geonames_id: 3467747
+    feature_code: PPLA
+    google_place_id: ChIJgcQcpPnlhpQRoY7t5r5dN48
+    latitude: -20.5044138
+    longitude: -54.614135
+    resolution_date: '2025-12-07T16:38:51.154882+00:00'
   ghcid_history:
   - ghcid: BR-MA-XXX-E-UR
     ghcid_numeric: 9229222260011239676
     valid_from: '2025-12-06T23:35:51.878341+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:51.154882+00:00'
+  - ghcid: BR-MS-CGR-E-UR
+    ghcid_numeric: 9229222260011239676
+    valid_from: '2025-12-07T16:38:51.154882+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Campo Grande (MS)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFMS Repositories
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-MA-XXX-E-UR
+  identifier_value: BR-MS-CGR-E-UR
 - identifier_scheme: GHCID_UUID
   identifier_value: 9ae57f42-b4bc-5b98-bbc5-106a1996ea25
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.878341+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJgcQcpPnlhpQRoY7t5r5dN48
+  formatted_address: Cidade Universitária - Av. Costa e Silva - Pioneiros, Campo Grande
+    - MS, 79070-900, Brazil
+  website: http://www.ufms.br/
+  latitude: -20.5044138
+  longitude: -54.614135
+  enriched_at: '2025-12-07T16:38:51.154882+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-MA-XXX-M-MU-musearufmt.yaml b/data/custodian/BR-MT-CUI-M-MU-musearufmt.yaml
similarity index 82%
rename from data/custodian/BR-MA-XXX-M-MU-musearufmt.yaml
rename to data/custodian/BR-MT-CUI-M-MU-musearufmt.yaml
index 70cb994011..61804dcd5d 100644
--- a/data/custodian/BR-MA-XXX-M-MU-musearufmt.yaml
+++ b/data/custodian/BR-MT-CUI-M-MU-musearufmt.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: MATO GROSSO
 processing_timestamp: '2025-12-06T23:39:01.672213+00:00'
 ghcid:
-  ghcid_current: BR-MA-XXX-M-MU-musearufmt
+  ghcid_current: BR-MT-CUI-M-MU-musearufmt
   ghcid_original: BR-MA-XXX-M-MU-musearufmt
   ghcid_uuid: fbbcf82f-9d4b-5f05-9eb9-b6745af103b1
   ghcid_uuid_sha256: 7d8f048f-ee02-8db6-bce5-32b160522049
@@ -35,22 +35,35 @@ ghcid:
   record_id: d79e2cbc-601e-4dbc-adad-8a17d3c93c7e
   generation_timestamp: '2025-12-06T23:39:01.672213+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: MA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: MT
+    region_name: Mato Grosso
+    city_code: CUI
+    city_name: Cuiaba
+    geonames_id: 3465038
+    feature_code: PPLA
+    google_place_id: ChIJZdtn_tSxnZMRQk3QglT3IA8
+    latitude: -15.6144862
+    longitude: -56.071909399999996
+    resolution_date: '2025-12-07T16:38:51.840786+00:00'
   ghcid_history:
   - ghcid: BR-MA-XXX-M-MU-musearufmt
     ghcid_numeric: 9047455192630582710
     valid_from: '2025-12-06T23:39:01.672213+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:51.840786+00:00'
+  - ghcid: BR-MT-CUI-M-MU-musearufmt
+    ghcid_numeric: 9047455192630582710
+    valid_from: '2025-12-07T16:38:51.840786+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Cuiaba (MT)'
 custodian_name:
   claim_type: custodian_name
   claim_value: MUSEAR/UFMT
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-MA-XXX-M-MU-musearufmt
+  identifier_value: BR-MT-CUI-M-MU-musearufmt
 - identifier_scheme: GHCID_UUID
   identifier_value: fbbcf82f-9d4b-5f05-9eb9-b6745af103b1
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.672213+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJZdtn_tSxnZMRQk3QglT3IA8
+  formatted_address: Av. Fernando Corrêa da Costa, 2367 - UFMT, Cuiabá - MT, 78060-900,
+    Brazil
+  website: https://www.ufmt.br/unidade/musear
+  latitude: -15.6144862
+  longitude: -56.071909399999996
+  enriched_at: '2025-12-07T16:38:51.840786+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-MA-XXX-M-MU.yaml b/data/custodian/BR-MT-CUI-M-MU.yaml
similarity index 82%
rename from data/custodian/BR-MA-XXX-M-MU.yaml
rename to data/custodian/BR-MT-CUI-M-MU.yaml
index 232666d96e..d783da27ea 100644
--- a/data/custodian/BR-MA-XXX-M-MU.yaml
+++ b/data/custodian/BR-MT-CUI-M-MU.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: MATO GROSSO
 processing_timestamp: '2025-12-06T23:35:51.864698+00:00'
 ghcid:
-  ghcid_current: BR-MA-XXX-M-MU
+  ghcid_current: BR-MT-CUI-M-MU
   ghcid_original: BR-MA-XXX-M-MU
   ghcid_uuid: 68df4a37-295a-54e7-8b54-296634961dff
   ghcid_uuid_sha256: bbade1be-8b80-89bd-262d-3e80d08916a1
@@ -35,22 +35,35 @@ ghcid:
   record_id: b0bbedcc-ec0c-4669-ad2a-70e23af45ed2
   generation_timestamp: '2025-12-06T23:35:51.864698+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: MA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: MT
+    region_name: Mato Grosso
+    city_code: CUI
+    city_name: Cuiaba
+    geonames_id: 3465038
+    feature_code: PPLA
+    google_place_id: ChIJZdtn_tSxnZMRQk3QglT3IA8
+    latitude: -15.6144862
+    longitude: -56.071909399999996
+    resolution_date: '2025-12-07T16:38:52.575346+00:00'
   ghcid_history:
   - ghcid: BR-MA-XXX-M-MU
     ghcid_numeric: 13523713464563927485
     valid_from: '2025-12-06T23:35:51.864698+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:52.575346+00:00'
+  - ghcid: BR-MT-CUI-M-MU
+    ghcid_numeric: 13523713464563927485
+    valid_from: '2025-12-07T16:38:52.575346+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Cuiaba (MT)'
 custodian_name:
   claim_type: custodian_name
   claim_value: MUSEAR/UFMT
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-MA-XXX-M-MU
+  identifier_value: BR-MT-CUI-M-MU
 - identifier_scheme: GHCID_UUID
   identifier_value: 68df4a37-295a-54e7-8b54-296634961dff
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.864698+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJZdtn_tSxnZMRQk3QglT3IA8
+  formatted_address: Av. Fernando Corrêa da Costa, 2367 - UFMT, Cuiabá - MT, 78060-900,
+    Brazil
+  website: https://www.ufmt.br/unidade/musear
+  latitude: -15.6144862
+  longitude: -56.071909399999996
+  enriched_at: '2025-12-07T16:38:52.575346+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-PA-XXX-E-UU-ufpbuepb.yaml b/data/custodian/BR-PB-CGR-E-UU-ufpbuepb.yaml
similarity index 82%
rename from data/custodian/BR-PA-XXX-E-UU-ufpbuepb.yaml
rename to data/custodian/BR-PB-CGR-E-UU-ufpbuepb.yaml
index 578a7f1892..ca094e9929 100644
--- a/data/custodian/BR-PA-XXX-E-UU-ufpbuepb.yaml
+++ b/data/custodian/BR-PB-CGR-E-UU-ufpbuepb.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: PARAÍBA
 processing_timestamp: '2025-12-06T23:39:01.703632+00:00'
 ghcid:
-  ghcid_current: BR-PA-XXX-E-UU-ufpbuepb
+  ghcid_current: BR-PB-CGR-E-UU-ufpbuepb
   ghcid_original: BR-PA-XXX-E-UU-ufpbuepb
   ghcid_uuid: d2db7c5a-1d37-56ab-badf-a1b27523c18b
   ghcid_uuid_sha256: 30bd422a-b4fb-8f6c-6481-5e49a043ebeb
@@ -35,22 +35,35 @@ ghcid:
   record_id: 0dcb5530-8247-4e6b-a1e7-1e7e5202ce1e
   generation_timestamp: '2025-12-06T23:39:01.703632+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: PA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: PB
+    region_name: Paraíba
+    city_code: CGR
+    city_name: Campina Grande
+    geonames_id: 3403642
+    feature_code: PPL
+    google_place_id: ChIJzfZ2CFIerAcRhHQxnLSzUeg
+    latitude: -7.2088005
+    longitude: -35.9173583
+    resolution_date: '2025-12-07T16:39:00.137890+00:00'
   ghcid_history:
   - ghcid: BR-PA-XXX-E-UU-ufpbuepb
     ghcid_numeric: 3512036035611299692
     valid_from: '2025-12-06T23:39:01.703632+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:00.137890+00:00'
+  - ghcid: BR-PB-CGR-E-UU-ufpbuepb
+    ghcid_numeric: 3512036035611299692
+    valid_from: '2025-12-07T16:39:00.137890+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Campina Grande (PB)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFPB/UEPB
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-PA-XXX-E-UU-ufpbuepb
+  identifier_value: BR-PB-CGR-E-UU-ufpbuepb
 - identifier_scheme: GHCID_UUID
   identifier_value: d2db7c5a-1d37-56ab-badf-a1b27523c18b
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.703632+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJzfZ2CFIerAcRhHQxnLSzUeg
+  formatted_address: R. Baraúnas, 351 - Universitário, Campina Grande - PB, 58429-500,
+    Brazil
+  website: http://www.uepb.edu.br/
+  latitude: -7.2088005
+  longitude: -35.9173583
+  enriched_at: '2025-12-07T16:39:00.137890+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-PA-XXX-E-UU.yaml b/data/custodian/BR-PB-CGR-E-UU.yaml
similarity index 83%
rename from data/custodian/BR-PA-XXX-E-UU.yaml
rename to data/custodian/BR-PB-CGR-E-UU.yaml
index 808116bd68..1b8a26086d 100644
--- a/data/custodian/BR-PA-XXX-E-UU.yaml
+++ b/data/custodian/BR-PB-CGR-E-UU.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: PARAÍBA
 processing_timestamp: '2025-12-06T23:35:51.904840+00:00'
 ghcid:
-  ghcid_current: BR-PA-XXX-E-UU
+  ghcid_current: BR-PB-CGR-E-UU
   ghcid_original: BR-PA-XXX-E-UU
   ghcid_uuid: d406e043-12de-5e93-8357-3a80cd60c18f
   ghcid_uuid_sha256: 45cd53ce-4082-8943-cded-7cccebdb09c9
@@ -35,22 +35,35 @@ ghcid:
   record_id: 8d77bb77-7bda-4d77-a2cb-316cea765ba0
   generation_timestamp: '2025-12-06T23:35:51.904840+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: PA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: PB
+    region_name: Paraíba
+    city_code: CGR
+    city_name: Campina Grande
+    geonames_id: 3403642
+    feature_code: PPL
+    google_place_id: ChIJzfZ2CFIerAcRhHQxnLSzUeg
+    latitude: -7.2088005
+    longitude: -35.9173583
+    resolution_date: '2025-12-07T16:39:00.885446+00:00'
   ghcid_history:
   - ghcid: BR-PA-XXX-E-UU
     ghcid_numeric: 5029768504153372995
     valid_from: '2025-12-06T23:35:51.904840+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:00.885446+00:00'
+  - ghcid: BR-PB-CGR-E-UU
+    ghcid_numeric: 5029768504153372995
+    valid_from: '2025-12-07T16:39:00.885446+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Campina Grande (PB)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFPB/UEPB
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-PA-XXX-E-UU
+  identifier_value: BR-PB-CGR-E-UU
 - identifier_scheme: GHCID_UUID
   identifier_value: d406e043-12de-5e93-8357-3a80cd60c18f
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.904840+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJzfZ2CFIerAcRhHQxnLSzUeg
+  formatted_address: R. Baraúnas, 351 - Universitário, Campina Grande - PB, 58429-500,
+    Brazil
+  website: http://www.uepb.edu.br/
+  latitude: -7.2088005
+  longitude: -35.9173583
+  enriched_at: '2025-12-07T16:39:00.885446+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-CE-XXX-O-MC.yaml b/data/custodian/BR-PE-FDN-O-MC.yaml
similarity index 84%
rename from data/custodian/BR-CE-XXX-O-MC.yaml
rename to data/custodian/BR-PE-FDN-O-MC.yaml
index 8de1ee7c45..7d6fedd47f 100644
--- a/data/custodian/BR-CE-XXX-O-MC.yaml
+++ b/data/custodian/BR-PE-FDN-O-MC.yaml
@@ -35,7 +35,7 @@ original_entry:
     region: CEARÁ
 processing_timestamp: '2025-12-06T23:35:51.829321+00:00'
 ghcid:
-  ghcid_current: BR-CE-XXX-O-MC
+  ghcid_current: BR-PE-FDN-O-MC
   ghcid_original: BR-CE-XXX-O-MC
   ghcid_uuid: 2b679114-a540-507a-9d11-beb237d292fe
   ghcid_uuid_sha256: 92ffa0ad-8933-8142-69a9-70f6cd45babb
@@ -43,22 +43,36 @@ ghcid:
   record_id: f47959c6-83e9-4b87-b9d2-a3d27b7e44d9
   generation_timestamp: '2025-12-06T23:35:51.829321+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: CE
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: PE
+    region_name: Pernambuco
+    city_code: FDN
+    city_name: Fernando de Noronha (Distrito Estadual)
+    geonames_id: 6317136
+    feature_code: PPL
+    google_place_id: ChIJVYKkOirF5g4R5iduZYRw1a8
+    latitude: 11.8590985
+    longitude: -15.589254199999997
+    resolution_date: '2025-12-07T16:38:44.771316+00:00'
   ghcid_history:
   - ghcid: BR-CE-XXX-O-MC
     ghcid_numeric: 10592361515790348610
     valid_from: '2025-12-06T23:35:51.829321+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:44.771316+00:00'
+  - ghcid: BR-PE-FDN-O-MC
+    ghcid_numeric: 10592361515790348610
+    valid_from: '2025-12-07T16:38:44.771316+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Fernando de Noronha (Distrito
+      Estadual) (PE)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Mapa Cultural
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-CE-XXX-O-MC
+  identifier_value: BR-PE-FDN-O-MC
 - identifier_scheme: GHCID_UUID
   identifier_value: 2b679114-a540-507a-9d11-beb237d292fe
 - identifier_scheme: GHCID_UUID_SHA256
@@ -154,3 +168,11 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q62061995
   wikidata_label_en: Mapa Cultural
+google_maps_enrichment:
+  place_id: ChIJVYKkOirF5g4R5iduZYRw1a8
+  formatted_address: VC56+J7Q, Bissau, Guinea-Bissau
+  website: null
+  latitude: 11.8590985
+  longitude: -15.589254199999997
+  enriched_at: '2025-12-07T16:38:44.771316+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-PE-XXX-X-MI-mepeiahgp.yaml b/data/custodian/BR-PE-REC-X-MI-mepeiahgp.yaml
similarity index 83%
rename from data/custodian/BR-PE-XXX-X-MI-mepeiahgp.yaml
rename to data/custodian/BR-PE-REC-X-MI-mepeiahgp.yaml
index 354f9f8f1c..96072facf4 100644
--- a/data/custodian/BR-PE-XXX-X-MI-mepeiahgp.yaml
+++ b/data/custodian/BR-PE-REC-X-MI-mepeiahgp.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: PERNAMBUCO
 processing_timestamp: '2025-12-06T23:39:01.725295+00:00'
 ghcid:
-  ghcid_current: BR-PE-XXX-X-MI-mepeiahgp
+  ghcid_current: BR-PE-REC-X-MI-mepeiahgp
   ghcid_original: BR-PE-XXX-X-MI-mepeiahgp
   ghcid_uuid: 295ffc07-4dc2-5da9-9d01-d829b187d974
   ghcid_uuid_sha256: 3b2f996c-c46a-8e6c-fb5b-523eca747da0
@@ -35,22 +35,35 @@ ghcid:
   record_id: d8b2321d-0f9e-4a66-bf79-99184622a2ec
   generation_timestamp: '2025-12-06T23:39:01.725295+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: PE
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Pernambuco
+    city_code: REC
+    city_name: Recife
+    geonames_id: 3390760
+    feature_code: PPLA
+    google_place_id: ChIJaYjFp7gYqwcRj9FkRO_TP64
+    latitude: -8.0617688
+    longitude: -34.8843578
+    resolution_date: '2025-12-07T16:39:01.596066+00:00'
   ghcid_history:
   - ghcid: BR-PE-XXX-X-MI-mepeiahgp
     ghcid_numeric: 4264796064574004844
     valid_from: '2025-12-06T23:39:01.725295+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:01.596066+00:00'
+  - ghcid: BR-PE-REC-X-MI-mepeiahgp
+    ghcid_numeric: 4264796064574004844
+    valid_from: '2025-12-07T16:39:01.596066+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Recife (PE)'
 custodian_name:
   claim_type: custodian_name
   claim_value: MEPE/IAHGP
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-PE-XXX-X-MI-mepeiahgp
+  identifier_value: BR-PE-REC-X-MI-mepeiahgp
 - identifier_scheme: GHCID_UUID
   identifier_value: 295ffc07-4dc2-5da9-9d01-d829b187d974
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.725295+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJaYjFp7gYqwcRj9FkRO_TP64
+  formatted_address: R. do Hospício, 130 - Boa Vista, Recife - PE, 50060-080, Brazil
+  website: https://arqueologico.com.br/
+  latitude: -8.0617688
+  longitude: -34.8843578
+  enriched_at: '2025-12-07T16:39:01.596066+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-PE-XXX-X-MI.yaml b/data/custodian/BR-PE-REC-X-MI.yaml
similarity index 83%
rename from data/custodian/BR-PE-XXX-X-MI.yaml
rename to data/custodian/BR-PE-REC-X-MI.yaml
index 309244cb03..2db8e803e9 100644
--- a/data/custodian/BR-PE-XXX-X-MI.yaml
+++ b/data/custodian/BR-PE-REC-X-MI.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: PERNAMBUCO
 processing_timestamp: '2025-12-06T23:35:51.932650+00:00'
 ghcid:
-  ghcid_current: BR-PE-XXX-X-MI
+  ghcid_current: BR-PE-REC-X-MI
   ghcid_original: BR-PE-XXX-X-MI
   ghcid_uuid: 492bd50e-3d7d-550c-8ebc-b1c4ca12f382
   ghcid_uuid_sha256: 082a6408-d4bc-8500-1d64-595cd1c63f0f
@@ -35,22 +35,35 @@ ghcid:
   record_id: 2653d8d6-8b51-4b06-9e01-d1fdc86c0a15
   generation_timestamp: '2025-12-06T23:35:51.932650+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: PE
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Pernambuco
+    city_code: REC
+    city_name: Recife
+    geonames_id: 3390760
+    feature_code: PPLA
+    google_place_id: ChIJaYjFp7gYqwcRj9FkRO_TP64
+    latitude: -8.0617688
+    longitude: -34.8843578
+    resolution_date: '2025-12-07T16:39:02.261690+00:00'
   ghcid_history:
   - ghcid: BR-PE-XXX-X-MI
     ghcid_numeric: 588392690416940288
     valid_from: '2025-12-06T23:35:51.932650+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:02.261690+00:00'
+  - ghcid: BR-PE-REC-X-MI
+    ghcid_numeric: 588392690416940288
+    valid_from: '2025-12-07T16:39:02.261690+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Recife (PE)'
 custodian_name:
   claim_type: custodian_name
   claim_value: MEPE/IAHGP
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-PE-XXX-X-MI
+  identifier_value: BR-PE-REC-X-MI
 - identifier_scheme: GHCID_UUID
   identifier_value: 492bd50e-3d7d-550c-8ebc-b1c4ca12f382
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.932650+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJaYjFp7gYqwcRj9FkRO_TP64
+  formatted_address: R. do Hospício, 130 - Boa Vista, Recife - PE, 50060-080, Brazil
+  website: https://arqueologico.com.br/
+  latitude: -8.0617688
+  longitude: -34.8843578
+  enriched_at: '2025-12-07T16:39:02.261690+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-PI-XXX-X-F-fumdham.yaml b/data/custodian/BR-PI-SRN-X-F-fumdham.yaml
similarity index 82%
rename from data/custodian/BR-PI-XXX-X-F-fumdham.yaml
rename to data/custodian/BR-PI-SRN-X-F-fumdham.yaml
index 2bb18ea056..958ca29e2a 100644
--- a/data/custodian/BR-PI-XXX-X-F-fumdham.yaml
+++ b/data/custodian/BR-PI-SRN-X-F-fumdham.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: PIAUÍ
 processing_timestamp: '2025-12-06T23:39:01.727742+00:00'
 ghcid:
-  ghcid_current: BR-PI-XXX-X-F-fumdham
+  ghcid_current: BR-PI-SRN-X-F-fumdham
   ghcid_original: BR-PI-XXX-X-F-fumdham
   ghcid_uuid: 29b8bf67-84aa-587c-a67d-3a18e3473687
   ghcid_uuid_sha256: c8c0d594-1748-8361-458d-b84c3163dcde
@@ -35,22 +35,35 @@ ghcid:
   record_id: d6e3e6cf-f4d5-4edd-a36a-2b7cfe8558b6
   generation_timestamp: '2025-12-06T23:39:01.727742+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: PI
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Piauí
+    city_code: SRN
+    city_name: Sao Raimundo Nonato
+    geonames_id: 3388145
+    feature_code: PPL
+    google_place_id: ChIJI-bJ_dYEegcRB11GZBshZfA
+    latitude: -9.0326352
+    longitude: -42.7009498
+    resolution_date: '2025-12-07T16:39:02.998541+00:00'
   ghcid_history:
   - ghcid: BR-PI-XXX-X-F-fumdham
     ghcid_numeric: 14465796835136545633
     valid_from: '2025-12-06T23:39:01.727742+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:02.998541+00:00'
+  - ghcid: BR-PI-SRN-X-F-fumdham
+    ghcid_numeric: 14465796835136545633
+    valid_from: '2025-12-07T16:39:02.998541+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Sao Raimundo Nonato (PI)'
 custodian_name:
   claim_type: custodian_name
   claim_value: FUMDHAM
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-PI-XXX-X-F-fumdham
+  identifier_value: BR-PI-SRN-X-F-fumdham
 - identifier_scheme: GHCID_UUID
   identifier_value: 29b8bf67-84aa-587c-a67d-3a18e3473687
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.727742+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJI-bJ_dYEegcRB11GZBshZfA
+  formatted_address: R. João Ferreira dos Santos, São Raimundo Nonato - PI, 64770-000,
+    Brazil
+  website: http://fumdham.org.br/museus/
+  latitude: -9.0326352
+  longitude: -42.7009498
+  enriched_at: '2025-12-07T16:39:02.998541+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-PI-XXX-X-F.yaml b/data/custodian/BR-PI-SRN-X-F.yaml
similarity index 83%
rename from data/custodian/BR-PI-XXX-X-F.yaml
rename to data/custodian/BR-PI-SRN-X-F.yaml
index a7247a0791..1cc7d4a423 100644
--- a/data/custodian/BR-PI-XXX-X-F.yaml
+++ b/data/custodian/BR-PI-SRN-X-F.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: PIAUÍ
 processing_timestamp: '2025-12-06T23:35:51.935188+00:00'
 ghcid:
-  ghcid_current: BR-PI-XXX-X-F
+  ghcid_current: BR-PI-SRN-X-F
   ghcid_original: BR-PI-XXX-X-F
   ghcid_uuid: e1f4ee6e-4673-5269-941d-21096815464d
   ghcid_uuid_sha256: f5d8d836-3ed1-8b25-1f22-d7ce5a860294
@@ -35,22 +35,35 @@ ghcid:
   record_id: 616946ee-3d27-48be-9e77-a65c82b1e145
   generation_timestamp: '2025-12-06T23:35:51.935188+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: PI
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Piauí
+    city_code: SRN
+    city_name: Sao Raimundo Nonato
+    geonames_id: 3388145
+    feature_code: PPL
+    google_place_id: ChIJI-bJ_dYEegcRB11GZBshZfA
+    latitude: -9.0326352
+    longitude: -42.7009498
+    resolution_date: '2025-12-07T16:39:03.667237+00:00'
   ghcid_history:
   - ghcid: BR-PI-XXX-X-F
     ghcid_numeric: 17715146861755583269
     valid_from: '2025-12-06T23:35:51.935188+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:03.667237+00:00'
+  - ghcid: BR-PI-SRN-X-F
+    ghcid_numeric: 17715146861755583269
+    valid_from: '2025-12-07T16:39:03.667237+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Sao Raimundo Nonato (PI)'
 custodian_name:
   claim_type: custodian_name
   claim_value: FUMDHAM
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-PI-XXX-X-F
+  identifier_value: BR-PI-SRN-X-F
 - identifier_scheme: GHCID_UUID
   identifier_value: e1f4ee6e-4673-5269-941d-21096815464d
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.935188+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJI-bJ_dYEegcRB11GZBshZfA
+  formatted_address: R. João Ferreira dos Santos, São Raimundo Nonato - PI, 64770-000,
+    Brazil
+  website: http://fumdham.org.br/museus/
+  latitude: -9.0326352
+  longitude: -42.7009498
+  enriched_at: '2025-12-07T16:39:03.667237+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-RI-XXX-M-MM-marmam.yaml b/data/custodian/BR-RJ-CEN-M-MM-marmam.yaml
similarity index 82%
rename from data/custodian/BR-RI-XXX-M-MM-marmam.yaml
rename to data/custodian/BR-RJ-CEN-M-MM-marmam.yaml
index 94e864bfcb..99c5a4124c 100644
--- a/data/custodian/BR-RI-XXX-M-MM-marmam.yaml
+++ b/data/custodian/BR-RJ-CEN-M-MM-marmam.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: RIO DE JANEIRO
 processing_timestamp: '2025-12-06T23:39:01.735479+00:00'
 ghcid:
-  ghcid_current: BR-RI-XXX-M-MM-marmam
+  ghcid_current: BR-RJ-CEN-M-MM-marmam
   ghcid_original: BR-RI-XXX-M-MM-marmam
   ghcid_uuid: c8817d62-486a-5c7d-887a-7fd232434266
   ghcid_uuid_sha256: c4e8de18-f88f-860e-b203-84b5725a4803
@@ -35,22 +35,35 @@ ghcid:
   record_id: 63e1195c-9b33-4033-9c9d-ba651c767409
   generation_timestamp: '2025-12-06T23:39:01.735479+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: RI
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: RJ
+    region_name: Rio de Janeiro
+    city_code: CEN
+    city_name: Centro
+    geonames_id: 8534637
+    feature_code: PPL
+    google_place_id: ChIJUSgMNtmBmQARXIhu6uypMK4
+    latitude: -22.9137527
+    longitude: -43.171799299999996
+    resolution_date: '2025-12-07T16:39:05.894850+00:00'
   ghcid_history:
   - ghcid: BR-RI-XXX-M-MM-marmam
     ghcid_numeric: 14188834824861451790
     valid_from: '2025-12-06T23:39:01.735479+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:05.894850+00:00'
+  - ghcid: BR-RJ-CEN-M-MM-marmam
+    ghcid_numeric: 14188834824861451790
+    valid_from: '2025-12-07T16:39:05.894850+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Centro (RJ)'
 custodian_name:
   claim_type: custodian_name
   claim_value: MAR/MAM
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-RI-XXX-M-MM-marmam
+  identifier_value: BR-RJ-CEN-M-MM-marmam
 - identifier_scheme: GHCID_UUID
   identifier_value: c8817d62-486a-5c7d-887a-7fd232434266
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.735479+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJUSgMNtmBmQARXIhu6uypMK4
+  formatted_address: Av. Infante Dom Henrique, 85 - Parque do Flamengo, Rio de Janeiro
+    - RJ, 20021-140, Brazil
+  website: http://www.mam.rio/
+  latitude: -22.9137527
+  longitude: -43.171799299999996
+  enriched_at: '2025-12-07T16:39:05.894850+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-RI-XXX-M-MM.yaml b/data/custodian/BR-RJ-CEN-M-MM.yaml
similarity index 82%
rename from data/custodian/BR-RI-XXX-M-MM.yaml
rename to data/custodian/BR-RJ-CEN-M-MM.yaml
index fb5841fb8b..379c6be1ef 100644
--- a/data/custodian/BR-RI-XXX-M-MM.yaml
+++ b/data/custodian/BR-RJ-CEN-M-MM.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: RIO DE JANEIRO
 processing_timestamp: '2025-12-06T23:35:51.949362+00:00'
 ghcid:
-  ghcid_current: BR-RI-XXX-M-MM
+  ghcid_current: BR-RJ-CEN-M-MM
   ghcid_original: BR-RI-XXX-M-MM
   ghcid_uuid: a8ab5eef-268f-54c1-90fb-9b43b1a9cb5e
   ghcid_uuid_sha256: feb25368-f710-81bc-5fcd-b64162e85c57
@@ -35,22 +35,35 @@ ghcid:
   record_id: 713077dd-5887-48d7-a6ec-b004bfb6ce1b
   generation_timestamp: '2025-12-06T23:35:51.949362+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: RI
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: RJ
+    region_name: Rio de Janeiro
+    city_code: CEN
+    city_name: Centro
+    geonames_id: 8534637
+    feature_code: PPL
+    google_place_id: ChIJUSgMNtmBmQARXIhu6uypMK4
+    latitude: -22.9137527
+    longitude: -43.171799299999996
+    resolution_date: '2025-12-07T16:39:06.540562+00:00'
   ghcid_history:
   - ghcid: BR-RI-XXX-M-MM
     ghcid_numeric: 18352823141774967228
     valid_from: '2025-12-06T23:35:51.949362+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:06.540562+00:00'
+  - ghcid: BR-RJ-CEN-M-MM
+    ghcid_numeric: 18352823141774967228
+    valid_from: '2025-12-07T16:39:06.540562+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Centro (RJ)'
 custodian_name:
   claim_type: custodian_name
   claim_value: MAR/MAM
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-RI-XXX-M-MM
+  identifier_value: BR-RJ-CEN-M-MM
 - identifier_scheme: GHCID_UUID
   identifier_value: a8ab5eef-268f-54c1-90fb-9b43b1a9cb5e
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.949362+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJUSgMNtmBmQARXIhu6uypMK4
+  formatted_address: Av. Infante Dom Henrique, 85 - Parque do Flamengo, Rio de Janeiro
+    - RJ, 20021-140, Brazil
+  website: http://www.mam.rio/
+  latitude: -22.9137527
+  longitude: -43.171799299999996
+  enriched_at: '2025-12-07T16:39:06.540562+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-TO-XXX-X-HD-hemeroteca_digital.yaml b/data/custodian/BR-RJ-CEN-X-HD-hemeroteca_digital.yaml
similarity index 82%
rename from data/custodian/BR-TO-XXX-X-HD-hemeroteca_digital.yaml
rename to data/custodian/BR-RJ-CEN-X-HD-hemeroteca_digital.yaml
index 845885d161..73e47908a9 100644
--- a/data/custodian/BR-TO-XXX-X-HD-hemeroteca_digital.yaml
+++ b/data/custodian/BR-RJ-CEN-X-HD-hemeroteca_digital.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: TOCANTINS
 processing_timestamp: '2025-12-06T23:39:01.777539+00:00'
 ghcid:
-  ghcid_current: BR-TO-XXX-X-HD-hemeroteca_digital
+  ghcid_current: BR-RJ-CEN-X-HD-hemeroteca_digital
   ghcid_original: BR-TO-XXX-X-HD-hemeroteca_digital
   ghcid_uuid: acb30794-3c8e-5026-bbb1-ef4ccaaa3a9c
   ghcid_uuid_sha256: 931c02a5-7b95-8f4f-36e4-f52b1b77d562
@@ -35,22 +35,35 @@ ghcid:
   record_id: 4851a7ba-74a4-4693-8a1a-a2626ce680f5
   generation_timestamp: '2025-12-06T23:39:01.777539+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: TO
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: RJ
+    region_name: Rio de Janeiro
+    city_code: CEN
+    city_name: Centro
+    geonames_id: 8534637
+    feature_code: PPL
+    google_place_id: ChIJ0QTJyWF_mQAR4t3oNko2kQo
+    latitude: -22.9096965
+    longitude: -43.1755177
+    resolution_date: '2025-12-07T16:39:18.685576+00:00'
   ghcid_history:
   - ghcid: BR-TO-XXX-X-HD-hemeroteca_digital
     ghcid_numeric: 10600350532689567567
     valid_from: '2025-12-06T23:39:01.777539+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:18.685576+00:00'
+  - ghcid: BR-RJ-CEN-X-HD-hemeroteca_digital
+    ghcid_numeric: 10600350532689567567
+    valid_from: '2025-12-07T16:39:18.685576+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Centro (RJ)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Hemeroteca Digital
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-TO-XXX-X-HD-hemeroteca_digital
+  identifier_value: BR-RJ-CEN-X-HD-hemeroteca_digital
 - identifier_scheme: GHCID_UUID
   identifier_value: acb30794-3c8e-5026-bbb1-ef4ccaaa3a9c
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.777539+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ0QTJyWF_mQAR4t3oNko2kQo
+  formatted_address: Av. Rio Branco, 219 - Centro, Rio de Janeiro - RJ, 20040-008,
+    Brazil
+  website: https://www.gov.br/bn/pt-br
+  latitude: -22.9096965
+  longitude: -43.1755177
+  enriched_at: '2025-12-07T16:39:18.685576+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-TO-XXX-X-HD.yaml b/data/custodian/BR-RJ-CEN-X-HD.yaml
similarity index 83%
rename from data/custodian/BR-TO-XXX-X-HD.yaml
rename to data/custodian/BR-RJ-CEN-X-HD.yaml
index 755012f432..27ee67375f 100644
--- a/data/custodian/BR-TO-XXX-X-HD.yaml
+++ b/data/custodian/BR-RJ-CEN-X-HD.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: TOCANTINS
 processing_timestamp: '2025-12-06T23:35:52.021055+00:00'
 ghcid:
-  ghcid_current: BR-TO-XXX-X-HD
+  ghcid_current: BR-RJ-CEN-X-HD
   ghcid_original: BR-TO-XXX-X-HD
   ghcid_uuid: 3b9f2e77-b48d-5156-9f01-b8952fda4592
   ghcid_uuid_sha256: acb0f410-2405-81f5-c07d-0a37ed342122
@@ -35,22 +35,35 @@ ghcid:
   record_id: 4d504d07-8d74-4d6d-9565-9ed109c415fe
   generation_timestamp: '2025-12-06T23:35:52.021055+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: TO
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: RJ
+    region_name: Rio de Janeiro
+    city_code: CEN
+    city_name: Centro
+    geonames_id: 8534637
+    feature_code: PPL
+    google_place_id: ChIJ0QTJyWF_mQAR4t3oNko2kQo
+    latitude: -22.9096965
+    longitude: -43.1755177
+    resolution_date: '2025-12-07T16:39:19.436383+00:00'
   ghcid_history:
   - ghcid: BR-TO-XXX-X-HD
     ghcid_numeric: 12443714120585679349
     valid_from: '2025-12-06T23:35:52.021055+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:19.436383+00:00'
+  - ghcid: BR-RJ-CEN-X-HD
+    ghcid_numeric: 12443714120585679349
+    valid_from: '2025-12-07T16:39:19.436383+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Centro (RJ)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Hemeroteca Digital
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-TO-XXX-X-HD
+  identifier_value: BR-RJ-CEN-X-HD
 - identifier_scheme: GHCID_UUID
   identifier_value: 3b9f2e77-b48d-5156-9f01-b8952fda4592
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:52.021055+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ0QTJyWF_mQAR4t3oNko2kQo
+  formatted_address: Av. Rio Branco, 219 - Centro, Rio de Janeiro - RJ, 20040-008,
+    Brazil
+  website: https://www.gov.br/bn/pt-br
+  latitude: -22.9096965
+  longitude: -43.1755177
+  enriched_at: '2025-12-07T16:39:19.436383+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-PA-XXX-A-DA-deap_archives.yaml b/data/custodian/BR-RJ-RDJ-A-DA-deap_archives.yaml
similarity index 82%
rename from data/custodian/BR-PA-XXX-A-DA-deap_archives.yaml
rename to data/custodian/BR-RJ-RDJ-A-DA-deap_archives.yaml
index 0ed3ebbfd0..8e58792a65 100644
--- a/data/custodian/BR-PA-XXX-A-DA-deap_archives.yaml
+++ b/data/custodian/BR-RJ-RDJ-A-DA-deap_archives.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: PARANÁ
 processing_timestamp: '2025-12-06T23:39:01.708973+00:00'
 ghcid:
-  ghcid_current: BR-PA-XXX-A-DA-deap_archives
+  ghcid_current: BR-RJ-RDJ-A-DA-deap_archives
   ghcid_original: BR-PA-XXX-A-DA-deap_archives
   ghcid_uuid: d3542b1f-1899-5211-8ef3-e47606a7c5db
   ghcid_uuid_sha256: c8cf24d5-b7db-8495-429d-b7b508c75d03
@@ -35,22 +35,35 @@ ghcid:
   record_id: 93d28bd6-0570-4f81-8b51-d695c0e3646b
   generation_timestamp: '2025-12-06T23:39:01.708973+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: PA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: RJ
+    region_name: Rio de Janeiro
+    city_code: RDJ
+    city_name: Rio de Janeiro
+    geonames_id: 3451190
+    feature_code: PPLA
+    google_place_id: ChIJe9cDTGp_mQARQb9bmMSDOiA
+    latitude: -22.9064403
+    longitude: -43.1906794
+    resolution_date: '2025-12-07T16:38:58.777124+00:00'
   ghcid_history:
   - ghcid: BR-PA-XXX-A-DA-deap_archives
     ghcid_numeric: 14469824628095935637
     valid_from: '2025-12-06T23:39:01.708973+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:58.777124+00:00'
+  - ghcid: BR-RJ-RDJ-A-DA-deap_archives
+    ghcid_numeric: 14469824628095935637
+    valid_from: '2025-12-07T16:38:58.777124+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Rio de Janeiro (RJ)'
 custodian_name:
   claim_type: custodian_name
   claim_value: DEAP Archives
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-PA-XXX-A-DA-deap_archives
+  identifier_value: BR-RJ-RDJ-A-DA-deap_archives
 - identifier_scheme: GHCID_UUID
   identifier_value: d3542b1f-1899-5211-8ef3-e47606a7c5db
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.708973+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJe9cDTGp_mQARQb9bmMSDOiA
+  formatted_address: Praça da República, 173 - Centro, Rio de Janeiro - RJ, 20211-350,
+    Brazil
+  website: http://www.arquivonacional.gov.br/
+  latitude: -22.9064403
+  longitude: -43.1906794
+  enriched_at: '2025-12-07T16:38:58.777124+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-PA-XXX-A-DA.yaml b/data/custodian/BR-RJ-RDJ-A-DA.yaml
similarity index 82%
rename from data/custodian/BR-PA-XXX-A-DA.yaml
rename to data/custodian/BR-RJ-RDJ-A-DA.yaml
index 9cf82a5dec..6fa04e80c2 100644
--- a/data/custodian/BR-PA-XXX-A-DA.yaml
+++ b/data/custodian/BR-RJ-RDJ-A-DA.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: PARANÁ
 processing_timestamp: '2025-12-06T23:35:51.916058+00:00'
 ghcid:
-  ghcid_current: BR-PA-XXX-A-DA
+  ghcid_current: BR-RJ-RDJ-A-DA
   ghcid_original: BR-PA-XXX-A-DA
   ghcid_uuid: 3dbd121f-cdcb-5f32-8275-3f16b209b9c5
   ghcid_uuid_sha256: 3da08d63-3f32-8063-e54c-a0205fb7ea93
@@ -35,22 +35,35 @@ ghcid:
   record_id: 9ddcb377-4205-4d54-86bb-a25c9f4fe51a
   generation_timestamp: '2025-12-06T23:35:51.916058+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: PA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: RJ
+    region_name: Rio de Janeiro
+    city_code: RDJ
+    city_name: Rio de Janeiro
+    geonames_id: 3451190
+    feature_code: PPLA
+    google_place_id: ChIJe9cDTGp_mQARQb9bmMSDOiA
+    latitude: -22.9064403
+    longitude: -43.1906794
+    resolution_date: '2025-12-07T16:38:59.424564+00:00'
   ghcid_history:
   - ghcid: BR-PA-XXX-A-DA
     ghcid_numeric: 4440704689988849763
     valid_from: '2025-12-06T23:35:51.916058+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:59.424564+00:00'
+  - ghcid: BR-RJ-RDJ-A-DA
+    ghcid_numeric: 4440704689988849763
+    valid_from: '2025-12-07T16:38:59.424564+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Rio de Janeiro (RJ)'
 custodian_name:
   claim_type: custodian_name
   claim_value: DEAP Archives
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-PA-XXX-A-DA
+  identifier_value: BR-RJ-RDJ-A-DA
 - identifier_scheme: GHCID_UUID
   identifier_value: 3dbd121f-cdcb-5f32-8275-3f16b209b9c5
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.916058+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJe9cDTGp_mQARQb9bmMSDOiA
+  formatted_address: Praça da República, 173 - Centro, Rio de Janeiro - RJ, 20211-350,
+    Brazil
+  website: http://www.arquivonacional.gov.br/
+  latitude: -22.9064403
+  longitude: -43.1906794
+  enriched_at: '2025-12-07T16:38:59.424564+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-ES-XXX-A-SA.yaml b/data/custodian/BR-RJ-RDJ-A-SA.yaml
similarity index 84%
rename from data/custodian/BR-ES-XXX-A-SA.yaml
rename to data/custodian/BR-RJ-RDJ-A-SA.yaml
index d9ee722236..4f25731f05 100644
--- a/data/custodian/BR-ES-XXX-A-SA.yaml
+++ b/data/custodian/BR-RJ-RDJ-A-SA.yaml
@@ -31,7 +31,7 @@ original_entry:
     region: ESPÍRITO SANTO
 processing_timestamp: '2025-12-06T23:35:51.845871+00:00'
 ghcid:
-  ghcid_current: BR-ES-XXX-A-SA
+  ghcid_current: BR-RJ-RDJ-A-SA
   ghcid_original: BR-ES-XXX-A-SA
   ghcid_uuid: 084c4d1a-bc71-59e6-a255-7632566e3935
   ghcid_uuid_sha256: e5a47e0b-2c92-8757-5ca7-2b5cc7074d04
@@ -39,22 +39,35 @@ ghcid:
   record_id: 0195e199-b2af-49f1-9f4b-8872939b11be
   generation_timestamp: '2025-12-06T23:35:51.845871+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: ES
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: RJ
+    region_name: Rio de Janeiro
+    city_code: RDJ
+    city_name: Rio de Janeiro
+    geonames_id: 3451190
+    feature_code: PPLA
+    google_place_id: ChIJe9cDTGp_mQARQb9bmMSDOiA
+    latitude: -22.9064403
+    longitude: -43.1906794
+    resolution_date: '2025-12-07T16:38:45.531544+00:00'
   ghcid_history:
   - ghcid: BR-ES-XXX-A-SA
     ghcid_numeric: 16547489517323601751
     valid_from: '2025-12-06T23:35:51.845871+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:45.531544+00:00'
+  - ghcid: BR-RJ-RDJ-A-SA
+    ghcid_numeric: 16547489517323601751
+    valid_from: '2025-12-07T16:38:45.531544+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Rio de Janeiro (RJ)'
 custodian_name:
   claim_type: custodian_name
   claim_value: State Archives
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-ES-XXX-A-SA
+  identifier_value: BR-RJ-RDJ-A-SA
 - identifier_scheme: GHCID_UUID
   identifier_value: 084c4d1a-bc71-59e6-a255-7632566e3935
 - identifier_scheme: GHCID_UUID_SHA256
@@ -149,3 +162,12 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q28028108
   wikidata_label_en: State Archives
+google_maps_enrichment:
+  place_id: ChIJe9cDTGp_mQARQb9bmMSDOiA
+  formatted_address: Praça da República, 173 - Centro, Rio de Janeiro - RJ, 20211-350,
+    Brazil
+  website: http://www.arquivonacional.gov.br/
+  latitude: -22.9064403
+  longitude: -43.1906794
+  enriched_at: '2025-12-07T16:38:45.531544+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-RO-XXX-X-II-instituto_insikiran.yaml b/data/custodian/BR-RR-REC-X-II-instituto_insikiran.yaml
similarity index 82%
rename from data/custodian/BR-RO-XXX-X-II-instituto_insikiran.yaml
rename to data/custodian/BR-RR-REC-X-II-instituto_insikiran.yaml
index 65481f11ee..98eb9b9bc2 100644
--- a/data/custodian/BR-RO-XXX-X-II-instituto_insikiran.yaml
+++ b/data/custodian/BR-RR-REC-X-II-instituto_insikiran.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: RORAIMA
 processing_timestamp: '2025-12-06T23:39:01.748897+00:00'
 ghcid:
-  ghcid_current: BR-RO-XXX-X-II-instituto_insikiran
+  ghcid_current: BR-RR-REC-X-II-instituto_insikiran
   ghcid_original: BR-RO-XXX-X-II-instituto_insikiran
   ghcid_uuid: b25f23ef-4596-5ec0-86fe-ce02e3b0d5af
   ghcid_uuid_sha256: 5ccd54ec-32d6-89a7-3612-b90ef57af207
@@ -35,22 +35,35 @@ ghcid:
   record_id: 3c9e04c1-09e3-4307-b91b-e95a4cdfa266
   generation_timestamp: '2025-12-06T23:39:01.748897+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: RO
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: RR
+    region_name: Roraima
+    city_code: REC
+    city_name: Recreio
+    geonames_id: 3662614
+    feature_code: PPL
+    google_place_id: ChIJ1Ts8LwAFk40Ryot0YCVV-k4
+    latitude: 2.8309322999999997
+    longitude: -60.6981432
+    resolution_date: '2025-12-07T16:39:08.705783+00:00'
   ghcid_history:
   - ghcid: BR-RO-XXX-X-II-instituto_insikiran
     ghcid_numeric: 6687094395156969895
     valid_from: '2025-12-06T23:39:01.748897+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:08.705783+00:00'
+  - ghcid: BR-RR-REC-X-II-instituto_insikiran
+    ghcid_numeric: 6687094395156969895
+    valid_from: '2025-12-07T16:39:08.705783+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Recreio (RR)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Instituto Insikiran
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-RO-XXX-X-II-instituto_insikiran
+  identifier_value: BR-RR-REC-X-II-instituto_insikiran
 - identifier_scheme: GHCID_UUID
   identifier_value: b25f23ef-4596-5ec0-86fe-ce02e3b0d5af
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.748897+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ1Ts8LwAFk40Ryot0YCVV-k4
+  formatted_address: Av. Nova Iorque - Aeroporto, Boa Vista - RR, 69310-010, Brazil
+  website: null
+  latitude: 2.8309322999999997
+  longitude: -60.6981432
+  enriched_at: '2025-12-07T16:39:08.705783+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-RO-XXX-X-II.yaml b/data/custodian/BR-RR-REC-X-II.yaml
similarity index 83%
rename from data/custodian/BR-RO-XXX-X-II.yaml
rename to data/custodian/BR-RR-REC-X-II.yaml
index d88374bd33..42e3b880f7 100644
--- a/data/custodian/BR-RO-XXX-X-II.yaml
+++ b/data/custodian/BR-RR-REC-X-II.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: RORAIMA
 processing_timestamp: '2025-12-06T23:35:51.980508+00:00'
 ghcid:
-  ghcid_current: BR-RO-XXX-X-II
+  ghcid_current: BR-RR-REC-X-II
   ghcid_original: BR-RO-XXX-X-II
   ghcid_uuid: 3a0a1d24-e125-565f-bccb-1d234a93f364
   ghcid_uuid_sha256: 9017cf3e-b27c-8e1e-b82b-da8c8bfeb95c
@@ -35,22 +35,35 @@ ghcid:
   record_id: d456527e-60dd-4303-bd86-e5169a393cc4
   generation_timestamp: '2025-12-06T23:35:51.980508+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: RO
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: RR
+    region_name: Roraima
+    city_code: REC
+    city_name: Recreio
+    geonames_id: 3662614
+    feature_code: PPL
+    google_place_id: ChIJ1Ts8LwAFk40Ryot0YCVV-k4
+    latitude: 2.8309322999999997
+    longitude: -60.6981432
+    resolution_date: '2025-12-07T16:39:09.345591+00:00'
   ghcid_history:
   - ghcid: BR-RO-XXX-X-II
     ghcid_numeric: 10382995334115393054
     valid_from: '2025-12-06T23:35:51.980508+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:09.345591+00:00'
+  - ghcid: BR-RR-REC-X-II
+    ghcid_numeric: 10382995334115393054
+    valid_from: '2025-12-07T16:39:09.345591+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Recreio (RR)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Instituto Insikiran
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-RO-XXX-X-II
+  identifier_value: BR-RR-REC-X-II
 - identifier_scheme: GHCID_UUID
   identifier_value: 3a0a1d24-e125-565f-bccb-1d234a93f364
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.980508+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ1Ts8LwAFk40Ryot0YCVV-k4
+  formatted_address: Av. Nova Iorque - Aeroporto, Boa Vista - RR, 69310-010, Brazil
+  website: null
+  latitude: 2.8309322999999997
+  longitude: -60.6981432
+  enriched_at: '2025-12-07T16:39:09.345591+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-RI-XXX-E-UL-ufrgs_lume.yaml b/data/custodian/BR-RS-PAL-E-UL-ufrgs_lume.yaml
similarity index 82%
rename from data/custodian/BR-RI-XXX-E-UL-ufrgs_lume.yaml
rename to data/custodian/BR-RS-PAL-E-UL-ufrgs_lume.yaml
index a24f63bd02..0bebc57d46 100644
--- a/data/custodian/BR-RI-XXX-E-UL-ufrgs_lume.yaml
+++ b/data/custodian/BR-RS-PAL-E-UL-ufrgs_lume.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: RIO GRANDE DO SUL
 processing_timestamp: '2025-12-06T23:39:01.746367+00:00'
 ghcid:
-  ghcid_current: BR-RI-XXX-E-UL-ufrgs_lume
+  ghcid_current: BR-RS-PAL-E-UL-ufrgs_lume
   ghcid_original: BR-RI-XXX-E-UL-ufrgs_lume
   ghcid_uuid: 85a25bd7-b950-5daa-96c1-a3e437928810
   ghcid_uuid_sha256: 9ae95dc1-8d26-8771-643a-f41495ad113a
@@ -35,22 +35,35 @@ ghcid:
   record_id: 6c345459-d370-4bc2-810d-835debed3520
   generation_timestamp: '2025-12-06T23:39:01.746367+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: RI
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: RS
+    region_name: Rio Grande do Sul
+    city_code: PAL
+    city_name: Porto Alegre
+    geonames_id: 3452925
+    feature_code: PPLA
+    google_place_id: ChIJbQa2l7CdGZUROZuAToe1Y-c
+    latitude: -30.0409398
+    longitude: -51.20605930000001
+    resolution_date: '2025-12-07T16:39:04.426620+00:00'
   ghcid_history:
   - ghcid: BR-RI-XXX-E-UL-ufrgs_lume
     ghcid_numeric: 11162556237292636017
     valid_from: '2025-12-06T23:39:01.746367+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:04.426620+00:00'
+  - ghcid: BR-RS-PAL-E-UL-ufrgs_lume
+    ghcid_numeric: 11162556237292636017
+    valid_from: '2025-12-07T16:39:04.426620+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Porto Alegre (RS)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFRGS LUME
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-RI-XXX-E-UL-ufrgs_lume
+  identifier_value: BR-RS-PAL-E-UL-ufrgs_lume
 - identifier_scheme: GHCID_UUID
   identifier_value: 85a25bd7-b950-5daa-96c1-a3e437928810
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.746367+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJbQa2l7CdGZUROZuAToe1Y-c
+  formatted_address: R. Ramiro Barcelos, 2574 - Floresta, Porto Alegre - RS, 90035-002,
+    Brazil
+  website: http://lume.ufrgs.br/
+  latitude: -30.0409398
+  longitude: -51.20605930000001
+  enriched_at: '2025-12-07T16:39:04.426620+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-RI-XXX-E-UL.yaml b/data/custodian/BR-RS-PAL-E-UL.yaml
similarity index 82%
rename from data/custodian/BR-RI-XXX-E-UL.yaml
rename to data/custodian/BR-RS-PAL-E-UL.yaml
index f4086cca0c..decf1e6026 100644
--- a/data/custodian/BR-RI-XXX-E-UL.yaml
+++ b/data/custodian/BR-RS-PAL-E-UL.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: RIO GRANDE DO SUL
 processing_timestamp: '2025-12-06T23:35:51.968739+00:00'
 ghcid:
-  ghcid_current: BR-RI-XXX-E-UL
+  ghcid_current: BR-RS-PAL-E-UL
   ghcid_original: BR-RI-XXX-E-UL
   ghcid_uuid: 18e9687c-e331-50d7-8f4b-786cc3f707d2
   ghcid_uuid_sha256: 04fea26d-bff3-88d5-54b4-e38ac6e4e34b
@@ -35,22 +35,35 @@ ghcid:
   record_id: 7b8ada85-996e-4d11-9794-5a0d766cb38e
   generation_timestamp: '2025-12-06T23:35:51.968739+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: RI
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: RS
+    region_name: Rio Grande do Sul
+    city_code: PAL
+    city_name: Porto Alegre
+    geonames_id: 3452925
+    feature_code: PPLA
+    google_place_id: ChIJbQa2l7CdGZUROZuAToe1Y-c
+    latitude: -30.0409398
+    longitude: -51.20605930000001
+    resolution_date: '2025-12-07T16:39:05.112237+00:00'
   ghcid_history:
   - ghcid: BR-RI-XXX-E-UL
     ghcid_numeric: 359903612491741397
     valid_from: '2025-12-06T23:35:51.968739+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:05.112237+00:00'
+  - ghcid: BR-RS-PAL-E-UL
+    ghcid_numeric: 359903612491741397
+    valid_from: '2025-12-07T16:39:05.112237+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Porto Alegre (RS)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFRGS LUME
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-RI-XXX-E-UL
+  identifier_value: BR-RS-PAL-E-UL
 - identifier_scheme: GHCID_UUID
   identifier_value: 18e9687c-e331-50d7-8f4b-786cc3f707d2
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.968739+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJbQa2l7CdGZUROZuAToe1Y-c
+  formatted_address: R. Ramiro Barcelos, 2574 - Floresta, Porto Alegre - RS, 90035-002,
+    Brazil
+  website: http://lume.ufrgs.br/
+  latitude: -30.0409398
+  longitude: -51.20605930000001
+  enriched_at: '2025-12-07T16:39:05.112237+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-SA-XXX-E-UDA-ufsc_digital_art.yaml b/data/custodian/BR-SC-FLO-E-UDA-ufsc_digital_art.yaml
similarity index 82%
rename from data/custodian/BR-SA-XXX-E-UDA-ufsc_digital_art.yaml
rename to data/custodian/BR-SC-FLO-E-UDA-ufsc_digital_art.yaml
index 1ce3711a2b..dc94d6fc0c 100644
--- a/data/custodian/BR-SA-XXX-E-UDA-ufsc_digital_art.yaml
+++ b/data/custodian/BR-SC-FLO-E-UDA-ufsc_digital_art.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: SANTA CATARINA
 processing_timestamp: '2025-12-06T23:39:01.751455+00:00'
 ghcid:
-  ghcid_current: BR-SA-XXX-E-UDA-ufsc_digital_art
+  ghcid_current: BR-SC-FLO-E-UDA-ufsc_digital_art
   ghcid_original: BR-SA-XXX-E-UDA-ufsc_digital_art
   ghcid_uuid: ecf6b277-6edc-564b-893e-6e4901786d1c
   ghcid_uuid_sha256: da6af54f-4b76-8913-3ea3-b1367e6309e5
@@ -35,22 +35,35 @@ ghcid:
   record_id: 3e0d83f4-eb6c-4fb3-be13-9cddbe918d35
   generation_timestamp: '2025-12-06T23:39:01.751455+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: SA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: SC
+    region_name: Santa Catarina
+    city_code: FLO
+    city_name: Florianopolis
+    geonames_id: 3463237
+    feature_code: PPLA
+    google_place_id: ChIJp7yoBqs5J5URnQ9eOKG8BJk
+    latitude: -27.5999578
+    longitude: -48.5194134
+    resolution_date: '2025-12-07T16:39:10.095627+00:00'
   ghcid_history:
   - ghcid: BR-SA-XXX-E-UDA-ufsc_digital_art
     ghcid_numeric: 15738661568716912915
     valid_from: '2025-12-06T23:39:01.751455+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:10.095627+00:00'
+  - ghcid: BR-SC-FLO-E-UDA-ufsc_digital_art
+    ghcid_numeric: 15738661568716912915
+    valid_from: '2025-12-07T16:39:10.095627+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Florianopolis (SC)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFSC Digital Art
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-SA-XXX-E-UDA-ufsc_digital_art
+  identifier_value: BR-SC-FLO-E-UDA-ufsc_digital_art
 - identifier_scheme: GHCID_UUID
   identifier_value: ecf6b277-6edc-564b-893e-6e4901786d1c
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.751455+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJp7yoBqs5J5URnQ9eOKG8BJk
+  formatted_address: R. Eng. Agronômico Andrei Cristian Ferreira, s/n - Trindade,
+    Florianópolis - SC, 88040-900, Brazil
+  website: http://ufsc.br/
+  latitude: -27.5999578
+  longitude: -48.5194134
+  enriched_at: '2025-12-07T16:39:10.095627+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-SA-XXX-E-UDA.yaml b/data/custodian/BR-SC-FLO-E-UDA.yaml
similarity index 82%
rename from data/custodian/BR-SA-XXX-E-UDA.yaml
rename to data/custodian/BR-SC-FLO-E-UDA.yaml
index 959e3dd418..7693d42422 100644
--- a/data/custodian/BR-SA-XXX-E-UDA.yaml
+++ b/data/custodian/BR-SC-FLO-E-UDA.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: SANTA CATARINA
 processing_timestamp: '2025-12-06T23:35:51.986649+00:00'
 ghcid:
-  ghcid_current: BR-SA-XXX-E-UDA
+  ghcid_current: BR-SC-FLO-E-UDA
   ghcid_original: BR-SA-XXX-E-UDA
   ghcid_uuid: d870c413-3f31-5f37-bae0-fe6603804f5c
   ghcid_uuid_sha256: 5f7ee680-2e1a-8178-3b25-adfd5c28cc0d
@@ -35,22 +35,35 @@ ghcid:
   record_id: 55e91434-23cb-48d0-808f-f9f3b54e103f
   generation_timestamp: '2025-12-06T23:35:51.986649+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: SA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: SC
+    region_name: Santa Catarina
+    city_code: FLO
+    city_name: Florianopolis
+    geonames_id: 3463237
+    feature_code: PPLA
+    google_place_id: ChIJp7yoBqs5J5URnQ9eOKG8BJk
+    latitude: -27.5999578
+    longitude: -48.5194134
+    resolution_date: '2025-12-07T16:39:10.837270+00:00'
   ghcid_history:
   - ghcid: BR-SA-XXX-E-UDA
     ghcid_numeric: 6881190718872396152
     valid_from: '2025-12-06T23:35:51.986649+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:10.837270+00:00'
+  - ghcid: BR-SC-FLO-E-UDA
+    ghcid_numeric: 6881190718872396152
+    valid_from: '2025-12-07T16:39:10.837270+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Florianopolis (SC)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UFSC Digital Art
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-SA-XXX-E-UDA
+  identifier_value: BR-SC-FLO-E-UDA
 - identifier_scheme: GHCID_UUID
   identifier_value: d870c413-3f31-5f37-bae0-fe6603804f5c
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.986649+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJp7yoBqs5J5URnQ9eOKG8BJk
+  formatted_address: R. Eng. Agronômico Andrei Cristian Ferreira, s/n - Trindade,
+    Florianópolis - SC, 88040-900, Brazil
+  website: http://ufsc.br/
+  latitude: -27.5999578
+  longitude: -48.5194134
+  enriched_at: '2025-12-07T16:39:10.837270+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-BA-XXX-O-FI-fpcipac.yaml b/data/custodian/BR-SP-GAR-O-FI-fpcipac.yaml
similarity index 82%
rename from data/custodian/BR-BA-XXX-O-FI-fpcipac.yaml
rename to data/custodian/BR-SP-GAR-O-FI-fpcipac.yaml
index a7cfafee7b..c01035c74a 100644
--- a/data/custodian/BR-BA-XXX-O-FI-fpcipac.yaml
+++ b/data/custodian/BR-SP-GAR-O-FI-fpcipac.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: BAHIA
 processing_timestamp: '2025-12-06T23:39:01.637552+00:00'
 ghcid:
-  ghcid_current: BR-BA-XXX-O-FI-fpcipac
+  ghcid_current: BR-SP-GAR-O-FI-fpcipac
   ghcid_original: BR-BA-XXX-O-FI-fpcipac
   ghcid_uuid: 6376a4dd-da27-595a-9a64-a286134d75a6
   ghcid_uuid_sha256: ab3f1b13-4f36-89d7-ca85-bbda960cb827
@@ -35,22 +35,35 @@ ghcid:
   record_id: dc7972f9-8371-4aa3-885d-1210b103f503
   generation_timestamp: '2025-12-06T23:39:01.637552+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: BA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: SP
+    region_name: São Paulo
+    city_code: GAR
+    city_name: Garces
+    geonames_id: 12426644
+    feature_code: PPL
+    google_place_id: ChIJ80SImT7NyJQR546GEOKyMb4
+    latitude: -23.0093513
+    longitude: -47.004340199999994
+    resolution_date: '2025-12-07T16:38:41.860969+00:00'
   ghcid_history:
   - ghcid: BR-BA-XXX-O-FI-fpcipac
     ghcid_numeric: 12339611273765763543
     valid_from: '2025-12-06T23:39:01.637552+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:41.860969+00:00'
+  - ghcid: BR-SP-GAR-O-FI-fpcipac
+    ghcid_numeric: 12339611273765763543
+    valid_from: '2025-12-07T16:38:41.860969+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Garces (SP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: FPC/IPAC
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-BA-XXX-O-FI-fpcipac
+  identifier_value: BR-SP-GAR-O-FI-fpcipac
 - identifier_scheme: GHCID_UUID
   identifier_value: 6376a4dd-da27-595a-9a64-a286134d75a6
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.637552+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ80SImT7NyJQR546GEOKyMb4
+  formatted_address: Estância Recreio - R. Caetano Olivo, 51 - Estância Recreativa
+    San Fernando, Valinhos - SP, 13278-134, Brazil
+  website: http://ipacamp.org.br/
+  latitude: -23.0093513
+  longitude: -47.004340199999994
+  enriched_at: '2025-12-07T16:38:41.860969+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-BA-XXX-O-FI.yaml b/data/custodian/BR-SP-GAR-O-FI.yaml
similarity index 82%
rename from data/custodian/BR-BA-XXX-O-FI.yaml
rename to data/custodian/BR-SP-GAR-O-FI.yaml
index 8d9f096399..7d4de163b9 100644
--- a/data/custodian/BR-BA-XXX-O-FI.yaml
+++ b/data/custodian/BR-SP-GAR-O-FI.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: BAHIA
 processing_timestamp: '2025-12-06T23:35:51.815731+00:00'
 ghcid:
-  ghcid_current: BR-BA-XXX-O-FI
+  ghcid_current: BR-SP-GAR-O-FI
   ghcid_original: BR-BA-XXX-O-FI
   ghcid_uuid: 039f2c5f-d414-54cc-aab3-99a4bf0fccce
   ghcid_uuid_sha256: 8cfe5823-272f-8f83-df38-5b59dc2f67b0
@@ -35,22 +35,35 @@ ghcid:
   record_id: 7bb3ce27-c60f-4ebf-aff1-54a40eaf07da
   generation_timestamp: '2025-12-06T23:35:51.815731+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: BA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: SP
+    region_name: São Paulo
+    city_code: GAR
+    city_name: Garces
+    geonames_id: 12426644
+    feature_code: PPL
+    google_place_id: ChIJ80SImT7NyJQR546GEOKyMb4
+    latitude: -23.0093513
+    longitude: -47.004340199999994
+    resolution_date: '2025-12-07T16:38:42.476040+00:00'
   ghcid_history:
   - ghcid: BR-BA-XXX-O-FI
     ghcid_numeric: 10159654717398962051
     valid_from: '2025-12-06T23:35:51.815731+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:38:42.476040+00:00'
+  - ghcid: BR-SP-GAR-O-FI
+    ghcid_numeric: 10159654717398962051
+    valid_from: '2025-12-07T16:38:42.476040+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Garces (SP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: FPC/IPAC
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-BA-XXX-O-FI
+  identifier_value: BR-SP-GAR-O-FI
 - identifier_scheme: GHCID_UUID
   identifier_value: 039f2c5f-d414-54cc-aab3-99a4bf0fccce
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.815731+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ80SImT7NyJQR546GEOKyMb4
+  formatted_address: Estância Recreio - R. Caetano Olivo, 51 - Estância Recreativa
+    San Fernando, Valinhos - SP, 13278-134, Brazil
+  website: http://ipacamp.org.br/
+  latitude: -23.0093513
+  longitude: -47.004340199999994
+  enriched_at: '2025-12-07T16:38:42.476040+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-SA-XXX-E-UUU-uspunicampunesp.yaml b/data/custodian/BR-SP-LSD-E-UUU-uspunicampunesp.yaml
similarity index 81%
rename from data/custodian/BR-SA-XXX-E-UUU-uspunicampunesp.yaml
rename to data/custodian/BR-SP-LSD-E-UUU-uspunicampunesp.yaml
index 9b9a32c8cb..a58705455e 100644
--- a/data/custodian/BR-SA-XXX-E-UUU-uspunicampunesp.yaml
+++ b/data/custodian/BR-SP-LSD-E-UUU-uspunicampunesp.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: SÃO PAULO
 processing_timestamp: '2025-12-06T23:39:01.761474+00:00'
 ghcid:
-  ghcid_current: BR-SA-XXX-E-UUU-uspunicampunesp
+  ghcid_current: BR-SP-LSD-E-UUU-uspunicampunesp
   ghcid_original: BR-SA-XXX-E-UUU-uspunicampunesp
   ghcid_uuid: 86bf913c-1f0c-59b9-92e5-19e3c5dec4a4
   ghcid_uuid_sha256: 60bab83c-3643-8e83-2d8a-25b7117fb0e1
@@ -35,22 +35,36 @@ ghcid:
   record_id: ed4e3e58-5021-42c8-9c5f-5ff71158093b
   generation_timestamp: '2025-12-06T23:39:01.761474+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: SA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: SP
+    region_name: São Paulo
+    city_code: LSD
+    city_name: Loteamento Solar de Campinas
+    geonames_id: 13005473
+    feature_code: PPL
+    google_place_id: ChIJtU3SBbDGyJQRltcEzw5128Y
+    latitude: -22.818439299999998
+    longitude: -47.0647206
+    resolution_date: '2025-12-07T16:39:11.584916+00:00'
   ghcid_history:
   - ghcid: BR-SA-XXX-E-UUU-uspunicampunesp
     ghcid_numeric: 6970085942057234051
     valid_from: '2025-12-06T23:39:01.761474+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:11.584916+00:00'
+  - ghcid: BR-SP-LSD-E-UUU-uspunicampunesp
+    ghcid_numeric: 6970085942057234051
+    valid_from: '2025-12-07T16:39:11.584916+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Loteamento Solar de Campinas
+      (SP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: USP/UNICAMP/UNESP
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-SA-XXX-E-UUU-uspunicampunesp
+  identifier_value: BR-SP-LSD-E-UUU-uspunicampunesp
 - identifier_scheme: GHCID_UUID
   identifier_value: 86bf913c-1f0c-59b9-92e5-19e3c5dec4a4
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +145,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.761474+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJtU3SBbDGyJQRltcEzw5128Y
+  formatted_address: Cidade Universitária Zeferino Vaz - Barão Geraldo, Campinas -
+    SP, 13083-970, Brazil
+  website: http://www.unicamp.br/
+  latitude: -22.818439299999998
+  longitude: -47.0647206
+  enriched_at: '2025-12-07T16:39:11.584916+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-SA-XXX-E-UUU.yaml b/data/custodian/BR-SP-LSD-E-UUU.yaml
similarity index 82%
rename from data/custodian/BR-SA-XXX-E-UUU.yaml
rename to data/custodian/BR-SP-LSD-E-UUU.yaml
index d86cb3eb73..0b68df6270 100644
--- a/data/custodian/BR-SA-XXX-E-UUU.yaml
+++ b/data/custodian/BR-SP-LSD-E-UUU.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: SÃO PAULO
 processing_timestamp: '2025-12-06T23:35:51.996651+00:00'
 ghcid:
-  ghcid_current: BR-SA-XXX-E-UUU
+  ghcid_current: BR-SP-LSD-E-UUU
   ghcid_original: BR-SA-XXX-E-UUU
   ghcid_uuid: 05f54b3d-36fc-5d22-a346-03e46670759e
   ghcid_uuid_sha256: 831323db-d387-8058-23b4-a897313a83fa
@@ -35,22 +35,36 @@ ghcid:
   record_id: 1b7dccfb-762c-4d3b-954a-aa0ba9a38752
   generation_timestamp: '2025-12-06T23:35:51.996651+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: SA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: SP
+    region_name: São Paulo
+    city_code: LSD
+    city_name: Loteamento Solar de Campinas
+    geonames_id: 13005473
+    feature_code: PPL
+    google_place_id: ChIJtU3SBbDGyJQRltcEzw5128Y
+    latitude: -22.818439299999998
+    longitude: -47.0647206
+    resolution_date: '2025-12-07T16:39:12.242790+00:00'
   ghcid_history:
   - ghcid: BR-SA-XXX-E-UUU
     ghcid_numeric: 9444932270579765336
     valid_from: '2025-12-06T23:35:51.996651+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:12.242790+00:00'
+  - ghcid: BR-SP-LSD-E-UUU
+    ghcid_numeric: 9444932270579765336
+    valid_from: '2025-12-07T16:39:12.242790+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Loteamento Solar de Campinas
+      (SP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: USP/UNICAMP/UNESP
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-SA-XXX-E-UUU
+  identifier_value: BR-SP-LSD-E-UUU
 - identifier_scheme: GHCID_UUID
   identifier_value: 05f54b3d-36fc-5d22-a346-03e46670759e
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +145,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.996651+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJtU3SBbDGyJQRltcEzw5128Y
+  formatted_address: Cidade Universitária Zeferino Vaz - Barão Geraldo, Campinas -
+    SP, 13083-970, Brazil
+  website: http://www.unicamp.br/
+  latitude: -22.818439299999998
+  longitude: -47.0647206
+  enriched_at: '2025-12-07T16:39:12.242790+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-RI-XXX-O-F-fcrb.yaml b/data/custodian/BR-SP-RVD-O-F-fcrb.yaml
similarity index 82%
rename from data/custodian/BR-RI-XXX-O-F-fcrb.yaml
rename to data/custodian/BR-SP-RVD-O-F-fcrb.yaml
index c4c07a0a33..5267597928 100644
--- a/data/custodian/BR-RI-XXX-O-F-fcrb.yaml
+++ b/data/custodian/BR-SP-RVD-O-F-fcrb.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: RIO DE JANEIRO
 processing_timestamp: '2025-12-06T23:39:01.732881+00:00'
 ghcid:
-  ghcid_current: BR-RI-XXX-O-F-fcrb
+  ghcid_current: BR-SP-RVD-O-F-fcrb
   ghcid_original: BR-RI-XXX-O-F-fcrb
   ghcid_uuid: 8753145d-f10d-5cf6-84a6-173b26e5449c
   ghcid_uuid_sha256: 360b603c-ce8a-82c3-352e-c5699e42d423
@@ -35,22 +35,35 @@ ghcid:
   record_id: 8ef393a2-4b3d-4feb-891a-f1ff5978574e
   generation_timestamp: '2025-12-06T23:39:01.732881+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: RI
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: SP
+    region_name: São Paulo
+    city_code: RVD
+    city_name: Rua Verbo Divino
+    geonames_id: 7279517
+    feature_code: PPL
+    google_place_id: ChIJNwC7Is1QzpQRI3fQGYVMZ3s
+    latitude: -23.6102676
+    longitude: -46.6966781
+    resolution_date: '2025-12-07T16:39:07.386255+00:00'
   ghcid_history:
   - ghcid: BR-RI-XXX-O-F-fcrb
     ghcid_numeric: 3894312117071418051
     valid_from: '2025-12-06T23:39:01.732881+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:07.386255+00:00'
+  - ghcid: BR-SP-RVD-O-F-fcrb
+    ghcid_numeric: 3894312117071418051
+    valid_from: '2025-12-07T16:39:07.386255+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Rua Verbo Divino (SP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: FCRB
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-RI-XXX-O-F-fcrb
+  identifier_value: BR-SP-RVD-O-F-fcrb
 - identifier_scheme: GHCID_UUID
   identifier_value: 8753145d-f10d-5cf6-84a6-173b26e5449c
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.732881+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJNwC7Is1QzpQRI3fQGYVMZ3s
+  formatted_address: Av. das Nações Unidas, 12901 - Cidade Monções, São Paulo - SP,
+    04578-910, Brazil
+  website: http://www.fcbbrasil.com.br/
+  latitude: -23.6102676
+  longitude: -46.6966781
+  enriched_at: '2025-12-07T16:39:07.386255+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-RI-XXX-O-F.yaml b/data/custodian/BR-SP-RVD-O-F.yaml
similarity index 82%
rename from data/custodian/BR-RI-XXX-O-F.yaml
rename to data/custodian/BR-SP-RVD-O-F.yaml
index 46096757a2..98e764ff57 100644
--- a/data/custodian/BR-RI-XXX-O-F.yaml
+++ b/data/custodian/BR-SP-RVD-O-F.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: RIO DE JANEIRO
 processing_timestamp: '2025-12-06T23:35:51.946909+00:00'
 ghcid:
-  ghcid_current: BR-RI-XXX-O-F
+  ghcid_current: BR-SP-RVD-O-F
   ghcid_original: BR-RI-XXX-O-F
   ghcid_uuid: 2a6737af-4ff6-51c3-a2ea-d8cf28208849
   ghcid_uuid_sha256: 8649b53d-81f7-8fca-6e73-faef2bc7b69c
@@ -35,22 +35,35 @@ ghcid:
   record_id: 0f5d6823-f761-492a-a3b7-df27d60e5735
   generation_timestamp: '2025-12-06T23:35:51.946909+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: RI
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: SP
+    region_name: São Paulo
+    city_code: RVD
+    city_name: Rua Verbo Divino
+    geonames_id: 7279517
+    feature_code: PPL
+    google_place_id: ChIJNwC7Is1QzpQRI3fQGYVMZ3s
+    latitude: -23.6102676
+    longitude: -46.6966781
+    resolution_date: '2025-12-07T16:39:08.008612+00:00'
   ghcid_history:
   - ghcid: BR-RI-XXX-O-F
     ghcid_numeric: 9676464550160351178
     valid_from: '2025-12-06T23:35:51.946909+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:08.008612+00:00'
+  - ghcid: BR-SP-RVD-O-F
+    ghcid_numeric: 9676464550160351178
+    valid_from: '2025-12-07T16:39:08.008612+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Rua Verbo Divino (SP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: FCRB
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-RI-XXX-O-F
+  identifier_value: BR-SP-RVD-O-F
 - identifier_scheme: GHCID_UUID
   identifier_value: 2a6737af-4ff6-51c3-a2ea-d8cf28208849
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.946909+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJNwC7Is1QzpQRI3fQGYVMZ3s
+  formatted_address: Av. das Nações Unidas, 12901 - Cidade Monções, São Paulo - SP,
+    04578-910, Brazil
+  website: http://www.fcbbrasil.com.br/
+  latitude: -23.6102676
+  longitude: -46.6966781
+  enriched_at: '2025-12-07T16:39:08.008612+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-SA-XXX-X-A-apesp.yaml b/data/custodian/BR-SP-SPA-X-A-apesp.yaml
similarity index 82%
rename from data/custodian/BR-SA-XXX-X-A-apesp.yaml
rename to data/custodian/BR-SP-SPA-X-A-apesp.yaml
index d05b25e347..474b692aea 100644
--- a/data/custodian/BR-SA-XXX-X-A-apesp.yaml
+++ b/data/custodian/BR-SP-SPA-X-A-apesp.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: SÃO PAULO
 processing_timestamp: '2025-12-06T23:39:01.759080+00:00'
 ghcid:
-  ghcid_current: BR-SA-XXX-X-A-apesp
+  ghcid_current: BR-SP-SPA-X-A-apesp
   ghcid_original: BR-SA-XXX-X-A-apesp
   ghcid_uuid: 22e3ede7-0116-5f3b-9c4f-de1f5d6b21aa
   ghcid_uuid_sha256: 6f8a8ca2-be79-87bf-c59b-af7cb8ab7080
@@ -35,22 +35,35 @@ ghcid:
   record_id: 0fc16e7e-2236-431c-9f2b-c9cf66b9c5b9
   generation_timestamp: '2025-12-06T23:39:01.759080+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: SA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: SP
+    region_name: São Paulo
+    city_code: SPA
+    city_name: Sao Paulo
+    geonames_id: 3448439
+    feature_code: PPLA
+    google_place_id: ChIJA1WDfVRYzpQRKtVDAI1mGJs
+    latitude: -23.5462922
+    longitude: -46.6364069
+    resolution_date: '2025-12-07T16:39:13.155940+00:00'
   ghcid_history:
   - ghcid: BR-SA-XXX-X-A-apesp
     ghcid_numeric: 8037391115604289471
     valid_from: '2025-12-06T23:39:01.759080+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:13.155940+00:00'
+  - ghcid: BR-SP-SPA-X-A-apesp
+    ghcid_numeric: 8037391115604289471
+    valid_from: '2025-12-07T16:39:13.155940+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Sao Paulo (SP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: APESP
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-SA-XXX-X-A-apesp
+  identifier_value: BR-SP-SPA-X-A-apesp
 - identifier_scheme: GHCID_UUID
   identifier_value: 22e3ede7-0116-5f3b-9c4f-de1f5d6b21aa
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.759080+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJA1WDfVRYzpQRKtVDAI1mGJs
+  formatted_address: R. Líbero Badaró, 377 - Se, São Paulo - SP, 01009-906, Brazil
+  website: http://www.apesp.org.br/
+  latitude: -23.5462922
+  longitude: -46.6364069
+  enriched_at: '2025-12-07T16:39:13.155940+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-SA-XXX-X-A.yaml b/data/custodian/BR-SP-SPA-X-A.yaml
similarity index 83%
rename from data/custodian/BR-SA-XXX-X-A.yaml
rename to data/custodian/BR-SP-SPA-X-A.yaml
index 86b2cb892f..d08eee6547 100644
--- a/data/custodian/BR-SA-XXX-X-A.yaml
+++ b/data/custodian/BR-SP-SPA-X-A.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: SÃO PAULO
 processing_timestamp: '2025-12-06T23:35:51.994272+00:00'
 ghcid:
-  ghcid_current: BR-SA-XXX-X-A
+  ghcid_current: BR-SP-SPA-X-A
   ghcid_original: BR-SA-XXX-X-A
   ghcid_uuid: e98135ce-f0d6-5b4e-96a6-7b3a8c7d0f39
   ghcid_uuid_sha256: 72aba018-0200-8ed3-63f9-d47656810993
@@ -35,22 +35,35 @@ ghcid:
   record_id: 50d099cc-2098-4e74-adcf-271d7c029573
   generation_timestamp: '2025-12-06T23:35:51.994272+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: SA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: SP
+    region_name: São Paulo
+    city_code: SPA
+    city_name: Sao Paulo
+    geonames_id: 3448439
+    feature_code: PPLA
+    google_place_id: ChIJA1WDfVRYzpQRKtVDAI1mGJs
+    latitude: -23.5462922
+    longitude: -46.6364069
+    resolution_date: '2025-12-07T16:39:13.834664+00:00'
   ghcid_history:
   - ghcid: BR-SA-XXX-X-A
     ghcid_numeric: 8262873966314528467
     valid_from: '2025-12-06T23:35:51.994272+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:13.834664+00:00'
+  - ghcid: BR-SP-SPA-X-A
+    ghcid_numeric: 8262873966314528467
+    valid_from: '2025-12-07T16:39:13.834664+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Sao Paulo (SP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: APESP
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-SA-XXX-X-A
+  identifier_value: BR-SP-SPA-X-A
 - identifier_scheme: GHCID_UUID
   identifier_value: e98135ce-f0d6-5b4e-96a6-7b3a8c7d0f39
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.994272+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJA1WDfVRYzpQRKtVDAI1mGJs
+  formatted_address: R. Líbero Badaró, 377 - Se, São Paulo - SP, 01009-906, Brazil
+  website: http://www.apesp.org.br/
+  latitude: -23.5462922
+  longitude: -46.6364069
+  enriched_at: '2025-12-07T16:39:13.834664+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-SA-XXX-X-TI-tainacan_implementations.yaml b/data/custodian/BR-SP-SPA-X-TI-tainacan_implementations.yaml
similarity index 82%
rename from data/custodian/BR-SA-XXX-X-TI-tainacan_implementations.yaml
rename to data/custodian/BR-SP-SPA-X-TI-tainacan_implementations.yaml
index 7f9d2e0fb8..8dc4de7655 100644
--- a/data/custodian/BR-SA-XXX-X-TI-tainacan_implementations.yaml
+++ b/data/custodian/BR-SP-SPA-X-TI-tainacan_implementations.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: SANTA CATARINA
 processing_timestamp: '2025-12-06T23:39:01.753932+00:00'
 ghcid:
-  ghcid_current: BR-SA-XXX-X-TI-tainacan_implementations
+  ghcid_current: BR-SP-SPA-X-TI-tainacan_implementations
   ghcid_original: BR-SA-XXX-X-TI-tainacan_implementations
   ghcid_uuid: 0fc336a7-4da7-587f-bf7e-a1e18b5117f9
   ghcid_uuid_sha256: c2231d80-a10b-8aa1-485e-097ad4a685cb
@@ -35,22 +35,35 @@ ghcid:
   record_id: 35c7f5c6-6feb-4dd5-8157-abf4b7f7c2f7
   generation_timestamp: '2025-12-06T23:39:01.753932+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: SA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: SP
+    region_name: São Paulo
+    city_code: SPA
+    city_name: Sao Paulo
+    geonames_id: 3448439
+    feature_code: PPLA
+    google_place_id: ChIJByZEUxhZzpQR7Er4EJh1m2Y
+    latitude: -23.544272400000004
+    longitude: -46.6351503
+    resolution_date: '2025-12-07T16:39:14.504574+00:00'
   ghcid_history:
   - ghcid: BR-SA-XXX-X-TI-tainacan_implementations
     ghcid_numeric: 13989057305837767329
     valid_from: '2025-12-06T23:39:01.753932+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:14.504574+00:00'
+  - ghcid: BR-SP-SPA-X-TI-tainacan_implementations
+    ghcid_numeric: 13989057305837767329
+    valid_from: '2025-12-07T16:39:14.504574+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Sao Paulo (SP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Tainacan implementations
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-SA-XXX-X-TI-tainacan_implementations
+  identifier_value: BR-SP-SPA-X-TI-tainacan_implementations
 - identifier_scheme: GHCID_UUID
   identifier_value: 0fc336a7-4da7-587f-bf7e-a1e18b5117f9
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.753932+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJByZEUxhZzpQR7Er4EJh1m2Y
+  formatted_address: Centro Histórico de São Paulo, São Paulo - State of São Paulo,
+    01029-010, Brazil
+  website: null
+  latitude: -23.544272400000004
+  longitude: -46.6351503
+  enriched_at: '2025-12-07T16:39:14.504574+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-SA-XXX-X-TI.yaml b/data/custodian/BR-SP-SPA-X-TI.yaml
similarity index 83%
rename from data/custodian/BR-SA-XXX-X-TI.yaml
rename to data/custodian/BR-SP-SPA-X-TI.yaml
index 0e32946deb..d99f78563e 100644
--- a/data/custodian/BR-SA-XXX-X-TI.yaml
+++ b/data/custodian/BR-SP-SPA-X-TI.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: SANTA CATARINA
 processing_timestamp: '2025-12-06T23:35:51.989122+00:00'
 ghcid:
-  ghcid_current: BR-SA-XXX-X-TI
+  ghcid_current: BR-SP-SPA-X-TI
   ghcid_original: BR-SA-XXX-X-TI
   ghcid_uuid: 5d6c9748-d719-5db2-b23b-e4bbd7a99edd
   ghcid_uuid_sha256: cb816558-3f02-8712-eef7-b100743e0692
@@ -35,22 +35,35 @@ ghcid:
   record_id: 7d09b041-0aac-4b0a-a34a-932b722e2d52
   generation_timestamp: '2025-12-06T23:35:51.989122+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
-    region_code: SA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: SP
+    region_name: São Paulo
+    city_code: SPA
+    city_name: Sao Paulo
+    geonames_id: 3448439
+    feature_code: PPLA
+    google_place_id: ChIJByZEUxhZzpQR7Er4EJh1m2Y
+    latitude: -23.544272400000004
+    longitude: -46.6351503
+    resolution_date: '2025-12-07T16:39:15.131122+00:00'
   ghcid_history:
   - ghcid: BR-SA-XXX-X-TI
     ghcid_numeric: 14664113291383719698
     valid_from: '2025-12-06T23:35:51.989122+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:15.131122+00:00'
+  - ghcid: BR-SP-SPA-X-TI
+    ghcid_numeric: 14664113291383719698
+    valid_from: '2025-12-07T16:39:15.131122+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Sao Paulo (SP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Tainacan implementations
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-SA-XXX-X-TI
+  identifier_value: BR-SP-SPA-X-TI
 - identifier_scheme: GHCID_UUID
   identifier_value: 5d6c9748-d719-5db2-b23b-e4bbd7a99edd
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:51.989122+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJByZEUxhZzpQR7Er4EJh1m2Y
+  formatted_address: Centro Histórico de São Paulo, São Paulo - State of São Paulo,
+    01029-010, Brazil
+  website: null
+  latitude: -23.544272400000004
+  longitude: -46.6351503
+  enriched_at: '2025-12-07T16:39:15.131122+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-TO-XXX-R-JH.yaml b/data/custodian/BR-TO-JAL-R-JH.yaml
similarity index 83%
rename from data/custodian/BR-TO-XXX-R-JH.yaml
rename to data/custodian/BR-TO-JAL-R-JH.yaml
index b55898f8fd..d2ea0a0db7 100644
--- a/data/custodian/BR-TO-XXX-R-JH.yaml
+++ b/data/custodian/BR-TO-JAL-R-JH.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: TOCANTINS
 processing_timestamp: '2025-12-06T23:35:52.013510+00:00'
 ghcid:
-  ghcid_current: BR-TO-XXX-R-JH
+  ghcid_current: BR-TO-JAL-R-JH
   ghcid_original: BR-TO-XXX-R-JH
   ghcid_uuid: 3897b535-ad0e-5cde-82c6-ef5b42435cd9
   ghcid_uuid_sha256: 777f29f3-14b2-81f3-4cb0-01a4be892fe2
@@ -35,22 +35,35 @@ ghcid:
   record_id: 31501eb3-1f0a-4c1b-a77b-2f7435709ad0
   generation_timestamp: '2025-12-06T23:35:52.013510+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: TO
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Tocantins
+    city_code: JAL
+    city_name: Jalapao
+    geonames_id: 12546960
+    feature_code: PPL
+    google_place_id: ChIJv5prelIPMZMRVAlZKhwAuBo
+    latitude: -10.5644174
+    longitude: -46.6615701
+    resolution_date: '2025-12-07T16:39:17.912151+00:00'
   ghcid_history:
   - ghcid: BR-TO-XXX-R-JH
     ghcid_numeric: 8610647136556683763
     valid_from: '2025-12-06T23:35:52.013510+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:17.912151+00:00'
+  - ghcid: BR-TO-JAL-R-JH
+    ghcid_numeric: 8610647136556683763
+    valid_from: '2025-12-07T16:39:17.912151+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Jalapao (TO)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Jalapão Heritage
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-TO-XXX-R-JH
+  identifier_value: BR-TO-JAL-R-JH
 - identifier_scheme: GHCID_UUID
   identifier_value: 3897b535-ad0e-5cde-82c6-ef5b42435cd9
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:52.013510+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJv5prelIPMZMRVAlZKhwAuBo
+  formatted_address: Mateiros - State of Tocantins, 77593-000, Brazil
+  website: https://dunasdojalapao.com.br/
+  latitude: -10.5644174
+  longitude: -46.6615701
+  enriched_at: '2025-12-07T16:39:17.912151+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-TO-XXX-O-ST-secult_tocantins.yaml b/data/custodian/BR-TO-PAL-O-ST-secult_tocantins.yaml
similarity index 82%
rename from data/custodian/BR-TO-XXX-O-ST-secult_tocantins.yaml
rename to data/custodian/BR-TO-PAL-O-ST-secult_tocantins.yaml
index d82e30432f..b3427590a7 100644
--- a/data/custodian/BR-TO-XXX-O-ST-secult_tocantins.yaml
+++ b/data/custodian/BR-TO-PAL-O-ST-secult_tocantins.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: TOCANTINS
 processing_timestamp: '2025-12-06T23:39:01.775005+00:00'
 ghcid:
-  ghcid_current: BR-TO-XXX-O-ST-secult_tocantins
+  ghcid_current: BR-TO-PAL-O-ST-secult_tocantins
   ghcid_original: BR-TO-XXX-O-ST-secult_tocantins
   ghcid_uuid: 6fca02cf-fab0-5f21-8ef3-bc7b20f5370c
   ghcid_uuid_sha256: d621d47f-bf2b-8e7b-078c-acf9598d75e2
@@ -35,22 +35,35 @@ ghcid:
   record_id: 29b0bc26-a05e-4c28-9def-59fd3785f68f
   generation_timestamp: '2025-12-06T23:39:01.775005+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: TO
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Tocantins
+    city_code: PAL
+    city_name: Palmas
+    geonames_id: 3474574
+    feature_code: PPLA
+    google_place_id: ChIJxa4AXhfLJJMRWX05psppJJM
+    latitude: -10.2047255
+    longitude: -48.3475416
+    resolution_date: '2025-12-07T16:39:15.828538+00:00'
   ghcid_history:
   - ghcid: BR-TO-XXX-O-ST-secult_tocantins
     ghcid_numeric: 15429847443481251451
     valid_from: '2025-12-06T23:39:01.775005+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:15.828538+00:00'
+  - ghcid: BR-TO-PAL-O-ST-secult_tocantins
+    ghcid_numeric: 15429847443481251451
+    valid_from: '2025-12-07T16:39:15.828538+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Palmas (TO)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Secult Tocantins
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-TO-XXX-O-ST-secult_tocantins
+  identifier_value: BR-TO-PAL-O-ST-secult_tocantins
 - identifier_scheme: GHCID_UUID
   identifier_value: 6fca02cf-fab0-5f21-8ef3-bc7b20f5370c
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.775005+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJxa4AXhfLJJMRWX05psppJJM
+  formatted_address: Sul Avenida - LO 09 - Plano Diretor Sul, Palmas - TO, 77015-418,
+    Brazil
+  website: https://www.to.gov.br/secult
+  latitude: -10.2047255
+  longitude: -48.3475416
+  enriched_at: '2025-12-07T16:39:15.828538+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-TO-XXX-O-ST.yaml b/data/custodian/BR-TO-PAL-O-ST.yaml
similarity index 83%
rename from data/custodian/BR-TO-XXX-O-ST.yaml
rename to data/custodian/BR-TO-PAL-O-ST.yaml
index 0686a05270..9a5621aaca 100644
--- a/data/custodian/BR-TO-XXX-O-ST.yaml
+++ b/data/custodian/BR-TO-PAL-O-ST.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: TOCANTINS
 processing_timestamp: '2025-12-06T23:35:52.015965+00:00'
 ghcid:
-  ghcid_current: BR-TO-XXX-O-ST
+  ghcid_current: BR-TO-PAL-O-ST
   ghcid_original: BR-TO-XXX-O-ST
   ghcid_uuid: d97e05f5-37ee-57c9-8bd9-a0d253130e46
   ghcid_uuid_sha256: 09d8ae0c-4bfe-8f96-d594-4a16554cc99d
@@ -35,22 +35,35 @@ ghcid:
   record_id: 1ef12730-b744-4446-b8dc-be20bb36e05b
   generation_timestamp: '2025-12-06T23:35:52.015965+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: TO
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Tocantins
+    city_code: PAL
+    city_name: Palmas
+    geonames_id: 3474574
+    feature_code: PPLA
+    google_place_id: ChIJxa4AXhfLJJMRWX05psppJJM
+    latitude: -10.2047255
+    longitude: -48.3475416
+    resolution_date: '2025-12-07T16:39:16.475740+00:00'
   ghcid_history:
   - ghcid: BR-TO-XXX-O-ST
     ghcid_numeric: 709508309148680086
     valid_from: '2025-12-06T23:35:52.015965+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:16.475740+00:00'
+  - ghcid: BR-TO-PAL-O-ST
+    ghcid_numeric: 709508309148680086
+    valid_from: '2025-12-07T16:39:16.475740+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Palmas (TO)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Secult Tocantins
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-TO-XXX-O-ST
+  identifier_value: BR-TO-PAL-O-ST
 - identifier_scheme: GHCID_UUID
   identifier_value: d97e05f5-37ee-57c9-8bd9-a0d253130e46
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:35:52.015965+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJxa4AXhfLJJMRWX05psppJJM
+  formatted_address: Sul Avenida - LO 09 - Plano Diretor Sul, Palmas - TO, 77015-418,
+    Brazil
+  website: https://www.to.gov.br/secult
+  latitude: -10.2047255
+  longitude: -48.3475416
+  enriched_at: '2025-12-07T16:39:16.475740+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/BR-TO-XXX-R-JH-jalapao_heritage.yaml b/data/custodian/BR-TO-SFD-R-JH-jalapao_heritage.yaml
similarity index 82%
rename from data/custodian/BR-TO-XXX-R-JH-jalapao_heritage.yaml
rename to data/custodian/BR-TO-SFD-R-JH-jalapao_heritage.yaml
index 99a5aab9af..efba40b643 100644
--- a/data/custodian/BR-TO-XXX-R-JH-jalapao_heritage.yaml
+++ b/data/custodian/BR-TO-SFD-R-JH-jalapao_heritage.yaml
@@ -27,7 +27,7 @@ original_entry:
     region: TOCANTINS
 processing_timestamp: '2025-12-06T23:39:01.772244+00:00'
 ghcid:
-  ghcid_current: BR-TO-XXX-R-JH-jalapao_heritage
+  ghcid_current: BR-TO-SFD-R-JH-jalapao_heritage
   ghcid_original: BR-TO-XXX-R-JH-jalapao_heritage
   ghcid_uuid: 21c11a35-ece0-5c5f-ba39-59e25c5b4b84
   ghcid_uuid_sha256: 0422ad13-6e80-86a5-9077-c068c134f310
@@ -35,22 +35,36 @@ ghcid:
   record_id: 5e053e4b-d420-4cc3-a3ca-e956157e84b0
   generation_timestamp: '2025-12-06T23:39:01.772244+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: BR
     region_code: TO
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Tocantins
+    city_code: SFD
+    city_name: Sao Felix do Tocantins
+    geonames_id: 3479317
+    feature_code: PPL
+    google_place_id: ChIJoxMXeGKlMZMRJLnFhLkgx0k
+    latitude: -10.298488899999999
+    longitude: -46.7538882
+    resolution_date: '2025-12-07T16:39:17.199324+00:00'
   ghcid_history:
   - ghcid: BR-TO-XXX-R-JH-jalapao_heritage
     ghcid_numeric: 297990824329766565
     valid_from: '2025-12-06T23:39:01.772244+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:17.199324+00:00'
+  - ghcid: BR-TO-SFD-R-JH-jalapao_heritage
+    ghcid_numeric: 297990824329766565
+    valid_from: '2025-12-07T16:39:17.199324+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Sao Felix do Tocantins
+      (TO)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Jalapão Heritage
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: BR-TO-XXX-R-JH-jalapao_heritage
+  identifier_value: BR-TO-SFD-R-JH-jalapao_heritage
 - identifier_scheme: GHCID_UUID
   identifier_value: 21c11a35-ece0-5c5f-ba39-59e25c5b4b84
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +145,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.772244+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJoxMXeGKlMZMRJLnFhLkgx0k
+  formatted_address: Mateiros - State of Tocantins, 77593-000, Brazil
+  website: https://parqueestadualdojalapao.com.br/
+  latitude: -10.298488899999999
+  longitude: -46.7538882
+  enriched_at: '2025-12-07T16:39:17.199324+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-BE-XXX-L-AISSB-amnesty_international_schweizer_sektion_bibliothek.yaml b/data/custodian/CH-BE-BER-L-AISSB-amnesty_international_schweizer_sektion_bibliothek.yaml
similarity index 77%
rename from data/custodian/CH-BE-XXX-L-AISSB-amnesty_international_schweizer_sektion_bibliothek.yaml
rename to data/custodian/CH-BE-BER-L-AISSB-amnesty_international_schweizer_sektion_bibliothek.yaml
index 49b0fb0ce7..20286fbba7 100644
--- a/data/custodian/CH-BE-XXX-L-AISSB-amnesty_international_schweizer_sektion_bibliothek.yaml
+++ b/data/custodian/CH-BE-BER-L-AISSB-amnesty_international_schweizer_sektion_bibliothek.yaml
@@ -8,7 +8,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:09.101079+00:00'
 ghcid:
-  ghcid_current: CH-BE-XXX-L-AISSB-amnesty_international_schweizer_sektion_bibliothek
+  ghcid_current: CH-BE-BER-L-AISSB-amnesty_international_schweizer_sektion_bibliothek
   ghcid_original: CH-BE-XXX-L-AISSB-amnesty_international_schweizer_sektion_bibliothek
   ghcid_uuid: 51df809d-ff73-52b2-a03a-802edb56a32a
   ghcid_uuid_sha256: c042cc34-e07f-8484-ff71-3bd17378762c
@@ -16,22 +16,35 @@ ghcid:
   record_id: d054d95c-6ac3-41b6-b092-f480ba1f8620
   generation_timestamp: '2025-12-06T23:39:09.101079+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: BE
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Bern
+    city_code: BER
+    city_name: Bern
+    geonames_id: 2661552
+    feature_code: PPLC
+    google_place_id: ChIJaV_Ffb85jkcRM9eltKVtJlY
+    latitude: 46.9501832
+    longitude: 7.442520699999998
+    resolution_date: '2025-12-07T16:39:33.853002+00:00'
   ghcid_history:
   - ghcid: CH-BE-XXX-L-AISSB-amnesty_international_schweizer_sektion_bibliothek
     ghcid_numeric: 13853859931221898372
     valid_from: '2025-12-06T23:39:09.101079+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:33.853002+00:00'
+  - ghcid: CH-BE-BER-L-AISSB-amnesty_international_schweizer_sektion_bibliothek
+    ghcid_numeric: 13853859931221898372
+    valid_from: '2025-12-07T16:39:33.853002+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Bern (BE)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Amnesty International Schweizer Sektion ‒ Bibliothek
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-BE-XXX-L-AISSB-amnesty_international_schweizer_sektion_bibliothek
+  identifier_value: CH-BE-BER-L-AISSB-amnesty_international_schweizer_sektion_bibliothek
 - identifier_scheme: GHCID_UUID
   identifier_value: 51df809d-ff73-52b2-a03a-802edb56a32a
 - identifier_scheme: GHCID_UUID_SHA256
@@ -99,3 +112,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:09.101079+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJaV_Ffb85jkcRM9eltKVtJlY
+  formatted_address: Speichergasse 33, 3001 Bern, Switzerland
+  website: https://www.amnesty.ch/
+  latitude: 46.9501832
+  longitude: 7.442520699999998
+  enriched_at: '2025-12-07T16:39:33.853002+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-BE-XXX-M-BHM.yaml b/data/custodian/CH-BE-BER-M-BHM.yaml
similarity index 78%
rename from data/custodian/CH-BE-XXX-M-BHM.yaml
rename to data/custodian/CH-BE-BER-M-BHM.yaml
index e98dda840f..3ae0488e9f 100644
--- a/data/custodian/CH-BE-XXX-M-BHM.yaml
+++ b/data/custodian/CH-BE-BER-M-BHM.yaml
@@ -8,7 +8,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:09.545791+00:00'
 ghcid:
-  ghcid_current: CH-BE-XXX-M-BHM
+  ghcid_current: CH-BE-BER-M-BHM
   ghcid_original: CH-BE-XXX-M-BHM
   ghcid_uuid: d3974f5e-ddac-5726-801d-6b4e3b633dec
   ghcid_uuid_sha256: d6335200-7e7b-8c8f-031f-18ddd0de330e
@@ -16,22 +16,35 @@ ghcid:
   record_id: a040a192-044f-49ee-a071-f9730ba35305
   generation_timestamp: '2025-12-06T23:39:09.545791+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: BE
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Bern
+    city_code: BER
+    city_name: Bern
+    geonames_id: 2661552
+    feature_code: PPLC
+    google_place_id: ChIJgyUZgcU5jkcR6TuTu8aclmk
+    latitude: 46.9431112
+    longitude: 7.449283299999999
+    resolution_date: '2025-12-07T16:39:34.538266+00:00'
   ghcid_history:
   - ghcid: CH-BE-XXX-M-BHM
     ghcid_numeric: 15434770510004317327
     valid_from: '2025-12-06T23:39:09.545791+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:34.538266+00:00'
+  - ghcid: CH-BE-BER-M-BHM
+    ghcid_numeric: 15434770510004317327
+    valid_from: '2025-12-07T16:39:34.538266+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Bern (BE)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Bernisches Historisches Museum
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-BE-XXX-M-BHM
+  identifier_value: CH-BE-BER-M-BHM
 - identifier_scheme: GHCID_UUID
   identifier_value: d3974f5e-ddac-5726-801d-6b4e3b633dec
 - identifier_scheme: GHCID_UUID_SHA256
@@ -99,3 +112,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:09.545791+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJgyUZgcU5jkcR6TuTu8aclmk
+  formatted_address: Helvetiapl. 5, 3005 Bern, Switzerland
+  website: http://www.bhm.ch/
+  latitude: 46.9431112
+  longitude: 7.449283299999999
+  enriched_at: '2025-12-07T16:39:34.538266+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-BL-XXX-L-GO.yaml b/data/custodian/CH-BL-OBE-L-GO.yaml
similarity index 79%
rename from data/custodian/CH-BL-XXX-L-GO.yaml
rename to data/custodian/CH-BL-OBE-L-GO.yaml
index d0e665f860..08569cac44 100644
--- a/data/custodian/CH-BL-XXX-L-GO.yaml
+++ b/data/custodian/CH-BL-OBE-L-GO.yaml
@@ -16,7 +16,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:11.141640+00:00'
 ghcid:
-  ghcid_current: CH-BL-XXX-L-GO
+  ghcid_current: CH-BL-OBE-L-GO
   ghcid_original: CH-BL-XXX-L-GO
   ghcid_uuid: 24b18c95-c2eb-50ad-8216-dec418c0df2b
   ghcid_uuid_sha256: c950ac21-0b12-8f64-9eeb-1ab0be8acb81
@@ -24,22 +24,35 @@ ghcid:
   record_id: c5a63e4c-b8c0-491e-810f-5de68a6e8cdb
   generation_timestamp: '2025-12-06T23:39:11.141640+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: BL
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Basel-Landschaft
+    city_code: OBE
+    city_name: Oberwil
+    geonames_id: 2659321
+    feature_code: PPL
+    google_place_id: ChIJJ87faH3HkUcRkuGciuL7Ie8
+    latitude: 47.514138599999995
+    longitude: 7.5576943
+    resolution_date: '2025-12-07T16:39:35.227984+00:00'
   ghcid_history:
   - ghcid: CH-BL-XXX-L-GO
     ghcid_numeric: 14506283657680039780
     valid_from: '2025-12-06T23:39:11.141640+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:35.227984+00:00'
+  - ghcid: CH-BL-OBE-L-GO
+    ghcid_numeric: 14506283657680039780
+    valid_from: '2025-12-07T16:39:35.227984+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Oberwil (BL)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Gemeindebibliothek Oberwil
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-BL-XXX-L-GO
+  identifier_value: CH-BL-OBE-L-GO
 - identifier_scheme: GHCID_UUID
   identifier_value: 24b18c95-c2eb-50ad-8216-dec418c0df2b
 - identifier_scheme: GHCID_UUID_SHA256
@@ -110,3 +123,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:11.141640+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJJ87faH3HkUcRkuGciuL7Ie8
+  formatted_address: Bahnhofstrasse 6, 4104 Oberwil, Switzerland
+  website: http://www.bibliothek-oberwil.ch/de/
+  latitude: 47.514138599999995
+  longitude: 7.5576943
+  enriched_at: '2025-12-07T16:39:35.227984+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-BS-XXX-L-RUGKFPSB.yaml b/data/custodian/CH-BS-BAS-L-RUGKFPSB.yaml
similarity index 75%
rename from data/custodian/CH-BS-XXX-L-RUGKFPSB.yaml
rename to data/custodian/CH-BS-BAS-L-RUGKFPSB.yaml
index ee869c41c1..77cee3fffc 100644
--- a/data/custodian/CH-BS-XXX-L-RUGKFPSB.yaml
+++ b/data/custodian/CH-BS-BAS-L-RUGKFPSB.yaml
@@ -1,5 +1,6 @@
 original_entry:
-  name: Rheumatologische Universitätsklinik ‒ Geriatrisches Kompetenzzentrum ‒ Felix Platter-Spital ‒ Bibliothek
+  name: Rheumatologische Universitätsklinik ‒ Geriatrisches Kompetenzzentrum ‒ Felix
+    Platter-Spital ‒ Bibliothek
   institution_type: LIBRARY
   source: CH-Annotator (switzerland_isil_ch_annotator.yaml)
   identifiers:
@@ -12,7 +13,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:12.504305+00:00'
 ghcid:
-  ghcid_current: CH-BS-XXX-L-RUGKFPSB
+  ghcid_current: CH-BS-BAS-L-RUGKFPSB
   ghcid_original: CH-BS-XXX-L-RUGKFPSB
   ghcid_uuid: 63ddcbd7-86b3-5bec-9814-cdd1834bea67
   ghcid_uuid_sha256: 9d49cd33-8891-8581-5438-6dcee56d5f5a
@@ -20,22 +21,36 @@ ghcid:
   record_id: 86b9d7a9-fcf1-46e1-a1fd-dca6d14b7afe
   generation_timestamp: '2025-12-06T23:39:12.504305+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: BS
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Basel-City
+    city_code: BAS
+    city_name: Basel
+    geonames_id: 2661604
+    feature_code: PPLA
+    google_place_id: ChIJw3ik7eS5kUcRfy9hgUxL_kM
+    latitude: 47.565455
+    longitude: 7.5652064
+    resolution_date: '2025-12-07T16:39:35.943200+00:00'
   ghcid_history:
   - ghcid: CH-BS-XXX-L-RUGKFPSB
     ghcid_numeric: 11333815558472848769
     valid_from: '2025-12-06T23:39:12.504305+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:35.943200+00:00'
+  - ghcid: CH-BS-BAS-L-RUGKFPSB
+    ghcid_numeric: 11333815558472848769
+    valid_from: '2025-12-07T16:39:35.943200+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Basel (BS)'
 custodian_name:
   claim_type: custodian_name
-  claim_value: Rheumatologische Universitätsklinik ‒ Geriatrisches Kompetenzzentrum ‒ Felix Platter-Spital ‒ Bibliothek
+  claim_value: Rheumatologische Universitätsklinik ‒ Geriatrisches Kompetenzzentrum
+    ‒ Felix Platter-Spital ‒ Bibliothek
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-BS-XXX-L-RUGKFPSB
+  identifier_value: CH-BS-BAS-L-RUGKFPSB
 - identifier_scheme: GHCID_UUID
   identifier_value: 63ddcbd7-86b3-5bec-9814-cdd1834bea67
 - identifier_scheme: GHCID_UUID_SHA256
@@ -82,7 +97,8 @@ ch_annotator:
     verified_by: null
   entity_claims:
   - claim_type: full_name
-    claim_value: Rheumatologische Universitätsklinik ‒ Geriatrisches Kompetenzzentrum ‒ Felix Platter-Spital ‒ Bibliothek
+    claim_value: Rheumatologische Universitätsklinik ‒ Geriatrisches Kompetenzzentrum
+      ‒ Felix Platter-Spital ‒ Bibliothek
     property_uri: skos:prefLabel
     provenance:
       namespace: glam
@@ -105,3 +121,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:12.504305+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJw3ik7eS5kUcRfy9hgUxL_kM
+  formatted_address: Burgfelderstrasse 101, 4055 Basel, Switzerland
+  website: https://www.felixplatter.ch/
+  latitude: 47.565455
+  longitude: 7.5652064
+  enriched_at: '2025-12-07T16:39:35.943200+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-FR-XXX-L-BPS.yaml b/data/custodian/CH-FR-FRI-L-BPS.yaml
similarity index 80%
rename from data/custodian/CH-FR-XXX-L-BPS.yaml
rename to data/custodian/CH-FR-FRI-L-BPS.yaml
index 3a6d124aa0..edfe17e0cc 100644
--- a/data/custodian/CH-FR-XXX-L-BPS.yaml
+++ b/data/custodian/CH-FR-FRI-L-BPS.yaml
@@ -16,7 +16,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:10.017915+00:00'
 ghcid:
-  ghcid_current: CH-FR-XXX-L-BPS
+  ghcid_current: CH-FR-FRI-L-BPS
   ghcid_original: CH-FR-XXX-L-BPS
   ghcid_uuid: ce1d3647-aa17-51ed-9882-f8036d536a98
   ghcid_uuid_sha256: 329bf7fb-230c-804e-14a0-12fd1df9824b
@@ -24,22 +24,35 @@ ghcid:
   record_id: 1b7eed6a-9dfd-457c-9e37-d816cead3149
   generation_timestamp: '2025-12-06T23:39:10.017915+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: FR
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Fribourg
+    city_code: FRI
+    city_name: Fribourg
+    geonames_id: 2660718
+    feature_code: PPLA
+    google_place_id: ChIJxWYePTBpjkcRpxG8owT-D1E
+    latitude: 46.8061679
+    longitude: 7.1586842
+    resolution_date: '2025-12-07T16:39:36.651066+00:00'
   ghcid_history:
   - ghcid: CH-FR-XXX-L-BPS
     ghcid_numeric: 3646780981283397710
     valid_from: '2025-12-06T23:39:10.017915+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:36.651066+00:00'
+  - ghcid: CH-FR-FRI-L-BPS
+    ghcid_numeric: 3646780981283397710
+    valid_from: '2025-12-07T16:39:36.651066+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Fribourg (FR)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Bibliothèque de pédagogie spécialisée
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-FR-XXX-L-BPS
+  identifier_value: CH-FR-FRI-L-BPS
 - identifier_scheme: GHCID_UUID
   identifier_value: ce1d3647-aa17-51ed-9882-f8036d536a98
 - identifier_scheme: GHCID_UUID_SHA256
@@ -110,3 +123,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:10.017915+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJxWYePTBpjkcRpxG8owT-D1E
+  formatted_address: Rue Saint-Pierre Canisius 21, 1700 Fribourg, Switzerland
+  website: http://www.unifr.ch/spedu
+  latitude: 46.8061679
+  longitude: 7.1586842
+  enriched_at: '2025-12-07T16:39:36.651066+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-GE-XXX-A-ACDAV.yaml b/data/custodian/CH-GE-GEN-A-ACDAV.yaml
similarity index 78%
rename from data/custodian/CH-GE-XXX-A-ACDAV.yaml
rename to data/custodian/CH-GE-GEN-A-ACDAV.yaml
index 62a90ca99a..e723712eb2 100644
--- a/data/custodian/CH-GE-XXX-A-ACDAV.yaml
+++ b/data/custodian/CH-GE-GEN-A-ACDAV.yaml
@@ -8,7 +8,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:09.360795+00:00'
 ghcid:
-  ghcid_current: CH-GE-XXX-A-ACDAV
+  ghcid_current: CH-GE-GEN-A-ACDAV
   ghcid_original: CH-GE-XXX-A-ACDAV
   ghcid_uuid: 7659f35d-c97d-5056-8bfa-28d484d93411
   ghcid_uuid_sha256: adba1eb9-82bf-8166-155c-85e8d1cc2146
@@ -16,22 +16,35 @@ ghcid:
   record_id: 52b87bcf-fd31-4330-9845-589d910c63c6
   generation_timestamp: '2025-12-06T23:39:09.360795+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: GE
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Geneva
+    city_code: GEN
+    city_name: Geneve
+    geonames_id: 2660646
+    feature_code: PPLA
+    google_place_id: ChIJT_bFayxljEcRihJ5IgjHkyw
+    latitude: 46.2011513
+    longitude: 6.147125099999999
+    resolution_date: '2025-12-07T16:39:37.469778+00:00'
   ghcid_history:
   - ghcid: CH-GE-XXX-A-ACDAV
     ghcid_numeric: 12518351896341053798
     valid_from: '2025-12-06T23:39:09.360795+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:37.469778+00:00'
+  - ghcid: CH-GE-GEN-A-ACDAV
+    ghcid_numeric: 12518351896341053798
+    valid_from: '2025-12-07T16:39:37.469778+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Geneve (GE)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Archives de la Commune d'Aire-la-Ville
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-GE-XXX-A-ACDAV
+  identifier_value: CH-GE-GEN-A-ACDAV
 - identifier_scheme: GHCID_UUID
   identifier_value: 7659f35d-c97d-5056-8bfa-28d484d93411
 - identifier_scheme: GHCID_UUID_SHA256
@@ -99,3 +112,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:09.360795+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJT_bFayxljEcRihJ5IgjHkyw
+  formatted_address: Rue de l'Hôtel-de-Ville 1, 1204 Genève, Switzerland
+  website: https://archives-etat-ge.ch/
+  latitude: 46.2011513
+  longitude: 6.147125099999999
+  enriched_at: '2025-12-07T16:39:37.469778+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-GE-XXX-A-RTSR.yaml b/data/custodian/CH-GE-GEN-A-RTSR.yaml
similarity index 79%
rename from data/custodian/CH-GE-XXX-A-RTSR.yaml
rename to data/custodian/CH-GE-GEN-A-RTSR.yaml
index 5a7541515d..1d89c9bf7e 100644
--- a/data/custodian/CH-GE-XXX-A-RTSR.yaml
+++ b/data/custodian/CH-GE-GEN-A-RTSR.yaml
@@ -16,7 +16,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:12.466395+00:00'
 ghcid:
-  ghcid_current: CH-GE-XXX-A-RTSR
+  ghcid_current: CH-GE-GEN-A-RTSR
   ghcid_original: CH-GE-XXX-A-RTSR
   ghcid_uuid: e5ff61b0-9a65-593d-a922-87cc876e249c
   ghcid_uuid_sha256: 6ab171dc-40c6-8aa6-399e-048d6c91f653
@@ -24,22 +24,35 @@ ghcid:
   record_id: 4984cc71-91bb-4567-8b26-37e19f66892b
   generation_timestamp: '2025-12-06T23:39:12.466395+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: GE
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Geneva
+    city_code: GEN
+    city_name: Geneve
+    geonames_id: 2660646
+    feature_code: PPLA
+    google_place_id: ChIJQXyfGit7jEcRDAMSLJUCN-Y
+    latitude: 46.1964204
+    longitude: 6.135845799999999
+    resolution_date: '2025-12-07T16:39:38.145277+00:00'
   ghcid_history:
   - ghcid: CH-GE-XXX-A-RTSR
     ghcid_numeric: 7688051229691632294
     valid_from: '2025-12-06T23:39:12.466395+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:38.145277+00:00'
+  - ghcid: CH-GE-GEN-A-RTSR
+    ghcid_numeric: 7688051229691632294
+    valid_from: '2025-12-07T16:39:38.145277+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Geneve (GE)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Radio Télévision Suisse ‒ RTS
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-GE-XXX-A-RTSR
+  identifier_value: CH-GE-GEN-A-RTSR
 - identifier_scheme: GHCID_UUID
   identifier_value: e5ff61b0-9a65-593d-a922-87cc876e249c
 - identifier_scheme: GHCID_UUID_SHA256
@@ -110,3 +123,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:12.466395+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJQXyfGit7jEcRDAMSLJUCN-Y
+  formatted_address: Quai Ernest-Ansermet 20, 1211 Genève, Switzerland
+  website: https://www.rts.ch/entreprise/contact/
+  latitude: 46.1964204
+  longitude: 6.135845799999999
+  enriched_at: '2025-12-07T16:39:38.145277+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-GE-XXX-L-AIMPAMDEGM.yaml b/data/custodian/CH-GE-GEN-L-AIMPAMDEGM.yaml
similarity index 75%
rename from data/custodian/CH-GE-XXX-L-AIMPAMDEGM.yaml
rename to data/custodian/CH-GE-GEN-L-AIMPAMDEGM.yaml
index 4abd0b2829..9e5cd205a7 100644
--- a/data/custodian/CH-GE-XXX-L-AIMPAMDEGM.yaml
+++ b/data/custodian/CH-GE-GEN-L-AIMPAMDEGM.yaml
@@ -1,5 +1,6 @@
 original_entry:
-  name: Archives Internationales de Musique Populaire (AIMP) ‒ Musée d'ethnographie de Genève (MEG)
+  name: Archives Internationales de Musique Populaire (AIMP) ‒ Musée d'ethnographie
+    de Genève (MEG)
   institution_type: LIBRARY
   source: CH-Annotator (switzerland_isil_ch_annotator.yaml)
   identifiers: []
@@ -8,7 +9,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:09.411360+00:00'
 ghcid:
-  ghcid_current: CH-GE-XXX-L-AIMPAMDEGM
+  ghcid_current: CH-GE-GEN-L-AIMPAMDEGM
   ghcid_original: CH-GE-XXX-L-AIMPAMDEGM
   ghcid_uuid: 60a55085-3551-51a2-a41a-d10dff904a8a
   ghcid_uuid_sha256: a93623a1-e0dc-83c3-78c5-e78f28dc1561
@@ -16,22 +17,36 @@ ghcid:
   record_id: a4c45734-085c-4a7e-b3cb-4db300e0f8da
   generation_timestamp: '2025-12-06T23:39:09.411360+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: GE
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Geneva
+    city_code: GEN
+    city_name: Geneve
+    geonames_id: 2660646
+    feature_code: PPLA
+    google_place_id: ChIJ-x4I1yp7jEcR4caYhLz8cgs
+    latitude: 46.1977145
+    longitude: 6.136766499999999
+    resolution_date: '2025-12-07T16:39:38.898516+00:00'
   ghcid_history:
   - ghcid: CH-GE-XXX-L-AIMPAMDEGM
     ghcid_numeric: 12192972219321418691
     valid_from: '2025-12-06T23:39:09.411360+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:38.898516+00:00'
+  - ghcid: CH-GE-GEN-L-AIMPAMDEGM
+    ghcid_numeric: 12192972219321418691
+    valid_from: '2025-12-07T16:39:38.898516+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Geneve (GE)'
 custodian_name:
   claim_type: custodian_name
-  claim_value: Archives Internationales de Musique Populaire (AIMP) ‒ Musée d'ethnographie de Genève (MEG)
+  claim_value: Archives Internationales de Musique Populaire (AIMP) ‒ Musée d'ethnographie
+    de Genève (MEG)
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-GE-XXX-L-AIMPAMDEGM
+  identifier_value: CH-GE-GEN-L-AIMPAMDEGM
 - identifier_scheme: GHCID_UUID
   identifier_value: 60a55085-3551-51a2-a41a-d10dff904a8a
 - identifier_scheme: GHCID_UUID_SHA256
@@ -76,7 +91,8 @@ ch_annotator:
     verified_by: null
   entity_claims:
   - claim_type: full_name
-    claim_value: Archives Internationales de Musique Populaire (AIMP) ‒ Musée d'ethnographie de Genève (MEG)
+    claim_value: Archives Internationales de Musique Populaire (AIMP) ‒ Musée d'ethnographie
+      de Genève (MEG)
     property_uri: skos:prefLabel
     provenance:
       namespace: glam
@@ -99,3 +115,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:09.411360+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ-x4I1yp7jEcR4caYhLz8cgs
+  formatted_address: Bd Carl-Vogt 67, 1205 Genève, Switzerland
+  website: http://www.meg.ch/
+  latitude: 46.1977145
+  longitude: 6.136766499999999
+  enriched_at: '2025-12-07T16:39:38.898516+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-NE-XXX-U-SCSPB.yaml b/data/custodian/CH-GE-GEN-U-SCSPB.yaml
similarity index 78%
rename from data/custodian/CH-NE-XXX-U-SCSPB.yaml
rename to data/custodian/CH-GE-GEN-U-SCSPB.yaml
index 892c6b434f..2dc8a2d64a 100644
--- a/data/custodian/CH-NE-XXX-U-SCSPB.yaml
+++ b/data/custodian/CH-GE-GEN-U-SCSPB.yaml
@@ -12,7 +12,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:12.786121+00:00'
 ghcid:
-  ghcid_current: CH-NE-XXX-U-SCSPB
+  ghcid_current: CH-GE-GEN-U-SCSPB
   ghcid_original: CH-NE-XXX-U-SCSPB
   ghcid_uuid: 72f1fe64-2b70-5cfe-8156-e49994716393
   ghcid_uuid_sha256: 29fd461c-5df5-84bc-9471-74659215a7ec
@@ -20,22 +20,35 @@ ghcid:
   record_id: 59500f06-8b37-444c-84f3-d31dbb71be3c
   generation_timestamp: '2025-12-06T23:39:12.786121+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
-    region_code: NE
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: GE
+    region_name: Geneva
+    city_code: GEN
+    city_name: Geneve
+    geonames_id: 2660646
+    feature_code: PPLA
+    google_place_id: ChIJUR8Y0M96jEcRolWJNBd_pT0
+    latitude: 46.2003954
+    longitude: 6.1556621
+    resolution_date: '2025-12-07T16:39:43.937982+00:00'
   ghcid_history:
   - ghcid: CH-NE-XXX-U-SCSPB
     ghcid_numeric: 3025651612312224956
     valid_from: '2025-12-06T23:39:12.786121+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:43.937982+00:00'
+  - ghcid: CH-GE-GEN-U-SCSPB
+    ghcid_numeric: 3025651612312224956
+    valid_from: '2025-12-07T16:39:43.937982+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Geneve (GE)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Service cantonal de la santé publique ‒ Bibliothèque
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-NE-XXX-U-SCSPB
+  identifier_value: CH-GE-GEN-U-SCSPB
 - identifier_scheme: GHCID_UUID
   identifier_value: 72f1fe64-2b70-5cfe-8156-e49994716393
 - identifier_scheme: GHCID_UUID_SHA256
@@ -105,3 +118,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:12.786121+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJUR8Y0M96jEcRolWJNBd_pT0
+  formatted_address: Rue Adrien-Lachenal 8, 1207 Genève, Switzerland
+  website: https://www.ge.ch/organisation/direction-generale-sante
+  latitude: 46.2003954
+  longitude: 6.1556621
+  enriched_at: '2025-12-07T16:39:43.937982+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-ZG-XXX-L-PSM.yaml b/data/custodian/CH-GR-MAR-L-PSM.yaml
similarity index 78%
rename from data/custodian/CH-ZG-XXX-L-PSM.yaml
rename to data/custodian/CH-GR-MAR-L-PSM.yaml
index 194db2a8ec..62630a8682 100644
--- a/data/custodian/CH-ZG-XXX-L-PSM.yaml
+++ b/data/custodian/CH-GR-MAR-L-PSM.yaml
@@ -12,7 +12,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:12.366152+00:00'
 ghcid:
-  ghcid_current: CH-ZG-XXX-L-PSM
+  ghcid_current: CH-GR-MAR-L-PSM
   ghcid_original: CH-ZG-XXX-L-PSM
   ghcid_uuid: 8792b2c4-a37d-57d7-8080-e7f7ee2745fe
   ghcid_uuid_sha256: 07b050cd-642a-8d73-3694-82a7a5a95f9a
@@ -20,22 +20,35 @@ ghcid:
   record_id: 1ef9c12f-4bbb-465d-a014-f509ff4587e3
   generation_timestamp: '2025-12-06T23:39:12.366152+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
-    region_code: ZG
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: GR
+    region_name: Grisons
+    city_code: MAR
+    city_name: Martina
+    geonames_id: 2659747
+    feature_code: PPL
+    google_place_id: ChIJOyFOWQGkdkcRP5Oms-1cXMM
+    latitude: 47.8577127
+    longitude: 13.349239299999999
+    resolution_date: '2025-12-07T16:39:48.647195+00:00'
   ghcid_history:
   - ghcid: CH-ZG-XXX-L-PSM
     ghcid_numeric: 554031597245594995
     valid_from: '2025-12-06T23:39:12.366152+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:48.647195+00:00'
+  - ghcid: CH-GR-MAR-L-PSM
+    ghcid_numeric: 554031597245594995
+    valid_from: '2025-12-07T16:39:48.647195+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Martina (GR)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Pfarrbibliothek St. Michael
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-ZG-XXX-L-PSM
+  identifier_value: CH-GR-MAR-L-PSM
 - identifier_scheme: GHCID_UUID
   identifier_value: 8792b2c4-a37d-57d7-8080-e7f7ee2745fe
 - identifier_scheme: GHCID_UUID_SHA256
@@ -105,3 +118,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:12.366152+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJOyFOWQGkdkcRP5Oms-1cXMM
+  formatted_address: Schlossweg 1, 5310 Mondsee, Austria
+  website: http://www.buecherei-mondsee.at/
+  latitude: 47.8577127
+  longitude: 13.349239299999999
+  enriched_at: '2025-12-07T16:39:48.647195+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-GR-XXX-U-MCR.yaml b/data/custodian/CH-GR-MVI-U-MCR.yaml
similarity index 79%
rename from data/custodian/CH-GR-XXX-U-MCR.yaml
rename to data/custodian/CH-GR-MVI-U-MCR.yaml
index fef6ad0a1c..a039f026cd 100644
--- a/data/custodian/CH-GR-XXX-U-MCR.yaml
+++ b/data/custodian/CH-GR-MVI-U-MCR.yaml
@@ -12,7 +12,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:11.967499+00:00'
 ghcid:
-  ghcid_current: CH-GR-XXX-U-MCR
+  ghcid_current: CH-GR-MVI-U-MCR
   ghcid_original: CH-GR-XXX-U-MCR
   ghcid_uuid: b5dea6b1-ab24-56c6-a2e2-e0c76c774358
   ghcid_uuid_sha256: 7adc7000-a245-8245-1c6a-420f3cee2bbb
@@ -20,22 +20,35 @@ ghcid:
   record_id: e97a8446-bba4-41d2-9bb3-5bb576d7fbdd
   generation_timestamp: '2025-12-06T23:39:11.967499+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: GR
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Grisons
+    city_code: MVI
+    city_name: Monti Viff
+    geonames_id: 2659604
+    feature_code: PPL
+    google_place_id: ChIJAQAAALBIhEcRk_fWLHb-EM4
+    latitude: 46.218645699999996
+    longitude: 9.1328397
+    resolution_date: '2025-12-07T16:39:40.357082+00:00'
   ghcid_history:
   - ghcid: CH-GR-XXX-U-MCR
     ghcid_numeric: 8853074115528303173
     valid_from: '2025-12-06T23:39:11.967499+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:40.357082+00:00'
+  - ghcid: CH-GR-MVI-U-MCR
+    ghcid_numeric: 8853074115528303173
+    valid_from: '2025-12-07T16:39:40.357082+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Monti Viff (GR)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Mediateca comunale Roveredo
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-GR-XXX-U-MCR
+  identifier_value: CH-GR-MVI-U-MCR
 - identifier_scheme: GHCID_UUID
   identifier_value: b5dea6b1-ab24-56c6-a2e2-e0c76c774358
 - identifier_scheme: GHCID_UUID_SHA256
@@ -105,3 +118,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:11.967499+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJAQAAALBIhEcRk_fWLHb-EM4
+  formatted_address: 6535 Roveredo, Switzerland
+  website: null
+  latitude: 46.218645699999996
+  longitude: 9.1328397
+  enriched_at: '2025-12-07T16:39:40.357082+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-LU-XXX-A-SKL.yaml b/data/custodian/CH-LU-LUZ-A-SKL.yaml
similarity index 80%
rename from data/custodian/CH-LU-XXX-A-SKL.yaml
rename to data/custodian/CH-LU-LUZ-A-SKL.yaml
index 2511f674d6..c9784a6c68 100644
--- a/data/custodian/CH-LU-XXX-A-SKL.yaml
+++ b/data/custodian/CH-LU-LUZ-A-SKL.yaml
@@ -16,7 +16,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:12.886343+00:00'
 ghcid:
-  ghcid_current: CH-LU-XXX-A-SKL
+  ghcid_current: CH-LU-LUZ-A-SKL
   ghcid_original: CH-LU-XXX-A-SKL
   ghcid_uuid: 125c3190-af42-514a-a6c3-58a4d32b74f7
   ghcid_uuid_sha256: 8b879366-0cbc-883d-9e94-654102ef23b7
@@ -24,22 +24,35 @@ ghcid:
   record_id: 92a35d65-7b91-4c4b-9252-0d9e6d22f1a1
   generation_timestamp: '2025-12-06T23:39:12.886343+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: LU
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Lucerne
+    city_code: LUZ
+    city_name: Luzern
+    geonames_id: 2659811
+    feature_code: PPLA
+    google_place_id: ChIJ0-5aNHX7j0cRj0EefCaB1bg
+    latitude: 47.0505164
+    longitude: 8.2998494
+    resolution_date: '2025-12-07T16:39:41.738137+00:00'
   ghcid_history:
   - ghcid: CH-LU-XXX-A-SKL
     ghcid_numeric: 10054166759637571645
     valid_from: '2025-12-06T23:39:12.886343+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:41.738137+00:00'
+  - ghcid: CH-LU-LUZ-A-SKL
+    ghcid_numeric: 10054166759637571645
+    valid_from: '2025-12-07T16:39:41.738137+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Luzern (LU)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Staatsarchiv des Kantons Luzern
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-LU-XXX-A-SKL
+  identifier_value: CH-LU-LUZ-A-SKL
 - identifier_scheme: GHCID_UUID
   identifier_value: 125c3190-af42-514a-a6c3-58a4d32b74f7
 - identifier_scheme: GHCID_UUID_SHA256
@@ -110,3 +123,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:12.886343+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ0-5aNHX7j0cRj0EefCaB1bg
+  formatted_address: Schützenstrasse 9, 6003 Luzern, Switzerland
+  website: https://staatsarchiv.lu.ch/
+  latitude: 47.0505164
+  longitude: 8.2998494
+  enriched_at: '2025-12-07T16:39:41.738137+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-LU-XXX-L-OKLB.yaml b/data/custodian/CH-LU-LUZ-L-OKLB.yaml
similarity index 79%
rename from data/custodian/CH-LU-XXX-L-OKLB.yaml
rename to data/custodian/CH-LU-LUZ-L-OKLB.yaml
index aed63f3a36..b808644e8c 100644
--- a/data/custodian/CH-LU-XXX-L-OKLB.yaml
+++ b/data/custodian/CH-LU-LUZ-L-OKLB.yaml
@@ -12,7 +12,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:12.255595+00:00'
 ghcid:
-  ghcid_current: CH-LU-XXX-L-OKLB
+  ghcid_current: CH-LU-LUZ-L-OKLB
   ghcid_original: CH-LU-XXX-L-OKLB
   ghcid_uuid: 4ae12cc0-6921-5a25-84ae-e85c87cc7766
   ghcid_uuid_sha256: f9c6a9d8-b9f4-8378-e304-6bdc48e628da
@@ -20,22 +20,35 @@ ghcid:
   record_id: 5bbc7084-a8db-4ed3-9100-4c4540c6c80a
   generation_timestamp: '2025-12-06T23:39:12.255595+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: LU
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Lucerne
+    city_code: LUZ
+    city_name: Luzern
+    geonames_id: 2659811
+    feature_code: PPLA
+    google_place_id: ChIJWRjoMaD7j0cRLYyEtaDPsCg
+    latitude: 47.0493908
+    longitude: 8.303801
+    resolution_date: '2025-12-07T16:39:42.433919+00:00'
   ghcid_history:
   - ghcid: CH-LU-XXX-L-OKLB
     ghcid_numeric: 17998259709130580856
     valid_from: '2025-12-06T23:39:12.255595+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:42.433919+00:00'
+  - ghcid: CH-LU-LUZ-L-OKLB
+    ghcid_numeric: 17998259709130580856
+    valid_from: '2025-12-07T16:39:42.433919+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Luzern (LU)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Obergericht des Kantons Luzern ‒ Bibliothek
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-LU-XXX-L-OKLB
+  identifier_value: CH-LU-LUZ-L-OKLB
 - identifier_scheme: GHCID_UUID
   identifier_value: 4ae12cc0-6921-5a25-84ae-e85c87cc7766
 - identifier_scheme: GHCID_UUID_SHA256
@@ -105,3 +118,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:12.255595+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJWRjoMaD7j0cRLYyEtaDPsCg
+  formatted_address: Hirschengraben 16, 6003 Luzern, Switzerland
+  website: https://gerichte.lu.ch/organisation/kantonsgericht
+  latitude: 47.0493908
+  longitude: 8.303801
+  enriched_at: '2025-12-07T16:39:42.433919+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-LU-XXX-A-GH.yaml b/data/custodian/CH-LU-SEM-A-GH.yaml
similarity index 78%
rename from data/custodian/CH-LU-XXX-A-GH.yaml
rename to data/custodian/CH-LU-SEM-A-GH.yaml
index cec97742cb..c323a59909 100644
--- a/data/custodian/CH-LU-XXX-A-GH.yaml
+++ b/data/custodian/CH-LU-SEM-A-GH.yaml
@@ -12,7 +12,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:11.099837+00:00'
 ghcid:
-  ghcid_current: CH-LU-XXX-A-GH
+  ghcid_current: CH-LU-SEM-A-GH
   ghcid_original: CH-LU-XXX-A-GH
   ghcid_uuid: 9bfbd92f-27f1-5639-aca4-5edb4172279f
   ghcid_uuid_sha256: 005a6408-cb95-8367-7674-bda51a154f77
@@ -20,22 +20,35 @@ ghcid:
   record_id: 90cdb746-50d2-4488-9eb2-a44d4744e1b1
   generation_timestamp: '2025-12-06T23:39:11.099837+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: LU
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Lucerne
+    city_code: SEM
+    city_name: Sempach
+    geonames_id: 2658631
+    feature_code: PPL
+    google_place_id: ChIJddnPghjij0cRlLg77JAMMK8
+    latitude: 47.136731499999996
+    longitude: 8.1909986
+    resolution_date: '2025-12-07T16:39:41.051515+00:00'
   ghcid_history:
   - ghcid: CH-LU-XXX-A-GH
     ghcid_numeric: 25442736842031975
     valid_from: '2025-12-06T23:39:11.099837+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:41.051515+00:00'
+  - ghcid: CH-LU-SEM-A-GH
+    ghcid_numeric: 25442736842031975
+    valid_from: '2025-12-07T16:39:41.051515+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Sempach (LU)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Gemeindearchiv Hildisrieden
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-LU-XXX-A-GH
+  identifier_value: CH-LU-SEM-A-GH
 - identifier_scheme: GHCID_UUID
   identifier_value: 9bfbd92f-27f1-5639-aca4-5edb4172279f
 - identifier_scheme: GHCID_UUID_SHA256
@@ -105,3 +118,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:11.099837+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJddnPghjij0cRlLg77JAMMK8
+  formatted_address: Stadtstrasse 8, 6204 Sempach, Switzerland
+  website: https://www.sempach.ch/aemter/13722
+  latitude: 47.136731499999996
+  longitude: 8.1909986
+  enriched_at: '2025-12-07T16:39:41.051515+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-NE-XXX-L-BPN.yaml b/data/custodian/CH-NE-NEU-L-BPN.yaml
similarity index 79%
rename from data/custodian/CH-NE-XXX-L-BPN.yaml
rename to data/custodian/CH-NE-NEU-L-BPN.yaml
index 81eb3c8633..db137d38e2 100644
--- a/data/custodian/CH-NE-XXX-L-BPN.yaml
+++ b/data/custodian/CH-NE-NEU-L-BPN.yaml
@@ -12,7 +12,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:10.150633+00:00'
 ghcid:
-  ghcid_current: CH-NE-XXX-L-BPN
+  ghcid_current: CH-NE-NEU-L-BPN
   ghcid_original: CH-NE-XXX-L-BPN
   ghcid_uuid: ba4f3488-ae04-568c-8817-99017070f02b
   ghcid_uuid_sha256: 18b2275b-6db8-8ae4-c190-25a12f436af2
@@ -20,22 +20,35 @@ ghcid:
   record_id: 1f4e398c-f2df-4a20-ae93-674e0c250a62
   generation_timestamp: '2025-12-06T23:39:10.150633+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: NE
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Neuchâtel
+    city_code: NEU
+    city_name: Neuchatel
+    geonames_id: 2659496
+    feature_code: PPLA
+    google_place_id: ChIJrfxxWBEKjkcRIchyDN69dss
+    latitude: 46.9912345
+    longitude: 6.9304261
+    resolution_date: '2025-12-07T16:39:43.201842+00:00'
   ghcid_history:
   - ghcid: CH-NE-XXX-L-BPN
     ghcid_numeric: 1779528076401081060
     valid_from: '2025-12-06T23:39:10.150633+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:43.201842+00:00'
+  - ghcid: CH-NE-NEU-L-BPN
+    ghcid_numeric: 1779528076401081060
+    valid_from: '2025-12-07T16:39:43.201842+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Neuchatel (NE)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Bibliothèque publique de Neuchâtel
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-NE-XXX-L-BPN
+  identifier_value: CH-NE-NEU-L-BPN
 - identifier_scheme: GHCID_UUID
   identifier_value: ba4f3488-ae04-568c-8817-99017070f02b
 - identifier_scheme: GHCID_UUID_SHA256
@@ -105,3 +118,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:10.150633+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJrfxxWBEKjkcRIchyDN69dss
+  formatted_address: Rue Saint-Maurice 4, 2000 Neuchâtel, Switzerland
+  website: http://www.bpun.ch/
+  latitude: 46.9912345
+  longitude: 6.9304261
+  enriched_at: '2025-12-07T16:39:43.201842+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-SG-XXX-L-LABD.yaml b/data/custodian/CH-SH-BAR-L-LABD.yaml
similarity index 79%
rename from data/custodian/CH-SG-XXX-L-LABD.yaml
rename to data/custodian/CH-SH-BAR-L-LABD.yaml
index 8c7658cb01..7b6e58906c 100644
--- a/data/custodian/CH-SG-XXX-L-LABD.yaml
+++ b/data/custodian/CH-SH-BAR-L-LABD.yaml
@@ -12,7 +12,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:11.889212+00:00'
 ghcid:
-  ghcid_current: CH-SG-XXX-L-LABD
+  ghcid_current: CH-SH-BAR-L-LABD
   ghcid_original: CH-SG-XXX-L-LABD
   ghcid_uuid: f42222c8-7101-5f40-ac93-5c8723e3cbb7
   ghcid_uuid_sha256: 203cfd05-cf70-8e2e-2184-888967f1ed9b
@@ -20,22 +20,35 @@ ghcid:
   record_id: 18164a6e-37ad-4acb-89c2-6c8f87bc45ee
   generation_timestamp: '2025-12-06T23:39:11.889212+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
-    region_code: SG
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: SH
+    region_name: Schaffhausen
+    city_code: BAR
+    city_name: Bargen
+    geonames_id: 6695943
+    feature_code: PPL
+    google_place_id: ChIJmfS1iwtbvEcRXw90jI8wHos
+    latitude: 50.5527416
+    longitude: 8.5356831
+    resolution_date: '2025-12-07T16:39:44.774469+00:00'
   ghcid_history:
   - ghcid: CH-SG-XXX-L-LABD
     ghcid_numeric: 2323009709213273646
     valid_from: '2025-12-06T23:39:11.889212+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:44.774469+00:00'
+  - ghcid: CH-SH-BAR-L-LABD
+    ghcid_numeric: 2323009709213273646
+    valid_from: '2025-12-07T16:39:44.774469+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Bargen (SH)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Leica AG ‒ Bibliothek und Dokumentation
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-SG-XXX-L-LABD
+  identifier_value: CH-SH-BAR-L-LABD
 - identifier_scheme: GHCID_UUID
   identifier_value: f42222c8-7101-5f40-ac93-5c8723e3cbb7
 - identifier_scheme: GHCID_UUID_SHA256
@@ -105,3 +118,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:11.889212+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJmfS1iwtbvEcRXw90jI8wHos
+  formatted_address: Am Leitz-Park 6, 35578 Wetzlar, Germany
+  website: https://leica-welt.com/
+  latitude: 50.5527416
+  longitude: 8.5356831
+  enriched_at: '2025-12-07T16:39:44.774469+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-TI-XXX-A-ASCT.yaml b/data/custodian/CH-TI-BEL-A-ASCT.yaml
similarity index 78%
rename from data/custodian/CH-TI-XXX-A-ASCT.yaml
rename to data/custodian/CH-TI-BEL-A-ASCT.yaml
index 3802ab346c..e003ae8f4e 100644
--- a/data/custodian/CH-TI-XXX-A-ASCT.yaml
+++ b/data/custodian/CH-TI-BEL-A-ASCT.yaml
@@ -8,7 +8,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:09.429173+00:00'
 ghcid:
-  ghcid_current: CH-TI-XXX-A-ASCT
+  ghcid_current: CH-TI-BEL-A-ASCT
   ghcid_original: CH-TI-XXX-A-ASCT
   ghcid_uuid: cb1e70bd-06dc-5bfd-965d-efe38e68fc77
   ghcid_uuid_sha256: 93e14ced-73e3-84a6-fc63-ab6fb7944a69
@@ -16,22 +16,35 @@ ghcid:
   record_id: 2b520ae1-3e84-49c9-aa83-03a22ea7b982
   generation_timestamp: '2025-12-06T23:39:09.429173+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: TI
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Ticino
+    city_code: BEL
+    city_name: Bellinzona
+    geonames_id: 2661567
+    feature_code: PPLA
+    google_place_id: ChIJN-S8OUlKhEcRHOmzn46lcJg
+    latitude: 46.1930522
+    longitude: 9.0127393
+    resolution_date: '2025-12-07T16:39:46.330980+00:00'
   ghcid_history:
   - ghcid: CH-TI-XXX-A-ASCT
     ghcid_numeric: 10655882776070579366
     valid_from: '2025-12-06T23:39:09.429173+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:46.330980+00:00'
+  - ghcid: CH-TI-BEL-A-ASCT
+    ghcid_numeric: 10655882776070579366
+    valid_from: '2025-12-07T16:39:46.330980+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Bellinzona (TI)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Archivio di Stato del Cantone Ticino
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-TI-XXX-A-ASCT
+  identifier_value: CH-TI-BEL-A-ASCT
 - identifier_scheme: GHCID_UUID
   identifier_value: cb1e70bd-06dc-5bfd-965d-efe38e68fc77
 - identifier_scheme: GHCID_UUID_SHA256
@@ -99,3 +112,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:09.429173+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJN-S8OUlKhEcRHOmzn46lcJg
+  formatted_address: Viale Stefano Franscini 30A, 6501 Bellinzona, Switzerland
+  website: https://www.ti.ch/archivio
+  latitude: 46.1930522
+  longitude: 9.0127393
+  enriched_at: '2025-12-07T16:39:46.330980+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-TI-XXX-A-AP.yaml b/data/custodian/CH-TI-RUV-A-AP.yaml
similarity index 77%
rename from data/custodian/CH-TI-XXX-A-AP.yaml
rename to data/custodian/CH-TI-RUV-A-AP.yaml
index 60c24dc1c6..e292cf89b0 100644
--- a/data/custodian/CH-TI-XXX-A-AP.yaml
+++ b/data/custodian/CH-TI-RUV-A-AP.yaml
@@ -8,7 +8,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:09.433315+00:00'
 ghcid:
-  ghcid_current: CH-TI-XXX-A-AP
+  ghcid_current: CH-TI-RUV-A-AP
   ghcid_original: CH-TI-XXX-A-AP
   ghcid_uuid: e3910030-7c80-5721-a5a3-b07941153d09
   ghcid_uuid_sha256: 17ed535c-ab7c-8921-6e26-5a7fe3f58baa
@@ -16,22 +16,35 @@ ghcid:
   record_id: fee37653-4473-4e19-938b-1f3bca1a6236
   generation_timestamp: '2025-12-06T23:39:09.433315+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: TI
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Ticino
+    city_code: RUV
+    city_name: Ruvigliana
+    geonames_id: 8469275
+    feature_code: PPL
+    google_place_id: ChIJ72y-5_wthEcRp_j2kLbuSt4
+    latitude: 46.001231499999996
+    longitude: 8.9781031
+    resolution_date: '2025-12-07T16:39:45.562002+00:00'
   ghcid_history:
   - ghcid: CH-TI-XXX-A-AP
     ghcid_numeric: 1724125889831905569
     valid_from: '2025-12-06T23:39:09.433315+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:45.562002+00:00'
+  - ghcid: CH-TI-RUV-A-AP
+    ghcid_numeric: 1724125889831905569
+    valid_from: '2025-12-07T16:39:45.562002+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Ruvigliana (TI)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Archivio Prezzolini
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-TI-XXX-A-AP
+  identifier_value: CH-TI-RUV-A-AP
 - identifier_scheme: GHCID_UUID
   identifier_value: e3910030-7c80-5721-a5a3-b07941153d09
 - identifier_scheme: GHCID_UUID_SHA256
@@ -99,3 +112,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:09.433315+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ72y-5_wthEcRp_j2kLbuSt4
+  formatted_address: Piazza Carlo Cattaneo 1, 6976 Lugano, Switzerland
+  website: http://www.archiviostoricolugano.ch/
+  latitude: 46.001231499999996
+  longitude: 8.9781031
+  enriched_at: '2025-12-07T16:39:45.562002+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-VD-XXX-L-BGB.yaml b/data/custodian/CH-VD-BUS-L-BGB.yaml
similarity index 79%
rename from data/custodian/CH-VD-XXX-L-BGB.yaml
rename to data/custodian/CH-VD-BUS-L-BGB.yaml
index 2e3dd7280d..8b04c5ecef 100644
--- a/data/custodian/CH-VD-XXX-L-BGB.yaml
+++ b/data/custodian/CH-VD-BUS-L-BGB.yaml
@@ -16,7 +16,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:10.085114+00:00'
 ghcid:
-  ghcid_current: CH-VD-XXX-L-BGB
+  ghcid_current: CH-VD-BUS-L-BGB
   ghcid_original: CH-VD-XXX-L-BGB
   ghcid_uuid: 0ed6f48b-0d72-594a-a7cb-4e905d73c049
   ghcid_uuid_sha256: ad0829f8-bda3-8c1f-cb9d-100a4db7a810
@@ -24,22 +24,35 @@ ghcid:
   record_id: e409a462-8cbf-4f52-87da-ef129aa6783b
   generation_timestamp: '2025-12-06T23:39:10.085114+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: VD
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Vaud
+    city_code: BUS
+    city_name: Bussigny
+    geonames_id: 2661305
+    feature_code: PPL
+    google_place_id: ChIJx-ELsFwxjEcRqftnan417PI
+    latitude: 46.5512426
+    longitude: 6.552162699999999
+    resolution_date: '2025-12-07T16:39:47.106021+00:00'
   ghcid_history:
   - ghcid: CH-VD-XXX-L-BGB
     ghcid_numeric: 12468261716685442079
     valid_from: '2025-12-06T23:39:10.085114+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:47.106021+00:00'
+  - ghcid: CH-VD-BUS-L-BGB
+    ghcid_numeric: 12468261716685442079
+    valid_from: '2025-12-07T16:39:47.106021+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Bussigny (VD)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Bibliothèque du Gymnase de Bussigny
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-VD-XXX-L-BGB
+  identifier_value: CH-VD-BUS-L-BGB
 - identifier_scheme: GHCID_UUID
   identifier_value: 0ed6f48b-0d72-594a-a7cb-4e905d73c049
 - identifier_scheme: GHCID_UUID_SHA256
@@ -110,3 +123,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:10.085114+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJx-ELsFwxjEcRqftnan417PI
+  formatted_address: Rue des Collèges 2B, 1030 Bussigny, Switzerland
+  website: https://biblio.bussigny.ch/
+  latitude: 46.5512426
+  longitude: 6.552162699999999
+  enriched_at: '2025-12-07T16:39:47.106021+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-GE-XXX-L-M.yaml b/data/custodian/CH-VS-VIS-L-M.yaml
similarity index 79%
rename from data/custodian/CH-GE-XXX-L-M.yaml
rename to data/custodian/CH-VS-VIS-L-M.yaml
index 32b2cf868f..f6e5a36522 100644
--- a/data/custodian/CH-GE-XXX-L-M.yaml
+++ b/data/custodian/CH-VS-VIS-L-M.yaml
@@ -16,7 +16,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:11.871185+00:00'
 ghcid:
-  ghcid_current: CH-GE-XXX-L-M
+  ghcid_current: CH-VS-VIS-L-M
   ghcid_original: CH-GE-XXX-L-M
   ghcid_uuid: 48de1149-1071-562b-9b44-3cc0a7f2ea11
   ghcid_uuid_sha256: 17a244f2-b9e0-8f73-281f-de9ec09083f0
@@ -24,22 +24,35 @@ ghcid:
   record_id: 82bd8bc3-08fa-4472-bcd4-767dea7a48df
   generation_timestamp: '2025-12-06T23:39:11.871185+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
-    region_code: GE
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: VS
+    region_name: Valais
+    city_code: VIS
+    city_name: Vissoie
+    geonames_id: 2658108
+    feature_code: PPL
+    google_place_id: ChIJ3eN_NOMfj0cRn3AnOXbsPG4
+    latitude: 46.2155361
+    longitude: 7.585176400000001
+    resolution_date: '2025-12-07T16:39:39.711640+00:00'
   ghcid_history:
   - ghcid: CH-GE-XXX-L-M
     ghcid_numeric: 1702999418390728563
     valid_from: '2025-12-06T23:39:11.871185+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:39.711640+00:00'
+  - ghcid: CH-VS-VIS-L-M
+    ghcid_numeric: 1702999418390728563
+    valid_from: '2025-12-07T16:39:39.711640+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Vissoie (VS)'
 custodian_name:
   claim_type: custodian_name
   claim_value: La Musicale
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-GE-XXX-L-M
+  identifier_value: CH-VS-VIS-L-M
 - identifier_scheme: GHCID_UUID
   identifier_value: 48de1149-1071-562b-9b44-3cc0a7f2ea11
 - identifier_scheme: GHCID_UUID_SHA256
@@ -110,3 +123,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:11.871185+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ3eN_NOMfj0cRn3AnOXbsPG4
+  formatted_address: Rte des Landoux 4, 3961 Vissoie, Switzerland
+  website: http://www.lamusicale.ch/
+  latitude: 46.2155361
+  longitude: 7.585176400000001
+  enriched_at: '2025-12-07T16:39:39.711640+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-ZH-XXX-L-ZHZBSA.yaml b/data/custodian/CH-ZH-BAE-L-ZHZBSA.yaml
similarity index 79%
rename from data/custodian/CH-ZH-XXX-L-ZHZBSA.yaml
rename to data/custodian/CH-ZH-BAE-L-ZHZBSA.yaml
index 52cf139a03..a3c1d558eb 100644
--- a/data/custodian/CH-ZH-XXX-L-ZHZBSA.yaml
+++ b/data/custodian/CH-ZH-BAE-L-ZHZBSA.yaml
@@ -12,7 +12,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:13.826314+00:00'
 ghcid:
-  ghcid_current: CH-ZH-XXX-L-ZHZBSA
+  ghcid_current: CH-ZH-BAE-L-ZHZBSA
   ghcid_original: CH-ZH-XXX-L-ZHZBSA
   ghcid_uuid: 37640f69-4138-55ac-8f03-5c0f569fd83b
   ghcid_uuid_sha256: 26efe46f-dc52-8903-c6a9-3f2241a52037
@@ -20,22 +20,35 @@ ghcid:
   record_id: 9b542257-45ab-4c92-8a57-21c461c534a4
   generation_timestamp: '2025-12-06T23:39:13.826314+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: ZH
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Zurich
+    city_code: BAE
+    city_name: Baerenbohl
+    geonames_id: 6291739
+    feature_code: PPL
+    google_place_id: ChIJUX4AEQKhmkcRWrQy1laHKWE
+    latitude: 47.3907661
+    longitude: 8.5122985
+    resolution_date: '2025-12-07T16:39:50.882618+00:00'
   ghcid_history:
   - ghcid: CH-ZH-XXX-L-ZHZBSA
     ghcid_numeric: 2805712261964028163
     valid_from: '2025-12-06T23:39:13.826314+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:50.882618+00:00'
+  - ghcid: CH-ZH-BAE-L-ZHZBSA
+    ghcid_numeric: 2805712261964028163
+    valid_from: '2025-12-07T16:39:50.882618+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Baerenbohl (ZH)'
 custodian_name:
   claim_type: custodian_name
   claim_value: ZHAW Hochschulbibliothek Zürich ‒ Bibliothek Soziale Arbeit
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-ZH-XXX-L-ZHZBSA
+  identifier_value: CH-ZH-BAE-L-ZHZBSA
 - identifier_scheme: GHCID_UUID
   identifier_value: 37640f69-4138-55ac-8f03-5c0f569fd83b
 - identifier_scheme: GHCID_UUID_SHA256
@@ -105,3 +118,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:13.826314+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJUX4AEQKhmkcRWrQy1laHKWE
+  formatted_address: Pfingstweidstrasse 96, 8037 Zürich, Switzerland
+  website: https://www.zhaw.ch/hsb
+  latitude: 47.3907661
+  longitude: 8.5122985
+  enriched_at: '2025-12-07T16:39:50.882618+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-VS-XXX-L-SGBU.yaml b/data/custodian/CH-ZH-OBE-L-SGBU.yaml
similarity index 78%
rename from data/custodian/CH-VS-XXX-L-SGBU.yaml
rename to data/custodian/CH-ZH-OBE-L-SGBU.yaml
index 523f147456..b824da4001 100644
--- a/data/custodian/CH-VS-XXX-L-SGBU.yaml
+++ b/data/custodian/CH-ZH-OBE-L-SGBU.yaml
@@ -12,7 +12,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:12.552224+00:00'
 ghcid:
-  ghcid_current: CH-VS-XXX-L-SGBU
+  ghcid_current: CH-ZH-OBE-L-SGBU
   ghcid_original: CH-VS-XXX-L-SGBU
   ghcid_uuid: cdf7b471-1de5-5841-8598-479fa81d71e0
   ghcid_uuid_sha256: 50b4a4b5-69d0-8709-3865-a55fbee4e255
@@ -20,22 +20,35 @@ ghcid:
   record_id: 9d3350cc-7cb2-440b-bad5-13986d2f5404
   generation_timestamp: '2025-12-06T23:39:12.552224+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
-    region_code: VS
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: ZH
+    region_name: Zurich
+    city_code: OBE
+    city_name: Oberembrach
+    geonames_id: 2659396
+    feature_code: PPL
+    google_place_id: ChIJI3_Yz1CemkcRHv6zg9DNf1s
+    latitude: 47.487266299999995
+    longitude: 8.6189887
+    resolution_date: '2025-12-07T16:39:47.911660+00:00'
   ghcid_history:
   - ghcid: CH-VS-XXX-L-SGBU
     ghcid_numeric: 5815454117913483017
     valid_from: '2025-12-06T23:39:12.552224+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:47.911660+00:00'
+  - ghcid: CH-ZH-OBE-L-SGBU
+    ghcid_numeric: 5815454117913483017
+    valid_from: '2025-12-07T16:39:47.911660+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Oberembrach (ZH)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Schul- und Gemeinde Bibliothek Unterbäch
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-VS-XXX-L-SGBU
+  identifier_value: CH-ZH-OBE-L-SGBU
 - identifier_scheme: GHCID_UUID
   identifier_value: cdf7b471-1de5-5841-8598-479fa81d71e0
 - identifier_scheme: GHCID_UUID_SHA256
@@ -105,3 +118,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:12.552224+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJI3_Yz1CemkcRHv6zg9DNf1s
+  formatted_address: Jakob Bosshart-Strasse 1, 8425 Oberembrach, Switzerland
+  website: null
+  latitude: 47.487266299999995
+  longitude: 8.6189887
+  enriched_at: '2025-12-07T16:39:47.911660+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-ZH-XXX-L-UZEIEB.yaml b/data/custodian/CH-ZH-ZUE-L-UZEIEB.yaml
similarity index 79%
rename from data/custodian/CH-ZH-XXX-L-UZEIEB.yaml
rename to data/custodian/CH-ZH-ZUE-L-UZEIEB.yaml
index a1675e306a..18845e8562 100644
--- a/data/custodian/CH-ZH-XXX-L-UZEIEB.yaml
+++ b/data/custodian/CH-ZH-ZUE-L-UZEIEB.yaml
@@ -16,7 +16,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:13.378824+00:00'
 ghcid:
-  ghcid_current: CH-ZH-XXX-L-UZEIEB
+  ghcid_current: CH-ZH-ZUE-L-UZEIEB
   ghcid_original: CH-ZH-XXX-L-UZEIEB
   ghcid_uuid: 83ff1626-5f5d-5c31-88c7-1998abffd003
   ghcid_uuid_sha256: d4d3f017-a289-821c-5e26-ed0dea5b119f
@@ -24,22 +24,35 @@ ghcid:
   record_id: 1670fd72-ab77-49ce-b556-629d7d1af9bf
   generation_timestamp: '2025-12-06T23:39:13.378824+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: ZH
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Zurich
+    city_code: ZUE
+    city_name: Zuerich
+    geonames_id: 2657896
+    feature_code: PPLA
+    google_place_id: ChIJNYQzi6igmkcRaS9ubm3qDoA
+    latitude: 47.356649499999996
+    longitude: 8.551785299999999
+    resolution_date: '2025-12-07T16:39:49.408908+00:00'
   ghcid_history:
   - ghcid: CH-ZH-XXX-L-UZEIEB
     ghcid_numeric: 15335865140428522012
     valid_from: '2025-12-06T23:39:13.378824+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:49.408908+00:00'
+  - ghcid: CH-ZH-ZUE-L-UZEIEB
+    ghcid_numeric: 15335865140428522012
+    valid_from: '2025-12-07T16:39:49.408908+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Zuerich (ZH)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Universität Zürich ‒ Europa Institut (EIZ) ‒ Bibliothek
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-ZH-XXX-L-UZEIEB
+  identifier_value: CH-ZH-ZUE-L-UZEIEB
 - identifier_scheme: GHCID_UUID
   identifier_value: 83ff1626-5f5d-5c31-88c7-1998abffd003
 - identifier_scheme: GHCID_UUID_SHA256
@@ -110,3 +123,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:13.378824+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJNYQzi6igmkcRaS9ubm3qDoA
+  formatted_address: Bellerivestrasse 49, 8008 Zürich, Switzerland
+  website: https://www.eiz.uzh.ch/
+  latitude: 47.356649499999996
+  longitude: 8.551785299999999
+  enriched_at: '2025-12-07T16:39:49.408908+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CH-ZH-XXX-L-UZPB-universitatsbibliothek_zurich_phonetik_bibliothek.yaml b/data/custodian/CH-ZH-ZUE-L-UZPB-universitatsbibliothek_zurich_phonetik_bibliothek.yaml
similarity index 79%
rename from data/custodian/CH-ZH-XXX-L-UZPB-universitatsbibliothek_zurich_phonetik_bibliothek.yaml
rename to data/custodian/CH-ZH-ZUE-L-UZPB-universitatsbibliothek_zurich_phonetik_bibliothek.yaml
index 28c6646e14..708b0f3404 100644
--- a/data/custodian/CH-ZH-XXX-L-UZPB-universitatsbibliothek_zurich_phonetik_bibliothek.yaml
+++ b/data/custodian/CH-ZH-ZUE-L-UZPB-universitatsbibliothek_zurich_phonetik_bibliothek.yaml
@@ -16,7 +16,7 @@ original_entry:
     country: CH
 processing_timestamp: '2025-12-06T23:39:13.579881+00:00'
 ghcid:
-  ghcid_current: CH-ZH-XXX-L-UZPB-universitatsbibliothek_zurich_phonetik_bibliothek
+  ghcid_current: CH-ZH-ZUE-L-UZPB-universitatsbibliothek_zurich_phonetik_bibliothek
   ghcid_original: CH-ZH-XXX-L-UZPB-universitatsbibliothek_zurich_phonetik_bibliothek
   ghcid_uuid: e4f6836f-5be0-5fa3-842a-4ed7e45df6ee
   ghcid_uuid_sha256: 5a601f7b-807a-8714-9c89-654a89e3daa3
@@ -24,22 +24,35 @@ ghcid:
   record_id: 95dff0dd-df66-4c21-9877-b72ad9f88da9
   generation_timestamp: '2025-12-06T23:39:13.579881+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CH
     region_code: ZH
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_name: Zurich
+    city_code: ZUE
+    city_name: Zuerich
+    geonames_id: 2657896
+    feature_code: PPLA
+    google_place_id: ChIJx9LrUaigmkcREZh-0CZzhxo
+    latitude: 47.374138099999996
+    longitude: 8.5449067
+    resolution_date: '2025-12-07T16:39:50.160087+00:00'
   ghcid_history:
   - ghcid: CH-ZH-XXX-L-UZPB-universitatsbibliothek_zurich_phonetik_bibliothek
     ghcid_numeric: 6512239676474713876
     valid_from: '2025-12-06T23:39:13.579881+00:00'
     reason: Initial GHCID from CH-Annotator (switzerland_isil_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:39:50.160087+00:00'
+  - ghcid: CH-ZH-ZUE-L-UZPB-universitatsbibliothek_zurich_phonetik_bibliothek
+    ghcid_numeric: 6512239676474713876
+    valid_from: '2025-12-07T16:39:50.160087+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Zuerich (ZH)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Universitätsbibliothek Zürich ‒ Phonetik ‒ Bibliothek
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CH-ZH-XXX-L-UZPB-universitatsbibliothek_zurich_phonetik_bibliothek
+  identifier_value: CH-ZH-ZUE-L-UZPB-universitatsbibliothek_zurich_phonetik_bibliothek
 - identifier_scheme: GHCID_UUID
   identifier_value: e4f6836f-5be0-5fa3-842a-4ed7e45df6ee
 - identifier_scheme: GHCID_UUID_SHA256
@@ -110,3 +123,11 @@ ch_annotator:
     created_from: switzerland_isil_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:13.579881+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJx9LrUaigmkcREZh-0CZzhxo
+  formatted_address: Zähringerpl. 6, 8001 Zürich, Switzerland
+  website: https://www.zb.uzh.ch/
+  latitude: 47.374138099999996
+  longitude: 8.5449067
+  enriched_at: '2025-12-07T16:39:50.160087+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CL-TA-XXX-A-DA.yaml b/data/custodian/CL-AP-GUA-A-DA.yaml
similarity index 83%
rename from data/custodian/CL-TA-XXX-A-DA.yaml
rename to data/custodian/CL-AP-GUA-A-DA.yaml
index 55becef41c..5a71f7caf7 100644
--- a/data/custodian/CL-TA-XXX-A-DA.yaml
+++ b/data/custodian/CL-AP-GUA-A-DA.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: CL
 processing_timestamp: '2025-12-06T23:39:01.901519+00:00'
 ghcid:
-  ghcid_current: CL-TA-XXX-A-DA
+  ghcid_current: CL-AP-GUA-A-DA
   ghcid_original: CL-TA-XXX-A-DA
   ghcid_uuid: 3b132478-f28c-5178-aa35-c5b7efd28a0a
   ghcid_uuid_sha256: c5ff01c9-e2dc-81e1-4ccd-940141218a49
@@ -35,22 +35,35 @@ ghcid:
   record_id: 11ba9af8-ee86-4d8c-a6b4-263e76e21672
   generation_timestamp: '2025-12-06T23:39:01.901519+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CL
-    region_code: TA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: AP
+    region_name: Tarapacá
+    city_code: GUA
+    city_name: Guailla
+    geonames_id: 3888600
+    feature_code: PPL
+    google_place_id: ChIJUZX-bUT-Lg0RGeTjpNrWlTU
+    latitude: 42.8814701
+    longitude: -8.5439332
+    resolution_date: '2025-12-07T16:40:43.090933+00:00'
   ghcid_history:
   - ghcid: CL-TA-XXX-A-DA
     ghcid_numeric: 14267124111139144161
     valid_from: '2025-12-06T23:39:01.901519+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:43.090933+00:00'
+  - ghcid: CL-AP-GUA-A-DA
+    ghcid_numeric: 14267124111139144161
+    valid_from: '2025-12-07T16:40:43.090933+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Guailla (AP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Diócesis archives
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CL-TA-XXX-A-DA
+  identifier_value: CL-AP-GUA-A-DA
 - identifier_scheme: GHCID_UUID
   identifier_value: 3b132478-f28c-5178-aa35-c5b7efd28a0a
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.901519+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJUZX-bUT-Lg0RGeTjpNrWlTU
+  formatted_address: Praza da Inmaculada, 5, 15704 Santiago de Compostela, A Coruña,
+    Spain
+  website: http://ahds.es/
+  latitude: 42.8814701
+  longitude: -8.5439332
+  enriched_at: '2025-12-07T16:40:43.090933+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CL-CO-XXX-A-EA.yaml b/data/custodian/CL-AP-GUA-A-EA.yaml
similarity index 83%
rename from data/custodian/CL-CO-XXX-A-EA.yaml
rename to data/custodian/CL-AP-GUA-A-EA.yaml
index db5c7d3bf5..963dfc70a6 100644
--- a/data/custodian/CL-CO-XXX-A-EA.yaml
+++ b/data/custodian/CL-AP-GUA-A-EA.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: CL
 processing_timestamp: '2025-12-06T23:39:01.933705+00:00'
 ghcid:
-  ghcid_current: CL-CO-XXX-A-EA
+  ghcid_current: CL-AP-GUA-A-EA
   ghcid_original: CL-CO-XXX-A-EA
   ghcid_uuid: fbc04d8a-3229-5e9a-b500-b8021b8fce58
   ghcid_uuid_sha256: fb930341-d540-87cd-5b7b-844eac84b787
@@ -35,22 +35,35 @@ ghcid:
   record_id: eb23c0c6-60d2-4deb-a135-1bb30a27505e
   generation_timestamp: '2025-12-06T23:39:01.933705+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CL
-    region_code: CO
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: AP
+    region_name: Tarapacá
+    city_code: GUA
+    city_name: Guailla
+    geonames_id: 3888600
+    feature_code: PPL
+    google_place_id: ChIJJ8KEHpBolWwRVsE__7NULYQ
+    latitude: 52.637026399999996
+    longitude: 5.8285312
+    resolution_date: '2025-12-07T16:40:39.829581+00:00'
   ghcid_history:
   - ghcid: CL-CO-XXX-A-EA
     ghcid_numeric: 18127836506381907917
     valid_from: '2025-12-06T23:39:01.933705+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:39.829581+00:00'
+  - ghcid: CL-AP-GUA-A-EA
+    ghcid_numeric: 18127836506381907917
+    valid_from: '2025-12-07T16:40:39.829581+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Guailla (AP)'
 custodian_name:
   claim_type: custodian_name
   claim_value: ENACAR archives
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CL-CO-XXX-A-EA
+  identifier_value: CL-AP-GUA-A-EA
 - identifier_scheme: GHCID_UUID
   identifier_value: fbc04d8a-3229-5e9a-b500-b8021b8fce58
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.933705+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJJ8KEHpBolWwRVsE__7NULYQ
+  formatted_address: Baan 70, 8307 AW Ens, Netherlands
+  website: https://www.arcane-archives.nl/
+  latitude: 52.637026399999996
+  longitude: 5.8285312
+  enriched_at: '2025-12-07T16:40:39.829581+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CL-CU-XXX-A-BMSAS.yaml b/data/custodian/CL-CU-SAN-A-BMSAS.yaml
similarity index 88%
rename from data/custodian/CL-CU-XXX-A-BMSAS.yaml
rename to data/custodian/CL-CU-SAN-A-BMSAS.yaml
index 36248b27cb..98381f748a 100644
--- a/data/custodian/CL-CU-XXX-A-BMSAS.yaml
+++ b/data/custodian/CL-CU-SAN-A-BMSAS.yaml
@@ -1,53 +1,96 @@
-original_entry:
-  name: Biblioteca Municipal's Archivo Sonoro
-  institution_type: ARCHIVE
-  source: CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
-  identifiers:
-  - identifier_scheme: GHCID
-    identifier_value: CL-00-XXX-A-BMAS
-  - identifier_scheme: GHCID_NUMERIC
-    identifier_value: '14088252937823216163'
-  - &id001
-    identifier_scheme: OLD_ID
-    identifier_value: https://w3id.org/heritage/custodian/cl/a-biblioteca-municipal-s-archivo-0052
-  - identifier_scheme: GHCID_UUID
-    identifier_value: e3e1e0cf-8d3a-5d52-8206-993efd779b53
-    identifier_url: urn:uuid:e3e1e0cf-8d3a-5d52-8206-993efd779b53
-  - identifier_scheme: GHCID_UUID_SHA256
-    identifier_value: c3838767-78ce-8223-9708-0dfed9993905
-    identifier_url: urn:uuid:c3838767-78ce-8223-9708-0dfed9993905
-  - identifier_scheme: RECORD_ID
-    identifier_value: 019a58fd-3227-7760-ad1b-882e621abfa6
-    identifier_url: urn:uuid:019a58fd-3227-7760-ad1b-882e621abfa6
-  - &id002
-    identifier_scheme: OLD_ID
-    identifier_value: 14088252937823216163
-  locations:
-  - region: Curicó
-    country: CL
-processing_timestamp: '2025-12-06T23:39:01.906935+00:00'
-ghcid:
-  ghcid_current: CL-CU-XXX-A-BMSAS
-  ghcid_original: CL-CU-XXX-A-BMSAS
-  ghcid_uuid: b7f7036e-61ed-502d-aed2-f78d4b9687ff
-  ghcid_uuid_sha256: a54d9c63-e4c4-88ec-b5b9-6d078e0c443a
-  ghcid_numeric: 11911348542318586092
-  record_id: 37dfaf27-186c-4402-99d0-cd5f5f5cb868
-  generation_timestamp: '2025-12-06T23:39:01.906935+00:00'
-  location_resolution:
-    country_code: CL
-    region_code: CU
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
-  ghcid_history:
-  - ghcid: CL-CU-XXX-A-BMSAS
-    ghcid_numeric: 11911348542318586092
-    valid_from: '2025-12-06T23:39:01.906935+00:00'
-    reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+ch_annotator:
+  annotation_metadata:
+    confidence_score: 0.85
+    verification_date: null
+    verified: false
+    verified_by: null
+  annotation_provenance:
+    annotation_agent: opencode-claude-sonnet-4
+    annotation_date: '2025-12-06T21:13:56.173868+00:00'
+    annotation_method: retroactive CH-Annotator application via batch script
+    source_file: latin_american_institutions_AUTHORITATIVE.yaml
+  convention_id: ch_annotator-v1_7_0
+  convention_version: 1.7.0
+  entity_claims:
+  - claim_type: full_name
+    claim_value: Biblioteca Municipal's Archivo Sonoro
+    confidence: 0.85
+    property_uri: skos:prefLabel
+    provenance:
+      agent: claude-conversation
+      context_convention: ch_annotator-v1_7_0
+      namespace: glam
+      path: /conversations/edc75d66-ee42-4199-8e22-65b0d2347922
+      timestamp: '2025-11-06T08:02:44.238412+00:00'
+  - claim_type: institution_type
+    claim_value: ARCHIVE
+    confidence: 0.95
+    property_uri: rdf:type
+    provenance:
+      agent: claude-conversation
+      context_convention: ch_annotator-v1_7_0
+      namespace: glam
+      path: /conversations/edc75d66-ee42-4199-8e22-65b0d2347922
+      timestamp: '2025-11-06T08:02:44.238412+00:00'
+  - claim_type: ghcid
+    claim_value: CL-00-XXX-A-BMAS
+    confidence: 1.0
+    property_uri: glam:ghcid
+    provenance:
+      agent: claude-conversation
+      context_convention: ch_annotator-v1_7_0
+      namespace: glam
+      path: /conversations/edc75d66-ee42-4199-8e22-65b0d2347922
+      timestamp: '2025-11-06T08:02:44.238412+00:00'
+  entity_classification:
+    alternative_classes:
+    - org:FormalOrganization
+    - rov:RegisteredOrganization
+    - glam:HeritageCustodian
+    hypernym: GRP
+    hypernym_label: GROUP
+    ontology_class: schema:ArchiveOrganization
+    subtype: GRP.HER.ARC
+    subtype_label: ARCHIVE
+  extraction_provenance:
+    agent: claude-conversation
+    context_convention: ch_annotator-v1_7_0
+    namespace: glam
+    path: /conversations/edc75d66-ee42-4199-8e22-65b0d2347922
+    timestamp: '2025-11-06T08:02:44.238412+00:00'
+  integration_note:
+    created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
+    creation_date: '2025-12-06T23:39:01.906935+00:00'
+    creation_method: create_custodian_from_ch_annotator.py
 custodian_name:
   claim_type: custodian_name
   claim_value: Biblioteca Municipal's Archivo Sonoro
   source_type: ch_annotator
+ghcid:
+  generation_timestamp: '2025-12-06T23:39:01.906935+00:00'
+  ghcid_current: CL-RM-SAN-A-BMSAS
+  ghcid_history:
+  - ghcid: CL-CU-XXX-A-BMSAS
+    ghcid_numeric: 11911348542318586092
+    reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_from: '2025-12-06T23:39:01.906935+00:00'
+  ghcid_numeric: 11911348542318586092
+  ghcid_original: CL-CU-XXX-A-BMSAS
+  ghcid_uuid: b7f7036e-61ed-502d-aed2-f78d4b9687ff
+  ghcid_uuid_sha256: a54d9c63-e4c4-88ec-b5b9-6d078e0c443a
+  location_resolution:
+    city_code: SAN
+    city_name: Santiago
+    country_code: CL
+    geonames_id: 3871336
+    latitude: -33.4489
+    longitude: -70.6693
+    method: MANUAL_RESEARCH
+    notes: Biblioteca Municipal in Santiago, Chile
+    region_code: RM
+    region_name: Santiago Metropolitan
+    resolution_date: '2025-12-07T16:44:07.069691+00:00'
+  record_id: 37dfaf27-186c-4402-99d0-cd5f5f5cb868
 identifiers:
 - identifier_scheme: GHCID
   identifier_value: CL-CU-XXX-A-BMSAS
@@ -59,75 +102,39 @@ identifiers:
   identifier_value: '11911348542318586092'
 - identifier_scheme: RECORD_ID
   identifier_value: 37dfaf27-186c-4402-99d0-cd5f5f5cb868
-- *id001
-- *id002
+- &id001
+  identifier_scheme: OLD_ID
+  identifier_value: https://w3id.org/heritage/custodian/cl/a-biblioteca-municipal-s-archivo-0052
+- &id002
+  identifier_scheme: OLD_ID
+  identifier_value: 14088252937823216163
+original_entry:
+  identifiers:
+  - identifier_scheme: GHCID
+    identifier_value: CL-00-XXX-A-BMAS
+  - identifier_scheme: GHCID_NUMERIC
+    identifier_value: '14088252937823216163'
+  - *id001
+  - identifier_scheme: GHCID_UUID
+    identifier_url: urn:uuid:e3e1e0cf-8d3a-5d52-8206-993efd779b53
+    identifier_value: e3e1e0cf-8d3a-5d52-8206-993efd779b53
+  - identifier_scheme: GHCID_UUID_SHA256
+    identifier_url: urn:uuid:c3838767-78ce-8223-9708-0dfed9993905
+    identifier_value: c3838767-78ce-8223-9708-0dfed9993905
+  - identifier_scheme: RECORD_ID
+    identifier_url: urn:uuid:019a58fd-3227-7760-ad1b-882e621abfa6
+    identifier_value: 019a58fd-3227-7760-ad1b-882e621abfa6
+  - *id002
+  institution_type: ARCHIVE
+  locations:
+  - country: CL
+    region: Curicó
+  name: Biblioteca Municipal's Archivo Sonoro
+  source: CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+processing_timestamp: '2025-12-06T23:39:01.906935+00:00'
 provenance:
+  confidence_score: 0.85
   data_source: CONVERSATION_NLP
   data_tier: TIER_4_INFERRED
   extraction_date: '2025-11-06T08:02:44.238412+00:00'
   extraction_method: 'Created from CH-Annotator file: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml'
-  confidence_score: 0.85
-ch_annotator:
-  convention_id: ch_annotator-v1_7_0
-  convention_version: 1.7.0
-  entity_classification:
-    hypernym: GRP
-    hypernym_label: GROUP
-    subtype: GRP.HER.ARC
-    subtype_label: ARCHIVE
-    ontology_class: schema:ArchiveOrganization
-    alternative_classes:
-    - org:FormalOrganization
-    - rov:RegisteredOrganization
-    - glam:HeritageCustodian
-  extraction_provenance:
-    namespace: glam
-    path: /conversations/edc75d66-ee42-4199-8e22-65b0d2347922
-    timestamp: '2025-11-06T08:02:44.238412+00:00'
-    agent: claude-conversation
-    context_convention: ch_annotator-v1_7_0
-  annotation_provenance:
-    annotation_agent: opencode-claude-sonnet-4
-    annotation_date: '2025-12-06T21:13:56.173868+00:00'
-    annotation_method: retroactive CH-Annotator application via batch script
-    source_file: latin_american_institutions_AUTHORITATIVE.yaml
-  annotation_metadata:
-    confidence_score: 0.85
-    verified: false
-    verification_date: null
-    verified_by: null
-  entity_claims:
-  - claim_type: full_name
-    claim_value: Biblioteca Municipal's Archivo Sonoro
-    property_uri: skos:prefLabel
-    provenance:
-      namespace: glam
-      path: /conversations/edc75d66-ee42-4199-8e22-65b0d2347922
-      timestamp: '2025-11-06T08:02:44.238412+00:00'
-      agent: claude-conversation
-      context_convention: ch_annotator-v1_7_0
-    confidence: 0.85
-  - claim_type: institution_type
-    claim_value: ARCHIVE
-    property_uri: rdf:type
-    provenance:
-      namespace: glam
-      path: /conversations/edc75d66-ee42-4199-8e22-65b0d2347922
-      timestamp: '2025-11-06T08:02:44.238412+00:00'
-      agent: claude-conversation
-      context_convention: ch_annotator-v1_7_0
-    confidence: 0.95
-  - claim_type: ghcid
-    claim_value: CL-00-XXX-A-BMAS
-    property_uri: glam:ghcid
-    provenance:
-      namespace: glam
-      path: /conversations/edc75d66-ee42-4199-8e22-65b0d2347922
-      timestamp: '2025-11-06T08:02:44.238412+00:00'
-      agent: claude-conversation
-      context_convention: ch_annotator-v1_7_0
-    confidence: 1.0
-  integration_note:
-    created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
-    creation_date: '2025-12-06T23:39:01.906935+00:00'
-    creation_method: create_custodian_from_ch_annotator.py
diff --git a/data/custodian/CL-CH-XXX-X-CIH.yaml b/data/custodian/CL-LL-TDP-X-CIH.yaml
similarity index 82%
rename from data/custodian/CL-CH-XXX-X-CIH.yaml
rename to data/custodian/CL-LL-TDP-X-CIH.yaml
index f91a6f95cb..f2370f4477 100644
--- a/data/custodian/CL-CH-XXX-X-CIH.yaml
+++ b/data/custodian/CL-LL-TDP-X-CIH.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: CL
 processing_timestamp: '2025-12-06T23:39:01.875164+00:00'
 ghcid:
-  ghcid_current: CL-CH-XXX-X-CIH
+  ghcid_current: CL-LL-TDP-X-CIH
   ghcid_original: CL-CH-XXX-X-CIH
   ghcid_uuid: b3cfeb3a-ec95-56a5-abcf-cf5ca35f2a86
   ghcid_uuid_sha256: d69adfd1-2a31-874b-908c-50047c390e74
@@ -35,22 +35,35 @@ ghcid:
   record_id: e54ca03d-298e-434e-8c55-4a1748d43c18
   generation_timestamp: '2025-12-06T23:39:01.875164+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CL
-    region_code: CH
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: LL
+    region_name: Region of Magallanes
+    city_code: TDP
+    city_name: Torres del Paine
+    geonames_id: 7536052
+    feature_code: PPL
+    google_place_id: ChIJc0JJHLoMu70R4hoFI8EXX5o
+    latitude: -50.3313371
+    longitude: -72.26498959999999
+    resolution_date: '2025-12-07T16:40:39.215019+00:00'
   ghcid_history:
   - ghcid: CL-CH-XXX-X-CIH
     ghcid_numeric: 15463918359979079499
     valid_from: '2025-12-06T23:39:01.875164+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:39.215019+00:00'
+  - ghcid: CL-LL-TDP-X-CIH
+    ghcid_numeric: 15463918359979079499
+    valid_from: '2025-12-07T16:40:39.215019+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Torres del Paine (LL)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Centro de Interpretación Histórica
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CL-CH-XXX-X-CIH
+  identifier_value: CL-LL-TDP-X-CIH
 - identifier_scheme: GHCID_UUID
   identifier_value: b3cfeb3a-ec95-56a5-abcf-cf5ca35f2a86
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.875164+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJc0JJHLoMu70R4hoFI8EXX5o
+  formatted_address: Almirante G. Brown 1175, Z9405 El Calafate, Santa Cruz, Argentina
+  website: https://centrodeinterpretacioncalafate.my.canva.site/
+  latitude: -50.3313371
+  longitude: -72.26498959999999
+  enriched_at: '2025-12-07T16:40:39.215019+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CL-CH-XXX-R-FIP.yaml b/data/custodian/CL-LR-ANC-R-FIP.yaml
similarity index 84%
rename from data/custodian/CL-CH-XXX-R-FIP.yaml
rename to data/custodian/CL-LR-ANC-R-FIP.yaml
index b7c6c18d87..722033d708 100644
--- a/data/custodian/CL-CH-XXX-R-FIP.yaml
+++ b/data/custodian/CL-LR-ANC-R-FIP.yaml
@@ -31,7 +31,7 @@ original_entry:
     country: CL
 processing_timestamp: '2025-12-06T23:39:01.972218+00:00'
 ghcid:
-  ghcid_current: CL-CH-XXX-R-FIP
+  ghcid_current: CL-LR-ANC-R-FIP
   ghcid_original: CL-CH-XXX-R-FIP
   ghcid_uuid: d382ce98-6a2f-56ce-af94-7e1ca679b1d9
   ghcid_uuid_sha256: 689c8ec2-37cb-854b-f8e0-4aacee5cf8a8
@@ -39,22 +39,35 @@ ghcid:
   record_id: 6ede2cc5-dadf-4445-852c-333f06f2311a
   generation_timestamp: '2025-12-06T23:39:01.972218+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CL
-    region_code: CH
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: LR
+    region_name: Los Lagos Region
+    city_code: ANC
+    city_name: Ancud
+    geonames_id: 3899695
+    feature_code: PPL
+    google_place_id: ChIJmfgBTViNIpYRYJeMrj6aAGs
+    latitude: -41.8699102
+    longitude: -73.82815169999999
+    resolution_date: '2025-12-07T16:40:38.556056+00:00'
   ghcid_history:
   - ghcid: CL-CH-XXX-R-FIP
     ghcid_numeric: 7538056841122223435
     valid_from: '2025-12-06T23:39:01.972218+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:38.556056+00:00'
+  - ghcid: CL-LR-ANC-R-FIP
+    ghcid_numeric: 7538056841122223435
+    valid_from: '2025-12-07T16:40:38.556056+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Ancud (LR)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Fundación Iglesias Patrimoniales
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CL-CH-XXX-R-FIP
+  identifier_value: CL-LR-ANC-R-FIP
 - identifier_scheme: GHCID_UUID
   identifier_value: d382ce98-6a2f-56ce-af94-7e1ca679b1d9
 - identifier_scheme: GHCID_UUID_SHA256
@@ -149,3 +162,11 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q119826558
   wikidata_label_en: Fundación Iglesias Patrimoniales
+google_maps_enrichment:
+  place_id: ChIJmfgBTViNIpYRYJeMrj6aAGs
+  formatted_address: Errázuriz 227, 5710000 Ancud, Los Lagos, Chile
+  website: https://www.iglesiaschiloe.cl/
+  latitude: -41.8699102
+  longitude: -73.82815169999999
+  enriched_at: '2025-12-07T16:40:38.556056+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CL-AR-XXX-O-SNPC.yaml b/data/custodian/CL-MA-REC-O-SNPC.yaml
similarity index 84%
rename from data/custodian/CL-AR-XXX-O-SNPC.yaml
rename to data/custodian/CL-MA-REC-O-SNPC.yaml
index 4003d6a4db..a0c592bd42 100644
--- a/data/custodian/CL-AR-XXX-O-SNPC.yaml
+++ b/data/custodian/CL-MA-REC-O-SNPC.yaml
@@ -31,7 +31,7 @@ original_entry:
     country: CL
 processing_timestamp: '2025-12-06T23:35:52.029457+00:00'
 ghcid:
-  ghcid_current: CL-AR-XXX-O-SNPC
+  ghcid_current: CL-MA-REC-O-SNPC
   ghcid_original: CL-AR-XXX-O-SNPC
   ghcid_uuid: e0e4c21b-3c69-519c-864e-e9d02f6075cb
   ghcid_uuid_sha256: 72ff13a5-c753-83a1-80c2-7ec1882bd92a
@@ -39,22 +39,35 @@ ghcid:
   record_id: 338e96cb-ac01-4bdc-bf23-7b5f6ac1d113
   generation_timestamp: '2025-12-06T23:35:52.029457+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CL
-    region_code: AR
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: MA
+    region_name: Santiago Metropolitan
+    city_code: REC
+    city_name: Recoleta
+    geonames_id: 7114244
+    feature_code: PPL
+    google_place_id: ChIJ76u7BJXFYpYRJI_dvyG8f0Y
+    latitude: -33.4246367
+    longitude: -70.644694
+    resolution_date: '2025-12-07T16:40:37.834567+00:00'
   ghcid_history:
   - ghcid: CL-AR-XXX-O-SNPC
     ghcid_numeric: 8286363442119689121
     valid_from: '2025-12-06T23:35:52.029457+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:37.834567+00:00'
+  - ghcid: CL-MA-REC-O-SNPC
+    ghcid_numeric: 8286363442119689121
+    valid_from: '2025-12-07T16:40:37.834567+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Recoleta (MA)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Servicio Nacional del Patrimonio Cultural
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CL-AR-XXX-O-SNPC
+  identifier_value: CL-MA-REC-O-SNPC
 - identifier_scheme: GHCID_UUID
   identifier_value: e0e4c21b-3c69-519c-864e-e9d02f6075cb
 - identifier_scheme: GHCID_UUID_SHA256
@@ -149,3 +162,12 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q6025191
   wikidata_label_en: Servicio Nacional del Patrimonio Cultural
+google_maps_enrichment:
+  place_id: ChIJ76u7BJXFYpYRJI_dvyG8f0Y
+  formatted_address: Av Libertador Bernardo O'Higgins 651, 8420260 Santiago, Recoleta,
+    Región Metropolitana, Chile
+  website: https://www.patrimoniocultural.gob.cl/
+  latitude: -33.4246367
+  longitude: -70.644694
+  enriched_at: '2025-12-07T16:40:37.834567+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CL-LO-XXX-A-AN.yaml b/data/custodian/CL-MA-SAN-A-AN.yaml
similarity index 83%
rename from data/custodian/CL-LO-XXX-A-AN.yaml
rename to data/custodian/CL-MA-SAN-A-AN.yaml
index 0368cd97c0..35e5239bde 100644
--- a/data/custodian/CL-LO-XXX-A-AN.yaml
+++ b/data/custodian/CL-MA-SAN-A-AN.yaml
@@ -31,7 +31,7 @@ original_entry:
     country: CL
 processing_timestamp: '2025-12-06T23:39:01.851505+00:00'
 ghcid:
-  ghcid_current: CL-LO-XXX-A-AN
+  ghcid_current: CL-MA-SAN-A-AN
   ghcid_original: CL-LO-XXX-A-AN
   ghcid_uuid: 26a07f06-228e-538a-97bb-b871845175a1
   ghcid_uuid_sha256: 93e817c0-33a6-87da-5a9c-e64d84904335
@@ -39,22 +39,35 @@ ghcid:
   record_id: 1593a4a4-68d6-4615-bce2-5c9b75ac1371
   generation_timestamp: '2025-12-06T23:39:01.851505+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CL
-    region_code: LO
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: MA
+    region_name: Santiago Metropolitan
+    city_code: SAN
+    city_name: Santiago
+    geonames_id: 3871336
+    feature_code: PPLC
+    google_place_id: ChIJL31HeaHFYpYR5xbpwsDQ7kk
+    latitude: -33.441943699999996
+    longitude: -70.64524209999999
+    resolution_date: '2025-12-07T16:40:41.714619+00:00'
   ghcid_history:
   - ghcid: CL-LO-XXX-A-AN
     ghcid_numeric: 10657794632439957466
     valid_from: '2025-12-06T23:39:01.851505+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:41.714619+00:00'
+  - ghcid: CL-MA-SAN-A-AN
+    ghcid_numeric: 10657794632439957466
+    valid_from: '2025-12-07T16:40:41.714619+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Santiago (MA)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Archivo Nacional
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CL-LO-XXX-A-AN
+  identifier_value: CL-MA-SAN-A-AN
 - identifier_scheme: GHCID_UUID
   identifier_value: 26a07f06-228e-538a-97bb-b871845175a1
 - identifier_scheme: GHCID_UUID_SHA256
@@ -149,3 +162,11 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q18563194
   wikidata_label_en: Archivo Nacional
+google_maps_enrichment:
+  place_id: ChIJL31HeaHFYpYR5xbpwsDQ7kk
+  formatted_address: Miraflores 50, Santiago, Región Metropolitana, Chile
+  website: https://www.archivonacional.gob.cl/
+  latitude: -33.441943699999996
+  longitude: -70.64524209999999
+  enriched_at: '2025-12-07T16:40:41.714619+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CL-IS-XXX-L-WML.yaml b/data/custodian/CL-TA-HRO-L-WML.yaml
similarity index 83%
rename from data/custodian/CL-IS-XXX-L-WML.yaml
rename to data/custodian/CL-TA-HRO-L-WML.yaml
index 5cfb9139e6..ae61786d25 100644
--- a/data/custodian/CL-IS-XXX-L-WML.yaml
+++ b/data/custodian/CL-TA-HRO-L-WML.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: CL
 processing_timestamp: '2025-12-06T23:39:01.845675+00:00'
 ghcid:
-  ghcid_current: CL-IS-XXX-L-WML
+  ghcid_current: CL-TA-HRO-L-WML
   ghcid_original: CL-IS-XXX-L-WML
   ghcid_uuid: 61e2f272-d8db-5455-9628-05d5d7930122
   ghcid_uuid_sha256: 36951b80-1c61-8b4e-abb8-93e3e63e1327
@@ -35,22 +35,35 @@ ghcid:
   record_id: f722dda1-762f-41d2-9e06-470a97fa0cbb
   generation_timestamp: '2025-12-06T23:39:01.845675+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CL
-    region_code: IS
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: TA
+    region_name: Valparaíso
+    city_code: HRO
+    city_name: Hanga Roa
+    geonames_id: 4030754
+    feature_code: PPLA2
+    google_place_id: ChIJ1fxfGv36R5kR1Z-B4_0C4y4
+    latitude: -27.137522999999998
+    longitude: -109.4236811
+    resolution_date: '2025-12-07T16:40:41.059426+00:00'
   ghcid_history:
   - ghcid: CL-IS-XXX-L-WML
     ghcid_numeric: 3933080086623918926
     valid_from: '2025-12-06T23:39:01.845675+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:41.059426+00:00'
+  - ghcid: CL-TA-HRO-L-WML
+    ghcid_numeric: 3933080086623918926
+    valid_from: '2025-12-07T16:40:41.059426+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Hanga Roa (TA)'
 custodian_name:
   claim_type: custodian_name
   claim_value: William Mulloy Library
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CL-IS-XXX-L-WML
+  identifier_value: CL-TA-HRO-L-WML
 - identifier_scheme: GHCID_UUID
   identifier_value: 61e2f272-d8db-5455-9628-05d5d7930122
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:01.845675+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ1fxfGv36R5kR1Z-B4_0C4y4
+  formatted_address: Hanga Roa, Easter Island, Valparaíso, Chile
+  website: null
+  latitude: -27.137522999999998
+  longitude: -109.4236811
+  enriched_at: '2025-12-07T16:40:41.059426+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CL-SA-XXX-R-FBP.yaml b/data/custodian/CL-TA-SFE-R-FBP.yaml
similarity index 84%
rename from data/custodian/CL-SA-XXX-R-FBP.yaml
rename to data/custodian/CL-TA-SFE-R-FBP.yaml
index 799604246f..f42f6ca425 100644
--- a/data/custodian/CL-SA-XXX-R-FBP.yaml
+++ b/data/custodian/CL-TA-SFE-R-FBP.yaml
@@ -31,7 +31,7 @@ original_entry:
     country: CL
 processing_timestamp: '2025-12-06T23:39:01.860185+00:00'
 ghcid:
-  ghcid_current: CL-SA-XXX-R-FBP
+  ghcid_current: CL-TA-SFE-R-FBP
   ghcid_original: CL-SA-XXX-R-FBP
   ghcid_uuid: 09d38866-bd97-55d8-b2f5-97ed01613258
   ghcid_uuid_sha256: 764722ed-207b-886d-43cf-3b8ee71eeee1
@@ -39,22 +39,35 @@ ghcid:
   record_id: a19c4944-8f93-4f16-b089-8f6ffdc47352
   generation_timestamp: '2025-12-06T23:39:01.860185+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CL
-    region_code: SA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: TA
+    region_name: Valparaíso
+    city_code: SFE
+    city_name: San Felipe
+    geonames_id: 3872255
+    feature_code: PPLA2
+    google_place_id: ChIJXzUhNtIWiJYRvUFSNQNqZgg
+    latitude: -32.7558204
+    longitude: -70.72114479999999
+    resolution_date: '2025-12-07T16:40:42.414963+00:00'
   ghcid_history:
   - ghcid: CL-SA-XXX-R-FBP
     ghcid_numeric: 8522819221669541997
     valid_from: '2025-12-06T23:39:01.860185+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:42.414963+00:00'
+  - ghcid: CL-TA-SFE-R-FBP
+    ghcid_numeric: 8522819221669541997
+    valid_from: '2025-12-07T16:40:42.414963+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: San Felipe (TA)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Fundación Buen Pastor
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: CL-SA-XXX-R-FBP
+  identifier_value: CL-TA-SFE-R-FBP
 - identifier_scheme: GHCID_UUID
   identifier_value: 09d38866-bd97-55d8-b2f5-97ed01613258
 - identifier_scheme: GHCID_UUID_SHA256
@@ -149,3 +162,11 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q119826558
   wikidata_label_en: Fundación Buen Pastor
+google_maps_enrichment:
+  place_id: ChIJXzUhNtIWiJYRvUFSNQNqZgg
+  formatted_address: Yungay 398, San Felipe, Valparaíso, Chile
+  website: http://fundacionbuenpastor.cl/
+  latitude: -32.7558204
+  longitude: -70.72114479999999
+  enriched_at: '2025-12-07T16:40:42.414963+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CZ-10-XXX-A-VHA.yaml b/data/custodian/CZ-52-DLI-A-VHA.yaml
similarity index 83%
rename from data/custodian/CZ-10-XXX-A-VHA.yaml
rename to data/custodian/CZ-52-DLI-A-VHA.yaml
index 62ad109fdf..0aa416378e 100644
--- a/data/custodian/CZ-10-XXX-A-VHA.yaml
+++ b/data/custodian/CZ-52-DLI-A-VHA.yaml
@@ -21,7 +21,7 @@ original_entry:
   locations: []
 processing_timestamp: '2025-12-06T23:37:44.219889+00:00'
 ghcid:
-  ghcid_current: CZ-10-XXX-A-VHA
+  ghcid_current: CZ-52-DLI-A-VHA
   ghcid_original: XX-XX-XXX-A-VHA
   ghcid_uuid: 7a54354d-2714-5135-8f81-e008305da492
   ghcid_uuid_sha256: df2a81df-e1fc-8246-cbab-8092e8b23723
@@ -29,13 +29,18 @@ ghcid:
   record_id: 4a8769a4-706c-4484-9a7f-6ecc1fe86d5e
   generation_timestamp: '2025-12-06T23:37:44.219889+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CZ
-    region_code: '10'
-    city_code: XXX
-    method: WIKIDATA_P131
-    resolution_timestamp: '2025-12-07T00:04:35.321110+00:00'
-    region_name: CZ-10
-    iso_code_source: CZ-10
+    region_code: '52'
+    region_name: Prague
+    city_code: DLI
+    city_name: Dolni Liboc
+    geonames_id: 3076793
+    feature_code: PPL
+    google_place_id: ChIJK5Vt77S_C0cRDshGU7bODs8
+    latitude: 50.0865017
+    longitude: 14.307939399999999
+    resolution_date: '2025-12-07T16:41:58.864567+00:00'
   ghcid_history:
   - ghcid: XX-XX-XXX-A-VHA
     ghcid_numeric: 16080808218048873030
@@ -47,13 +52,18 @@ ghcid:
   - ghcid: CZ-10-XXX-A-VHA
     valid_from: '2025-12-07T00:04:35.321121+00:00'
     reason: 'Region resolved via Wikidata P131: XX->10 (CZ-10)'
+    valid_to: '2025-12-07T16:41:58.864567+00:00'
+  - ghcid: CZ-52-DLI-A-VHA
+    ghcid_numeric: 16080808218048873030
+    valid_from: '2025-12-07T16:41:58.864567+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Dolni Liboc (52)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Vojenský historický archiv
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: XX-XX-XXX-A-VHA
+  identifier_value: CZ-52-DLI-A-VHA
 - identifier_scheme: GHCID_UUID
   identifier_value: 7a54354d-2714-5135-8f81-e008305da492
 - identifier_scheme: GHCID_UUID_SHA256
@@ -142,3 +152,11 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q58369198
   wikidata_label_en: Vojenský historický archiv
+google_maps_enrichment:
+  place_id: ChIJK5Vt77S_C0cRDshGU7bODs8
+  formatted_address: Pilotů 217/12, 161 00 Praha 6, Czechia
+  website: https://www.vuapraha.cz/
+  latitude: 50.0865017
+  longitude: 14.307939399999999
+  enriched_at: '2025-12-07T16:41:58.864567+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CZ-10-XXX-A-AS.yaml b/data/custodian/CZ-52-LIT-A-AS.yaml
similarity index 82%
rename from data/custodian/CZ-10-XXX-A-AS.yaml
rename to data/custodian/CZ-52-LIT-A-AS.yaml
index bec13705cf..64a1bbd192 100644
--- a/data/custodian/CZ-10-XXX-A-AS.yaml
+++ b/data/custodian/CZ-52-LIT-A-AS.yaml
@@ -17,7 +17,7 @@ original_entry:
   locations: []
 processing_timestamp: '2025-12-06T23:37:44.025918+00:00'
 ghcid:
-  ghcid_current: CZ-10-XXX-A-AS
+  ghcid_current: CZ-52-LIT-A-AS
   ghcid_original: XX-XX-XXX-A-AS
   ghcid_uuid: 1722aa64-414c-586f-a5b6-d35ab02fe700
   ghcid_uuid_sha256: 01d40b10-8364-8693-30ac-8ec7078b2c56
@@ -25,13 +25,18 @@ ghcid:
   record_id: 11e1972a-5d1a-4d66-9642-619bb7258f85
   generation_timestamp: '2025-12-06T23:37:44.025918+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CZ
-    region_code: '10'
-    city_code: XXX
-    method: WIKIDATA_P131
-    resolution_timestamp: '2025-12-07T00:00:49.879582+00:00'
-    region_name: CZ-10
-    iso_code_source: CZ-10
+    region_code: '52'
+    region_name: Prague
+    city_code: LIT
+    city_name: Litochleby
+    geonames_id: 3071686
+    feature_code: PPL
+    google_place_id: ChIJpeVeWjWSC0cRLiagLWqyF5U
+    latitude: 50.0389097
+    longitude: 14.492836599999997
+    resolution_date: '2025-12-07T16:41:58.143718+00:00'
   ghcid_history:
   - ghcid: XX-XX-XXX-A-AS
     ghcid_numeric: 131742454652401299
@@ -43,13 +48,18 @@ ghcid:
   - ghcid: CZ-10-XXX-A-AS
     valid_from: '2025-12-07T00:00:49.879595+00:00'
     reason: 'Region resolved via Wikidata P131: XX->10 (CZ-10)'
+    valid_to: '2025-12-07T16:41:58.143718+00:00'
+  - ghcid: CZ-52-LIT-A-AS
+    ghcid_numeric: 131742454652401299
+    valid_from: '2025-12-07T16:41:58.143718+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Litochleby (52)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Archiv Senátu
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: XX-XX-XXX-A-AS
+  identifier_value: CZ-52-LIT-A-AS
 - identifier_scheme: GHCID_UUID
   identifier_value: 1722aa64-414c-586f-a5b6-d35ab02fe700
 - identifier_scheme: GHCID_UUID_SHA256
@@ -137,3 +147,11 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q55064381
   wikidata_label_en: Archiv Senátu
+google_maps_enrichment:
+  place_id: ChIJpeVeWjWSC0cRLiagLWqyF5U
+  formatted_address: Archivní 2257/4, 149 00 Praha 4-Chodov, Czechia
+  website: http://www.nacr.cz/
+  latitude: 50.0389097
+  longitude: 14.492836599999997
+  enriched_at: '2025-12-07T16:41:58.143718+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CZ-10-XXX-A-ABS.yaml b/data/custodian/CZ-52-PRA-A-ABS.yaml
similarity index 82%
rename from data/custodian/CZ-10-XXX-A-ABS.yaml
rename to data/custodian/CZ-52-PRA-A-ABS.yaml
index 6092e7bbea..790e30575a 100644
--- a/data/custodian/CZ-10-XXX-A-ABS.yaml
+++ b/data/custodian/CZ-52-PRA-A-ABS.yaml
@@ -21,7 +21,7 @@ original_entry:
   locations: []
 processing_timestamp: '2025-12-06T23:37:44.781379+00:00'
 ghcid:
-  ghcid_current: CZ-10-XXX-A-ABS
+  ghcid_current: CZ-52-PRA-A-ABS
   ghcid_original: XX-XX-XXX-A-ABS
   ghcid_uuid: d32da4f3-f313-54c4-b82f-397caf2fc7c5
   ghcid_uuid_sha256: 51ddd270-4b01-88e9-22f1-805fae74dca2
@@ -29,13 +29,18 @@ ghcid:
   record_id: cc4ab51a-fa46-4b70-8405-707960143565
   generation_timestamp: '2025-12-06T23:37:44.781379+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CZ
-    region_code: '10'
-    city_code: XXX
-    method: WIKIDATA_P131
-    resolution_timestamp: '2025-12-07T00:04:31.453951+00:00'
-    region_name: CZ-10
-    iso_code_source: CZ-10
+    region_code: '52'
+    region_name: Prague
+    city_code: PRA
+    city_name: Prague
+    geonames_id: 3067696
+    feature_code: PPLC
+    google_place_id: ChIJz-raT_CUC0cRzgWQGob4kwc
+    latitude: 50.07958730000001
+    longitude: 14.415068499999997
+    resolution_date: '2025-12-07T16:41:57.488139+00:00'
   ghcid_history:
   - ghcid: XX-XX-XXX-A-ABS
     ghcid_numeric: 5899102466661796073
@@ -47,13 +52,18 @@ ghcid:
   - ghcid: CZ-10-XXX-A-ABS
     valid_from: '2025-12-07T00:04:31.453962+00:00'
     reason: 'Region resolved via Wikidata P131: XX->10 (CZ-10)'
+    valid_to: '2025-12-07T16:41:57.488139+00:00'
+  - ghcid: CZ-52-PRA-A-ABS
+    ghcid_numeric: 5899102466661796073
+    valid_from: '2025-12-07T16:41:57.488139+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Prague (52)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Archiv bezpečnostních složek
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: XX-XX-XXX-A-ABS
+  identifier_value: CZ-52-PRA-A-ABS
 - identifier_scheme: GHCID_UUID
   identifier_value: d32da4f3-f313-54c4-b82f-397caf2fc7c5
 - identifier_scheme: GHCID_UUID_SHA256
@@ -142,3 +152,11 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q47979470
   wikidata_label_en: Archiv bezpečnostních složek
+google_maps_enrichment:
+  place_id: ChIJz-raT_CUC0cRzgWQGob4kwc
+  formatted_address: 3, Na Struze 229, Nové Město, 110 00 Praha-Praha 1, Czechia
+  website: http://www.abscr.cz/cs/provoz-badatelen#struha
+  latitude: 50.07958730000001
+  longitude: 14.415068499999997
+  enriched_at: '2025-12-07T16:41:57.488139+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CZ-64-XXX-A-AÚAČBVV.yaml b/data/custodian/CZ-78-BRN-A-AÚAČBVV.yaml
similarity index 83%
rename from data/custodian/CZ-64-XXX-A-AÚAČBVV.yaml
rename to data/custodian/CZ-78-BRN-A-AÚAČBVV.yaml
index b81af725e6..0dd46b8d0a 100644
--- a/data/custodian/CZ-64-XXX-A-AÚAČBVV.yaml
+++ b/data/custodian/CZ-78-BRN-A-AÚAČBVV.yaml
@@ -17,7 +17,7 @@ original_entry:
   locations: []
 processing_timestamp: '2025-12-06T23:37:44.726013+00:00'
 ghcid:
-  ghcid_current: CZ-64-XXX-A-AÚAČBVV
+  ghcid_current: CZ-78-BRN-A-AÚAČBVV
   ghcid_original: XX-XX-XXX-A-AÚAČBVV
   ghcid_uuid: c91f8f55-d426-5431-a4ac-8ba7b33b9ad1
   ghcid_uuid_sha256: f4ca02bd-37f7-8a65-e7ad-18f252c78773
@@ -25,13 +25,18 @@ ghcid:
   record_id: ed57d537-e81b-4935-8b2d-af8dc59eae86
   generation_timestamp: '2025-12-06T23:37:44.726013+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CZ
-    region_code: '64'
-    city_code: XXX
-    method: WIKIDATA_P131
-    resolution_timestamp: '2025-12-07T00:03:46.915968+00:00'
-    region_name: CZ-64
-    iso_code_source: CZ-64
+    region_code: '78'
+    region_name: South Moravian
+    city_code: BRN
+    city_name: Brno
+    geonames_id: 3078610
+    feature_code: PPLA
+    google_place_id: ChIJcY8Y__uUEkcR81IQ8QP04S4
+    latitude: 49.1892619
+    longitude: 16.6208941
+    resolution_date: '2025-12-07T16:42:01.849952+00:00'
   ghcid_history:
   - ghcid: XX-XX-XXX-A-AÚAČBVV
     ghcid_numeric: 17638913902260980325
@@ -43,13 +48,18 @@ ghcid:
   - ghcid: CZ-64-XXX-A-AÚAČBVV
     valid_from: '2025-12-07T00:03:46.915986+00:00'
     reason: 'Region resolved via Wikidata P131: XX->64 (CZ-64)'
+    valid_to: '2025-12-07T16:42:01.849952+00:00'
+  - ghcid: CZ-78-BRN-A-AÚAČBVV
+    ghcid_numeric: 17638913902260980325
+    valid_from: '2025-12-07T16:42:01.849952+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Brno (78)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Archeologický ústav AV ČR, Brno, v. v. i.
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: XX-XX-XXX-A-AÚAČBVV
+  identifier_value: CZ-78-BRN-A-AÚAČBVV
 - identifier_scheme: GHCID_UUID
   identifier_value: c91f8f55-d426-5431-a4ac-8ba7b33b9ad1
 - identifier_scheme: GHCID_UUID_SHA256
@@ -137,3 +147,11 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q114617854
   wikidata_label_en: Archeologický ústav AV ČR, Brno, v. v. i.
+google_maps_enrichment:
+  place_id: ChIJcY8Y__uUEkcR81IQ8QP04S4
+  formatted_address: 19, Čechyňská 363, 602 00 Brno-střed, Czechia
+  website: http://arub.cz/
+  latitude: 49.1892619
+  longitude: 16.6208941
+  enriched_at: '2025-12-07T16:42:01.849952+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CZ-31-XXX-M-MJOK.yaml b/data/custodian/CZ-79-NET-M-MJOK.yaml
similarity index 82%
rename from data/custodian/CZ-31-XXX-M-MJOK.yaml
rename to data/custodian/CZ-79-NET-M-MJOK.yaml
index 04d0361872..f7d028bded 100644
--- a/data/custodian/CZ-31-XXX-M-MJOK.yaml
+++ b/data/custodian/CZ-79-NET-M-MJOK.yaml
@@ -21,7 +21,7 @@ original_entry:
   locations: []
 processing_timestamp: '2025-12-06T23:37:44.895737+00:00'
 ghcid:
-  ghcid_current: CZ-31-XXX-M-MJOK
+  ghcid_current: CZ-79-NET-M-MJOK
   ghcid_original: XX-XX-XXX-M-MJOK
   ghcid_uuid: de25f629-158e-55c6-a32a-d8fe351a047b
   ghcid_uuid_sha256: cbf3db80-eb54-893f-7ae2-61192cd847e6
@@ -29,13 +29,18 @@ ghcid:
   record_id: a3bee8b3-16c2-4fa0-a23a-e5da503730a2
   generation_timestamp: '2025-12-06T23:37:44.895737+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CZ
-    region_code: '31'
-    city_code: XXX
-    method: WIKIDATA_P131
-    resolution_timestamp: '2025-12-07T00:00:03.877250+00:00'
-    region_name: CZ-31
-    iso_code_source: CZ-31
+    region_code: '79'
+    region_name: Jihočeský kraj
+    city_code: NET
+    city_name: Netolice
+    geonames_id: 3069808
+    feature_code: PPL
+    google_place_id: ChIJP6wl77yodEcR82Alxcf4Y00
+    latitude: 49.04881590000001
+    longitude: 14.1958986
+    resolution_date: '2025-12-07T16:41:59.622544+00:00'
   ghcid_history:
   - ghcid: XX-XX-XXX-M-MJOK
     ghcid_numeric: 14696331355790571839
@@ -47,13 +52,18 @@ ghcid:
   - ghcid: CZ-31-XXX-M-MJOK
     valid_from: '2025-12-07T00:00:03.877265+00:00'
     reason: 'Region resolved via Wikidata P131: XX->31 (CZ-31)'
+    valid_to: '2025-12-07T16:41:59.622544+00:00'
+  - ghcid: CZ-79-NET-M-MJOK
+    ghcid_numeric: 14696331355790571839
+    valid_from: '2025-12-07T16:41:59.622544+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Netolice (79)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Muzeum JUDr. Otakara Kudrny
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: XX-XX-XXX-M-MJOK
+  identifier_value: CZ-79-NET-M-MJOK
 - identifier_scheme: GHCID_UUID
   identifier_value: de25f629-158e-55c6-a32a-d8fe351a047b
 - identifier_scheme: GHCID_UUID_SHA256
@@ -142,3 +152,11 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q85838793
   wikidata_label_en: Muzeum JUDr. Otakara Kudrny
+google_maps_enrichment:
+  place_id: ChIJP6wl77yodEcR82Alxcf4Y00
+  formatted_address: Mírové Nám. 248, 384 11 Netolice, Czechia
+  website: http://muzeumnetolice.cz/
+  latitude: 49.04881590000001
+  longitude: 14.1958986
+  enriched_at: '2025-12-07T16:41:59.622544+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CZ-52-XXX-M-MBN.yaml b/data/custodian/CZ-82-MSK-M-MBN.yaml
similarity index 82%
rename from data/custodian/CZ-52-XXX-M-MBN.yaml
rename to data/custodian/CZ-82-MSK-M-MBN.yaml
index cf34a4a3f3..e203917ec6 100644
--- a/data/custodian/CZ-52-XXX-M-MBN.yaml
+++ b/data/custodian/CZ-82-MSK-M-MBN.yaml
@@ -21,7 +21,7 @@ original_entry:
   locations: []
 processing_timestamp: '2025-12-06T23:37:44.330036+00:00'
 ghcid:
-  ghcid_current: CZ-52-XXX-M-MBN
+  ghcid_current: CZ-82-MSK-M-MBN
   ghcid_original: XX-XX-XXX-M-MBN
   ghcid_uuid: cbaf3a4c-4d99-52ee-9708-a95d65527cf8
   ghcid_uuid_sha256: b82ecd64-62ad-8a11-09e6-c8b02078b760
@@ -29,13 +29,18 @@ ghcid:
   record_id: 0771e56d-a0e1-4151-a389-b1d10d90db87
   generation_timestamp: '2025-12-06T23:37:44.330036+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CZ
-    region_code: '52'
-    city_code: XXX
-    method: WIKIDATA_P131
-    resolution_timestamp: '2025-12-07T00:04:11.726504+00:00'
-    region_name: CZ-52
-    iso_code_source: CZ-52
+    region_code: '82'
+    region_name: Královéhradecký kraj
+    city_code: MSK
+    city_name: Mala Skalice
+    geonames_id: 3071221
+    feature_code: PPL
+    google_place_id: ChIJyYBWIbZ8DkcRg5o_PvZ3vfA
+    latitude: 50.39563750000001
+    longitude: 16.0364361
+    resolution_date: '2025-12-07T16:42:00.339599+00:00'
   ghcid_history:
   - ghcid: XX-XX-XXX-M-MBN
     ghcid_numeric: 13271770982943386129
@@ -47,13 +52,18 @@ ghcid:
   - ghcid: CZ-52-XXX-M-MBN
     valid_from: '2025-12-07T00:04:11.726543+00:00'
     reason: 'Region resolved via Wikidata P131: XX->52 (CZ-52)'
+    valid_to: '2025-12-07T16:42:00.339599+00:00'
+  - ghcid: CZ-82-MSK-M-MBN
+    ghcid_numeric: 13271770982943386129
+    valid_from: '2025-12-07T16:42:00.339599+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Mala Skalice (82)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Muzeum Boženy Němcové
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: XX-XX-XXX-M-MBN
+  identifier_value: CZ-82-MSK-M-MBN
 - identifier_scheme: GHCID_UUID
   identifier_value: cbaf3a4c-4d99-52ee-9708-a95d65527cf8
 - identifier_scheme: GHCID_UUID_SHA256
@@ -142,3 +152,11 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q11786929
   wikidata_label_en: Muzeum Boženy Němcové
+google_maps_enrichment:
+  place_id: ChIJyYBWIbZ8DkcRg5o_PvZ3vfA
+  formatted_address: Maloskalická 47, 552 03 Česká Skalice, Czechia
+  website: https://www.muzeumbn.cz/
+  latitude: 50.39563750000001
+  longitude: 16.0364361
+  enriched_at: '2025-12-07T16:42:00.339599+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/CZ-52-XXX-M-MBČ.yaml b/data/custodian/CZ-82-MSV-M-MBČ.yaml
similarity index 82%
rename from data/custodian/CZ-52-XXX-M-MBČ.yaml
rename to data/custodian/CZ-82-MSV-M-MBČ.yaml
index 3f895fbff5..cce8079c9e 100644
--- a/data/custodian/CZ-52-XXX-M-MBČ.yaml
+++ b/data/custodian/CZ-82-MSV-M-MBČ.yaml
@@ -21,7 +21,7 @@ original_entry:
   locations: []
 processing_timestamp: '2025-12-06T23:37:44.614233+00:00'
 ghcid:
-  ghcid_current: CZ-52-XXX-M-MBČ
+  ghcid_current: CZ-82-MSV-M-MBČ
   ghcid_original: XX-XX-XXX-M-MBČ
   ghcid_uuid: 3bc09fa0-1c22-5d5b-ba93-045b84093403
   ghcid_uuid_sha256: 78c3940e-8cfa-816d-6580-0b9b5d6b303f
@@ -29,13 +29,18 @@ ghcid:
   record_id: bad2ccc6-3a05-4fda-bdf1-213a203eab21
   generation_timestamp: '2025-12-06T23:37:44.614233+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: CZ
-    region_code: '52'
-    city_code: XXX
-    method: WIKIDATA_P131
-    resolution_timestamp: '2025-12-07T00:00:19.755858+00:00'
-    region_name: CZ-52
-    iso_code_source: CZ-52
+    region_code: '82'
+    region_name: Královéhradecký kraj
+    city_code: MSV
+    city_name: Male Svatonovice
+    geonames_id: 3071148
+    feature_code: PPL
+    google_place_id: ChIJ1QMglDZgDkcRDBpAAjQP3Aw
+    latitude: 50.5340068
+    longitude: 16.0505036
+    resolution_date: '2025-12-07T16:42:01.044043+00:00'
   ghcid_history:
   - ghcid: XX-XX-XXX-M-MBČ
     ghcid_numeric: 8701961695225610605
@@ -47,13 +52,18 @@ ghcid:
   - ghcid: CZ-52-XXX-M-MBČ
     valid_from: '2025-12-07T00:00:19.755869+00:00'
     reason: 'Region resolved via Wikidata P131: XX->52 (CZ-52)'
+    valid_to: '2025-12-07T16:42:01.044043+00:00'
+  - ghcid: CZ-82-MSV-M-MBČ
+    ghcid_numeric: 8701961695225610605
+    valid_from: '2025-12-07T16:42:01.044043+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Male Svatonovice (82)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Muzeum bratří Čapků
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: XX-XX-XXX-M-MBČ
+  identifier_value: CZ-82-MSV-M-MBČ
 - identifier_scheme: GHCID_UUID
   identifier_value: 3bc09fa0-1c22-5d5b-ba93-045b84093403
 - identifier_scheme: GHCID_UUID_SHA256
@@ -142,3 +152,11 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q85838527
   wikidata_label_en: Muzeum bratří Čapků
+google_maps_enrichment:
+  place_id: ChIJ1QMglDZgDkcRDBpAAjQP3Aw
+  formatted_address: nám. K. Čapka 147, 542 34 Malé Svatoňovice, Czechia
+  website: http://www.malesvatonovice.cz/
+  latitude: 50.5340068
+  longitude: 16.0505036
+  enriched_at: '2025-12-07T16:42:01.044043+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/EE-37-XXX-A-TCA-tallinn_city_archives.yaml b/data/custodian/EE-01-TAL-A-TCA-tallinn_city_archives.yaml
similarity index 64%
rename from data/custodian/EE-37-XXX-A-TCA-tallinn_city_archives.yaml
rename to data/custodian/EE-01-TAL-A-TCA-tallinn_city_archives.yaml
index fb5b1da8f6..efca4897f3 100644
--- a/data/custodian/EE-37-XXX-A-TCA-tallinn_city_archives.yaml
+++ b/data/custodian/EE-01-TAL-A-TCA-tallinn_city_archives.yaml
@@ -14,7 +14,7 @@ wikidata_enrichment:
     inscribed documents
   instance_of: archive
 ghcid:
-  ghcid_current: EE-37-XXX-A-TCA-tallinn_city_archives
+  ghcid_current: EE-01-TAL-A-TCA-tallinn_city_archives
   ghcid_original: EE-XX-XXX-A-TCA
   ghcid_uuid: f87a0c7c-34c1-5f20-8114-3a2302b9df6e
   ghcid_uuid_sha256: ff638a91-4eec-8d50-9f95-340528b336c7
@@ -29,16 +29,24 @@ ghcid:
   - ghcid: EE-37-XXX-A-TCA-tallinn_city_archives
     valid_from: '2025-12-06T23:32:30.358021+00:00'
     reason: 'Region resolved via Wikidata P131: XX->37 (EE-37)'
+    valid_to: '2025-12-07T16:43:00.644255+00:00'
+  - ghcid: EE-01-TAL-A-TCA-tallinn_city_archives
+    ghcid_numeric: 18402704859065007440
+    valid_from: '2025-12-07T16:43:00.644255+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Tallinn (01)'
   location_resolution:
-    method: WIKIDATA_P131
+    method: GOOGLE_PLACES_GEONAMES
     country_code: EE
-    country_label: Estonia
-    region_code: '37'
-    city_code: XXX
-    city_label: ''
-    region_name: EE-37
-    iso_code_source: EE-37
-    resolution_timestamp: '2025-12-06T23:32:30.357960+00:00'
+    region_code: '01'
+    region_name: Harjumaa
+    city_code: TAL
+    city_name: Tallinn
+    geonames_id: 588409
+    feature_code: PPLC
+    google_place_id: ChIJb1MQemSTkkYR6cD9aeOqQhA
+    latitude: 59.4419409
+    longitude: 24.748231900000004
+    resolution_date: '2025-12-07T16:43:00.644255+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: Tallinn City Archives
@@ -55,3 +63,11 @@ unesco_mow_enrichment:
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:32:30Z: XX->37 via Wikidata P131 (EE-37)'
+google_maps_enrichment:
+  place_id: ChIJb1MQemSTkkYR6cD9aeOqQhA
+  formatted_address: Tolli tn 6, 10133 Tallinn, Estonia
+  website: https://www.tallinn.ee/est/Tallinna-Linnaarhiivi-tutvustus
+  latitude: 59.4419409
+  longitude: 24.748231900000004
+  enriched_at: '2025-12-07T16:43:00.644255+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/FR-IDF-XXX-A-NCCAP-national_centre_of_cinematography_and_animated_pic.yaml b/data/custodian/FR-11-P1O-A-NCCAP-national_centre_of_cinematography_and_animated_pic.yaml
similarity index 66%
rename from data/custodian/FR-IDF-XXX-A-NCCAP-national_centre_of_cinematography_and_animated_pic.yaml
rename to data/custodian/FR-11-P1O-A-NCCAP-national_centre_of_cinematography_and_animated_pic.yaml
index 66dd7a821c..40b3b25ba4 100644
--- a/data/custodian/FR-IDF-XXX-A-NCCAP-national_centre_of_cinematography_and_animated_pic.yaml
+++ b/data/custodian/FR-11-P1O-A-NCCAP-national_centre_of_cinematography_and_animated_pic.yaml
@@ -17,7 +17,7 @@ wikidata_enrichment:
   - organization
   - production company
 ghcid:
-  ghcid_current: FR-IDF-XXX-A-NCCAP-national_centre_of_cinematography_and_animated_pic
+  ghcid_current: FR-11-P1O-A-NCCAP-national_centre_of_cinematography_and_animated_pic
   ghcid_original: FR-XX-XXX-A-NCCAP
   ghcid_uuid: e7249698-71df-5630-bbb7-b6bce7288da0
   ghcid_uuid_sha256: 5eeb979c-e715-845c-ab5f-2e383acf2ac7
@@ -32,16 +32,25 @@ ghcid:
   - ghcid: FR-IDF-XXX-A-NCCAP-national_centre_of_cinematography_and_animated_pic
     valid_from: '2025-12-06T23:34:21.281578+00:00'
     reason: 'Region resolved via Wikidata P131: XX->IDF (FR-IDF)'
+    valid_to: '2025-12-07T16:42:03.385375+00:00'
+  - ghcid: FR-11-P1O-A-NCCAP-national_centre_of_cinematography_and_animated_pic
+    ghcid_numeric: 6839727159239881820
+    valid_from: '2025-12-07T16:42:03.385375+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Paris 14 Observatoire
+      (11)'
   location_resolution:
-    method: WIKIDATA_P131
+    method: GOOGLE_PLACES_GEONAMES
     country_code: FR
-    country_label: France
-    region_code: IDF
-    city_code: XXX
-    city_label: ''
-    region_name: FR-IDF
-    iso_code_source: FR-IDF
-    resolution_timestamp: '2025-12-06T23:34:21.281561+00:00'
+    region_code: '11'
+    region_name: Île-de-France
+    city_code: P1O
+    city_name: Paris 14 Observatoire
+    geonames_id: 2989781
+    feature_code: PPL
+    google_place_id: ChIJr7ZbleVv5kcRKyakisG2y8I
+    latitude: 48.835589399999996
+    longitude: 2.3323564
+    resolution_date: '2025-12-07T16:42:03.385375+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: National Centre of Cinematography and Animated Pictures
@@ -58,3 +67,11 @@ unesco_mow_enrichment:
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:34:21Z: XX->IDF via Wikidata P131 (FR-IDF)'
+google_maps_enrichment:
+  place_id: ChIJr7ZbleVv5kcRKyakisG2y8I
+  formatted_address: 291 Bd Raspail, 75014 Paris, France
+  website: http://www.cnc.fr/
+  latitude: 48.835589399999996
+  longitude: 2.3323564
+  enriched_at: '2025-12-07T16:42:03.385375+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/FR-IDF-XXX-A-NCCAP.yaml b/data/custodian/FR-11-P1O-A-NCCAP.yaml
similarity index 67%
rename from data/custodian/FR-IDF-XXX-A-NCCAP.yaml
rename to data/custodian/FR-11-P1O-A-NCCAP.yaml
index 497ef651d9..79a448c33b 100644
--- a/data/custodian/FR-IDF-XXX-A-NCCAP.yaml
+++ b/data/custodian/FR-11-P1O-A-NCCAP.yaml
@@ -17,7 +17,7 @@ wikidata_enrichment:
   - organization
   - production company
 ghcid:
-  ghcid_current: FR-IDF-XXX-A-NCCAP
+  ghcid_current: FR-11-P1O-A-NCCAP
   ghcid_original: FR-XX-XXX-A-NCCAP
   ghcid_uuid: e7249698-71df-5630-bbb7-b6bce7288da0
   ghcid_uuid_sha256: 5eeb979c-e715-845c-ab5f-2e383acf2ac7
@@ -32,16 +32,25 @@ ghcid:
   - ghcid: FR-IDF-XXX-A-NCCAP
     valid_from: '2025-12-06T23:35:43.574217+00:00'
     reason: 'Region resolved via Wikidata P131: XX->IDF (FR-IDF)'
+    valid_to: '2025-12-07T16:42:04.132604+00:00'
+  - ghcid: FR-11-P1O-A-NCCAP
+    ghcid_numeric: 6839727159239881820
+    valid_from: '2025-12-07T16:42:04.132604+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Paris 14 Observatoire
+      (11)'
   location_resolution:
-    method: WIKIDATA_P131
+    method: GOOGLE_PLACES_GEONAMES
     country_code: FR
-    country_label: France
-    region_code: IDF
-    city_code: XXX
-    city_label: ''
-    region_name: FR-IDF
-    iso_code_source: FR-IDF
-    resolution_timestamp: '2025-12-06T23:35:43.574206+00:00'
+    region_code: '11'
+    region_name: Île-de-France
+    city_code: P1O
+    city_name: Paris 14 Observatoire
+    geonames_id: 2989781
+    feature_code: PPL
+    google_place_id: ChIJr7ZbleVv5kcRKyakisG2y8I
+    latitude: 48.835589399999996
+    longitude: 2.3323564
+    resolution_date: '2025-12-07T16:42:04.132604+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: National Centre of Cinematography and Animated Pictures
@@ -58,3 +67,11 @@ unesco_mow_enrichment:
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:35:43Z: XX->IDF via Wikidata P131 (FR-IDF)'
+google_maps_enrichment:
+  place_id: ChIJr7ZbleVv5kcRKyakisG2y8I
+  formatted_address: 291 Bd Raspail, 75014 Paris, France
+  website: http://www.cnc.fr/
+  latitude: 48.835589399999996
+  longitude: 2.3323564
+  enriched_at: '2025-12-07T16:42:04.132604+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/FR-92-XXX-A-NIPI-national_industrial_property_institute.yaml b/data/custodian/FR-92-COU-A-NIPI-national_industrial_property_institute.yaml
similarity index 78%
rename from data/custodian/FR-92-XXX-A-NIPI-national_industrial_property_institute.yaml
rename to data/custodian/FR-92-COU-A-NIPI-national_industrial_property_institute.yaml
index c6b483d29f..fa25e6be3c 100644
--- a/data/custodian/FR-92-XXX-A-NIPI-national_industrial_property_institute.yaml
+++ b/data/custodian/FR-92-COU-A-NIPI-national_industrial_property_institute.yaml
@@ -1,68 +1,70 @@
-original_entry:
-  name: National Industrial Property Institute
-  source: UNESCO Memory of the World (via Wikidata)
-  wikidata_id: Q3152401
-  mow_inscriptions:
-  - wikidata_id: Q135028732
-    name: 'Humanity''s First Recordings of its Own Voice: The Phonautograms of Édouard-Léon
-      Scott de Martinville (c.1853-1860)'
-    country: France
-  - wikidata_id: Q135028781
-    name: The moving picture shows of Émile Reynaud
-    country: France
-processing_timestamp: '2025-12-06T21:07:00.512729+00:00'
-wikidata_enrichment:
-  wikidata_entity_id: Q3152401
-  wikidata_label_en: National Industrial Property Institute
-  wikidata_description_en: Heritage institution holding UNESCO Memory of the World
-    inscribed documents
-  instance_of: database
-  all_types:
-  - database
-  - patent office
-ghcid:
-  ghcid_current: FR-92-XXX-A-NIPI-national_industrial_property_institute
-  ghcid_original: FR-XX-XXX-A-NIPI
-  ghcid_uuid: b898350f-e24e-5bec-b79e-8f3d409c9726
-  ghcid_uuid_sha256: 6c2eafe8-0fd3-81e7-aa8f-fd9950852d78
-  ghcid_numeric: 7795361416257683943
-  record_id: 37a7336b-e8d5-46ae-a444-f8caae328b03
-  generation_timestamp: '2025-12-06T21:07:00.512729+00:00'
-  ghcid_history:
-  - ghcid: FR-XX-XXX-A-NIPI-national_industrial_property_institute
-    ghcid_numeric: 7795361416257683943
-    valid_from: '2025-12-06T21:07:00.512729+00:00'
-    reason: Name suffix added to resolve GHCID collision
-  - ghcid: FR-92-XXX-A-NIPI-national_industrial_property_institute
-    valid_from: '2025-12-06T23:33:07.152466+00:00'
-    reason: 'Region resolved via Wikidata P131: XX->92 (FR-92)'
-  location_resolution:
-    method: WIKIDATA_P131
-    country_code: FR
-    country_label: France
-    region_code: '92'
-    city_code: XXX
-    city_label: ''
-    region_name: FR-92
-    iso_code_source: FR-92
-    resolution_timestamp: '2025-12-06T23:33:07.152452+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: National Industrial Property Institute
   source_type: wikidata
-unesco_mow_enrichment:
-  is_mow_custodian: true
-  inscription_count: 2
-  inscriptions:
-  - wikidata_id: Q135028732
+ghcid:
+  generation_timestamp: '2025-12-06T21:07:00.512729+00:00'
+  ghcid_current: FR-92-COU-A-NIPI-national_industrial_property_institute
+  ghcid_history:
+  - ghcid: FR-XX-XXX-A-NIPI-national_industrial_property_institute
+    ghcid_numeric: 7795361416257683943
+    reason: Name suffix added to resolve GHCID collision
+    valid_from: '2025-12-06T21:07:00.512729+00:00'
+  - ghcid: FR-92-XXX-A-NIPI-national_industrial_property_institute
+    reason: 'Region resolved via Wikidata P131: XX->92 (FR-92)'
+    valid_from: '2025-12-06T23:33:07.152466+00:00'
+  ghcid_numeric: 7795361416257683943
+  ghcid_original: FR-XX-XXX-A-NIPI
+  ghcid_uuid: b898350f-e24e-5bec-b79e-8f3d409c9726
+  ghcid_uuid_sha256: 6c2eafe8-0fd3-81e7-aa8f-fd9950852d78
+  location_resolution:
+    city_code: COU
+    city_name: Courbevoie
+    country_code: FR
+    geonames_id: 3023349
+    latitude: 48.9046
+    longitude: 2.2621
+    method: MANUAL_RESEARCH
+    notes: INPI headquarters in Courbevoie, France
+    region_code: '92'
+    region_name: Hauts-de-Seine
+    resolution_date: '2025-12-07T16:44:07.089475+00:00'
+  record_id: 37a7336b-e8d5-46ae-a444-f8caae328b03
+original_entry:
+  mow_inscriptions:
+  - country: France
     name: 'Humanity''s First Recordings of its Own Voice: The Phonautograms of Édouard-Léon
       Scott de Martinville (c.1853-1860)'
-    inscription_country: France
-  - wikidata_id: Q135028781
+    wikidata_id: Q135028732
+  - country: France
     name: The moving picture shows of Émile Reynaud
-    inscription_country: France
-  enrichment_timestamp: '2025-12-06T21:07:00.512729+00:00'
-  data_source: Wikidata SPARQL (UNESCO has no MoW API)
+    wikidata_id: Q135028781
+  name: National Industrial Property Institute
+  source: UNESCO Memory of the World (via Wikidata)
+  wikidata_id: Q3152401
+processing_timestamp: '2025-12-06T21:07:00.512729+00:00'
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:33:07Z: XX->92 via Wikidata P131 (FR-92)'
+unesco_mow_enrichment:
+  data_source: Wikidata SPARQL (UNESCO has no MoW API)
+  enrichment_timestamp: '2025-12-06T21:07:00.512729+00:00'
+  inscription_count: 2
+  inscriptions:
+  - inscription_country: France
+    name: 'Humanity''s First Recordings of its Own Voice: The Phonautograms of Édouard-Léon
+      Scott de Martinville (c.1853-1860)'
+    wikidata_id: Q135028732
+  - inscription_country: France
+    name: The moving picture shows of Émile Reynaud
+    wikidata_id: Q135028781
+  is_mow_custodian: true
+wikidata_enrichment:
+  all_types:
+  - database
+  - patent office
+  instance_of: database
+  wikidata_description_en: Heritage institution holding UNESCO Memory of the World
+    inscribed documents
+  wikidata_entity_id: Q3152401
+  wikidata_label_en: National Industrial Property Institute
diff --git a/data/custodian/GB-UKM-XXX-M-RMG-royal_museums_greenwich.yaml b/data/custodian/GB-ENG-CUB-M-RMG-royal_museums_greenwich.yaml
similarity index 65%
rename from data/custodian/GB-UKM-XXX-M-RMG-royal_museums_greenwich.yaml
rename to data/custodian/GB-ENG-CUB-M-RMG-royal_museums_greenwich.yaml
index a19525be83..9678e45cd3 100644
--- a/data/custodian/GB-UKM-XXX-M-RMG-royal_museums_greenwich.yaml
+++ b/data/custodian/GB-ENG-CUB-M-RMG-royal_museums_greenwich.yaml
@@ -14,7 +14,7 @@ wikidata_enrichment:
     inscribed documents
   instance_of: museum network
 ghcid:
-  ghcid_current: GB-UKM-XXX-M-RMG-royal_museums_greenwich
+  ghcid_current: GB-ENG-CUB-M-RMG-royal_museums_greenwich
   ghcid_original: GB-XX-XXX-M-RMG
   ghcid_uuid: 0fc605aa-9bf9-55a8-80df-9c34d09932ef
   ghcid_uuid_sha256: d4af41a6-e83b-8a79-8727-09cac241b4e7
@@ -29,16 +29,24 @@ ghcid:
   - ghcid: GB-UKM-XXX-M-RMG-royal_museums_greenwich
     valid_from: '2025-12-06T23:32:27.911114+00:00'
     reason: 'Region resolved via Wikidata P131: XX->UKM (GB-UKM)'
+    valid_to: '2025-12-07T16:42:05.124010+00:00'
+  - ghcid: GB-ENG-CUB-M-RMG-royal_museums_greenwich
+    ghcid_numeric: 15325540242081655417
+    valid_from: '2025-12-07T16:42:05.124010+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Cubitt Town (ENG)'
   location_resolution:
-    method: WIKIDATA_P131
+    method: GOOGLE_PLACES_GEONAMES
     country_code: GB
-    country_label: United Kingdom
-    region_code: UKM
-    city_code: XXX
-    city_label: ''
-    region_name: GB-UKM
-    iso_code_source: GB-UKM
-    resolution_timestamp: '2025-12-06T23:32:27.911100+00:00'
+    region_code: ENG
+    region_name: England
+    city_code: CUB
+    city_name: Cubitt Town
+    geonames_id: 2651790
+    feature_code: PPL
+    google_place_id: ChIJkc80oqwDdkgR9DLjbEyOJv8
+    latitude: 51.480845200000005
+    longitude: -0.0053214
+    resolution_date: '2025-12-07T16:42:05.124010+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: Royal Museums Greenwich
@@ -55,3 +63,11 @@ unesco_mow_enrichment:
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:32:27Z: XX->UKM via Wikidata P131 (GB-UKM)'
+google_maps_enrichment:
+  place_id: ChIJkc80oqwDdkgR9DLjbEyOJv8
+  formatted_address: Romney Rd, London SE10 9NF, UK
+  website: http://www.rmg.co.uk/
+  latitude: 51.480845200000005
+  longitude: -0.0053214
+  enriched_at: '2025-12-07T16:42:05.124010+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/GB-UKM-XXX-M-RMG.yaml b/data/custodian/GB-ENG-CUB-M-RMG.yaml
similarity index 65%
rename from data/custodian/GB-UKM-XXX-M-RMG.yaml
rename to data/custodian/GB-ENG-CUB-M-RMG.yaml
index 0883014b23..685a490762 100644
--- a/data/custodian/GB-UKM-XXX-M-RMG.yaml
+++ b/data/custodian/GB-ENG-CUB-M-RMG.yaml
@@ -14,7 +14,7 @@ wikidata_enrichment:
     inscribed documents
   instance_of: museum network
 ghcid:
-  ghcid_current: GB-UKM-XXX-M-RMG
+  ghcid_current: GB-ENG-CUB-M-RMG
   ghcid_original: GB-XX-XXX-M-RMG
   ghcid_uuid: 0fc605aa-9bf9-55a8-80df-9c34d09932ef
   ghcid_uuid_sha256: d4af41a6-e83b-8a79-8727-09cac241b4e7
@@ -29,16 +29,24 @@ ghcid:
   - ghcid: GB-UKM-XXX-M-RMG
     valid_from: '2025-12-06T23:33:43.124226+00:00'
     reason: 'Region resolved via Wikidata P131: XX->UKM (GB-UKM)'
+    valid_to: '2025-12-07T16:42:05.853738+00:00'
+  - ghcid: GB-ENG-CUB-M-RMG
+    ghcid_numeric: 15325540242081655417
+    valid_from: '2025-12-07T16:42:05.853738+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Cubitt Town (ENG)'
   location_resolution:
-    method: WIKIDATA_P131
+    method: GOOGLE_PLACES_GEONAMES
     country_code: GB
-    country_label: United Kingdom
-    region_code: UKM
-    city_code: XXX
-    city_label: ''
-    region_name: GB-UKM
-    iso_code_source: GB-UKM
-    resolution_timestamp: '2025-12-06T23:33:43.124212+00:00'
+    region_code: ENG
+    region_name: England
+    city_code: CUB
+    city_name: Cubitt Town
+    geonames_id: 2651790
+    feature_code: PPL
+    google_place_id: ChIJkc80oqwDdkgR9DLjbEyOJv8
+    latitude: 51.480845200000005
+    longitude: -0.0053214
+    resolution_date: '2025-12-07T16:42:05.853738+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: Royal Museums Greenwich
@@ -55,3 +63,11 @@ unesco_mow_enrichment:
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:33:43Z: XX->UKM via Wikidata P131 (GB-UKM)'
+google_maps_enrichment:
+  place_id: ChIJkc80oqwDdkgR9DLjbEyOJv8
+  formatted_address: Romney Rd, London SE10 9NF, UK
+  website: http://www.rmg.co.uk/
+  latitude: 51.480845200000005
+  longitude: -0.0053214
+  enriched_at: '2025-12-07T16:42:05.853738+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/GB-UKM-XXX-O-BLB-british_library_board.yaml b/data/custodian/GB-ENG-KCR-O-BLB-british_library_board.yaml
similarity index 65%
rename from data/custodian/GB-UKM-XXX-O-BLB-british_library_board.yaml
rename to data/custodian/GB-ENG-KCR-O-BLB-british_library_board.yaml
index 3ae8158ed1..c83fb13813 100644
--- a/data/custodian/GB-UKM-XXX-O-BLB-british_library_board.yaml
+++ b/data/custodian/GB-ENG-KCR-O-BLB-british_library_board.yaml
@@ -17,7 +17,7 @@ wikidata_enrichment:
   - board of directors
   - non-departmental public body
 ghcid:
-  ghcid_current: GB-UKM-XXX-O-BLB-british_library_board
+  ghcid_current: GB-ENG-KCR-O-BLB-british_library_board
   ghcid_original: GB-XX-XXX-O-BLB
   ghcid_uuid: f156383c-d0af-53b1-89a7-cbc0517bba01
   ghcid_uuid_sha256: a7834be5-7eb9-8338-b837-878f1cabc316
@@ -32,16 +32,24 @@ ghcid:
   - ghcid: GB-UKM-XXX-O-BLB-british_library_board
     valid_from: '2025-12-06T23:34:48.443626+00:00'
     reason: 'Region resolved via Wikidata P131: XX->UKM (GB-UKM)'
+    valid_to: '2025-12-07T16:42:06.566026+00:00'
+  - ghcid: GB-ENG-KCR-O-BLB-british_library_board
+    ghcid_numeric: 12070574875328746296
+    valid_from: '2025-12-07T16:42:06.566026+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: King''s Cross (ENG)'
   location_resolution:
-    method: WIKIDATA_P131
+    method: GOOGLE_PLACES_GEONAMES
     country_code: GB
-    country_label: United Kingdom
-    region_code: UKM
-    city_code: XXX
-    city_label: ''
-    region_name: GB-UKM
-    iso_code_source: GB-UKM
-    resolution_timestamp: '2025-12-06T23:34:48.443615+00:00'
+    region_code: ENG
+    region_name: England
+    city_code: KCR
+    city_name: King's Cross
+    geonames_id: 6690589
+    feature_code: PPL
+    google_place_id: ChIJlRMXcDsbdkgRJdsP3nlUkBg
+    latitude: 51.5299717
+    longitude: -0.12767589999999998
+    resolution_date: '2025-12-07T16:42:06.566026+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: British Library Board
@@ -58,3 +66,11 @@ unesco_mow_enrichment:
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:34:48Z: XX->UKM via Wikidata P131 (GB-UKM)'
+google_maps_enrichment:
+  place_id: ChIJlRMXcDsbdkgRJdsP3nlUkBg
+  formatted_address: 96 Euston Rd., London NW1 2DB, UK
+  website: https://www.bl.uk/
+  latitude: 51.5299717
+  longitude: -0.12767589999999998
+  enriched_at: '2025-12-07T16:42:06.566026+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/GB-UKM-XXX-O-BLB.yaml b/data/custodian/GB-ENG-KCR-O-BLB.yaml
similarity index 66%
rename from data/custodian/GB-UKM-XXX-O-BLB.yaml
rename to data/custodian/GB-ENG-KCR-O-BLB.yaml
index 1bd2bfeaf4..319f879917 100644
--- a/data/custodian/GB-UKM-XXX-O-BLB.yaml
+++ b/data/custodian/GB-ENG-KCR-O-BLB.yaml
@@ -17,7 +17,7 @@ wikidata_enrichment:
   - board of directors
   - non-departmental public body
 ghcid:
-  ghcid_current: GB-UKM-XXX-O-BLB
+  ghcid_current: GB-ENG-KCR-O-BLB
   ghcid_original: GB-XX-XXX-O-BLB
   ghcid_uuid: f156383c-d0af-53b1-89a7-cbc0517bba01
   ghcid_uuid_sha256: a7834be5-7eb9-8338-b837-878f1cabc316
@@ -32,16 +32,24 @@ ghcid:
   - ghcid: GB-UKM-XXX-O-BLB
     valid_from: '2025-12-06T23:33:08.176504+00:00'
     reason: 'Region resolved via Wikidata P131: XX->UKM (GB-UKM)'
+    valid_to: '2025-12-07T16:42:07.290799+00:00'
+  - ghcid: GB-ENG-KCR-O-BLB
+    ghcid_numeric: 12070574875328746296
+    valid_from: '2025-12-07T16:42:07.290799+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: King''s Cross (ENG)'
   location_resolution:
-    method: WIKIDATA_P131
+    method: GOOGLE_PLACES_GEONAMES
     country_code: GB
-    country_label: United Kingdom
-    region_code: UKM
-    city_code: XXX
-    city_label: ''
-    region_name: GB-UKM
-    iso_code_source: GB-UKM
-    resolution_timestamp: '2025-12-06T23:33:08.176483+00:00'
+    region_code: ENG
+    region_name: England
+    city_code: KCR
+    city_name: King's Cross
+    geonames_id: 6690589
+    feature_code: PPL
+    google_place_id: ChIJlRMXcDsbdkgRJdsP3nlUkBg
+    latitude: 51.5299717
+    longitude: -0.12767589999999998
+    resolution_date: '2025-12-07T16:42:07.290799+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: British Library Board
@@ -58,3 +66,11 @@ unesco_mow_enrichment:
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:33:08Z: XX->UKM via Wikidata P131 (GB-UKM)'
+google_maps_enrichment:
+  place_id: ChIJlRMXcDsbdkgRJdsP3nlUkBg
+  formatted_address: 96 Euston Rd., London NW1 2DB, UK
+  website: https://www.bl.uk/
+  latitude: 51.5299717
+  longitude: -0.12767589999999998
+  enriched_at: '2025-12-07T16:42:07.290799+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/IN-BR-XXX-L-KBOL-khuda_bakhsh_oriental_library.yaml b/data/custodian/IN-34-BAN-L-KBOL-khuda_bakhsh_oriental_library.yaml
similarity index 65%
rename from data/custodian/IN-BR-XXX-L-KBOL-khuda_bakhsh_oriental_library.yaml
rename to data/custodian/IN-34-BAN-L-KBOL-khuda_bakhsh_oriental_library.yaml
index be8c13564c..80e1ab175c 100644
--- a/data/custodian/IN-BR-XXX-L-KBOL-khuda_bakhsh_oriental_library.yaml
+++ b/data/custodian/IN-34-BAN-L-KBOL-khuda_bakhsh_oriental_library.yaml
@@ -17,7 +17,7 @@ wikidata_enrichment:
   - library
   - publishing company
 ghcid:
-  ghcid_current: IN-BR-XXX-L-KBOL-khuda_bakhsh_oriental_library
+  ghcid_current: IN-34-BAN-L-KBOL-khuda_bakhsh_oriental_library
   ghcid_original: IN-XX-XXX-L-KBOL
   ghcid_uuid: eeca9ab0-304e-57bd-a2a1-a6881867fa4d
   ghcid_uuid_sha256: 7288fb6a-a7fc-856e-999a-49837384f22f
@@ -32,16 +32,24 @@ ghcid:
   - ghcid: IN-BR-XXX-L-KBOL-khuda_bakhsh_oriental_library
     valid_from: '2025-12-06T23:33:26.908011+00:00'
     reason: 'Region resolved via Wikidata P131: XX->BR (IN-BR)'
+    valid_to: '2025-12-07T16:40:57.796871+00:00'
+  - ghcid: IN-34-BAN-L-KBOL-khuda_bakhsh_oriental_library
+    ghcid_numeric: 8253122752659854702
+    valid_from: '2025-12-07T16:40:57.796871+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Bankipore (34)'
   location_resolution:
-    method: WIKIDATA_P131
+    method: GOOGLE_PLACES_GEONAMES
     country_code: IN
-    country_label: India
-    region_code: BR
-    city_code: XXX
-    city_label: ''
-    region_name: IN-BR
-    iso_code_source: IN-BR
-    resolution_timestamp: '2025-12-06T23:33:26.908001+00:00'
+    region_code: '34'
+    region_name: Bihar
+    city_code: BAN
+    city_name: Bankipore
+    geonames_id: 1277270
+    feature_code: PPL
+    google_place_id: ChIJj13UrUhZ7TkR2GVs59fQqTE
+    latitude: 25.6192839
+    longitude: 85.1625378
+    resolution_date: '2025-12-07T16:40:57.796871+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: Khuda Bakhsh Oriental Library
@@ -58,3 +66,11 @@ unesco_mow_enrichment:
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:33:26Z: XX->BR via Wikidata P131 (IN-BR)'
+google_maps_enrichment:
+  place_id: ChIJj13UrUhZ7TkR2GVs59fQqTE
+  formatted_address: Patna University Campus, Patna, Bihar 800004, India
+  website: http://kblibrary.bih.nic.in/
+  latitude: 25.6192839
+  longitude: 85.1625378
+  enriched_at: '2025-12-07T16:40:57.796871+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/IN-BR-XXX-L-KBOL.yaml b/data/custodian/IN-34-BAN-L-KBOL.yaml
similarity index 66%
rename from data/custodian/IN-BR-XXX-L-KBOL.yaml
rename to data/custodian/IN-34-BAN-L-KBOL.yaml
index a26d45e515..a2870a5f04 100644
--- a/data/custodian/IN-BR-XXX-L-KBOL.yaml
+++ b/data/custodian/IN-34-BAN-L-KBOL.yaml
@@ -17,7 +17,7 @@ wikidata_enrichment:
   - library
   - publishing company
 ghcid:
-  ghcid_current: IN-BR-XXX-L-KBOL
+  ghcid_current: IN-34-BAN-L-KBOL
   ghcid_original: IN-XX-XXX-L-KBOL
   ghcid_uuid: eeca9ab0-304e-57bd-a2a1-a6881867fa4d
   ghcid_uuid_sha256: 7288fb6a-a7fc-856e-999a-49837384f22f
@@ -32,16 +32,24 @@ ghcid:
   - ghcid: IN-BR-XXX-L-KBOL
     valid_from: '2025-12-06T23:34:04.172391+00:00'
     reason: 'Region resolved via Wikidata P131: XX->BR (IN-BR)'
+    valid_to: '2025-12-07T16:40:58.569786+00:00'
+  - ghcid: IN-34-BAN-L-KBOL
+    ghcid_numeric: 8253122752659854702
+    valid_from: '2025-12-07T16:40:58.569786+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Bankipore (34)'
   location_resolution:
-    method: WIKIDATA_P131
+    method: GOOGLE_PLACES_GEONAMES
     country_code: IN
-    country_label: India
-    region_code: BR
-    city_code: XXX
-    city_label: ''
-    region_name: IN-BR
-    iso_code_source: IN-BR
-    resolution_timestamp: '2025-12-06T23:34:04.172381+00:00'
+    region_code: '34'
+    region_name: Bihar
+    city_code: BAN
+    city_name: Bankipore
+    geonames_id: 1277270
+    feature_code: PPL
+    google_place_id: ChIJj13UrUhZ7TkR2GVs59fQqTE
+    latitude: 25.6192839
+    longitude: 85.1625378
+    resolution_date: '2025-12-07T16:40:58.569786+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: Khuda Bakhsh Oriental Library
@@ -58,3 +66,11 @@ unesco_mow_enrichment:
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:34:04Z: XX->BR via Wikidata P131 (IN-BR)'
+google_maps_enrichment:
+  place_id: ChIJj13UrUhZ7TkR2GVs59fQqTE
+  formatted_address: Patna University Campus, Patna, Bihar 800004, India
+  website: http://kblibrary.bih.nic.in/
+  latitude: 25.6192839
+  longitude: 85.1625378
+  enriched_at: '2025-12-07T16:40:58.569786+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/JP-OS-XXX-L-OITUBL.yaml b/data/custodian/JP-32-MTI-L-OITUBL.yaml
similarity index 81%
rename from data/custodian/JP-OS-XXX-L-OITUBL.yaml
rename to data/custodian/JP-32-MTI-L-OITUBL.yaml
index 080fc08b61..17a795dfd4 100644
--- a/data/custodian/JP-OS-XXX-L-OITUBL.yaml
+++ b/data/custodian/JP-32-MTI-L-OITUBL.yaml
@@ -22,7 +22,7 @@ original_entry:
     street_address: 1-45 CHAYAMACHI, Osaka Fu, 530-0013
 processing_timestamp: '2025-12-06T23:38:59.857611+00:00'
 ghcid:
-  ghcid_current: JP-OS-XXX-L-OITUBL
+  ghcid_current: JP-32-MTI-L-OITUBL
   ghcid_original: JP-OS-XXX-L-OITUBL
   ghcid_uuid: 4f1159fa-efc0-54b8-a314-bfaa39c4f79f
   ghcid_uuid_sha256: 57c47fe4-76d6-8abb-c755-1209d709424f
@@ -30,22 +30,35 @@ ghcid:
   record_id: d706fd41-dcc9-4e2c-8cf8-7725ba4b20c4
   generation_timestamp: '2025-12-06T23:38:59.857611+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: JP
-    region_code: OS
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: '32'
+    region_name: Osaka
+    city_code: MTI
+    city_name: mei tian
+    geonames_id: 7302985
+    feature_code: PPL
+    google_place_id: ChIJof-_3JPmAGARo93FQSRGgss
+    latitude: 34.705481299999995
+    longitude: 135.50019659999998
+    resolution_date: '2025-12-07T16:40:59.641737+00:00'
   ghcid_history:
   - ghcid: JP-OS-XXX-L-OITUBL
     ghcid_numeric: 6324320395958041275
     valid_from: '2025-12-06T23:38:59.857611+00:00'
     reason: Initial GHCID from CH-Annotator (japan_complete_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:59.641737+00:00'
+  - ghcid: JP-32-MTI-L-OITUBL
+    ghcid_numeric: 6324320395958041275
+    valid_from: '2025-12-07T16:40:59.641737+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: mei tian (32)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Osaka Institute of Technology Umeda Branch Library
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: JP-OS-XXX-L-OITUBL
+  identifier_value: JP-32-MTI-L-OITUBL
 - identifier_scheme: GHCID_UUID
   identifier_value: 4f1159fa-efc0-54b8-a314-bfaa39c4f79f
 - identifier_scheme: GHCID_UUID_SHA256
@@ -130,3 +143,11 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q113160426
   wikidata_label_en: Osaka Institute of Technology Umeda Branch Library
+google_maps_enrichment:
+  place_id: ChIJof-_3JPmAGARo93FQSRGgss
+  formatted_address: 1-45 Chayamachi, Kita Ward, Osaka, 530-0013, Japan
+  website: https://www.oit.ac.jp/rd/umeda/index.html
+  latitude: 34.705481299999995
+  longitude: 135.50019659999998
+  enriched_at: '2025-12-07T16:40:59.641737+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/KR-27-XXX-A-CANDRM-the_commemorative_association_of_the_national_debt.yaml b/data/custodian/KR-11-SAJ-A-CANDRM-the_commemorative_association_of_the_national_debt.yaml
similarity index 65%
rename from data/custodian/KR-27-XXX-A-CANDRM-the_commemorative_association_of_the_national_debt.yaml
rename to data/custodian/KR-11-SAJ-A-CANDRM-the_commemorative_association_of_the_national_debt.yaml
index 9ced8f2763..9bb25f9c97 100644
--- a/data/custodian/KR-27-XXX-A-CANDRM-the_commemorative_association_of_the_national_debt.yaml
+++ b/data/custodian/KR-11-SAJ-A-CANDRM-the_commemorative_association_of_the_national_debt.yaml
@@ -19,7 +19,7 @@ wikidata_enrichment:
   - archive
   - corporation
 ghcid:
-  ghcid_current: KR-27-XXX-A-CANDRM-the_commemorative_association_of_the_national_debt
+  ghcid_current: KR-11-SAJ-A-CANDRM-the_commemorative_association_of_the_national_debt
   ghcid_original: KR-XX-XXX-A-CANDRM
   ghcid_uuid: 2b3839f8-8ff9-5f0e-bad6-a05647acce3c
   ghcid_uuid_sha256: 7d85f02f-0f9d-8a8a-98f5-262f66c3a369
@@ -34,16 +34,24 @@ ghcid:
   - ghcid: KR-27-XXX-A-CANDRM-the_commemorative_association_of_the_national_debt
     valid_from: '2025-12-06T23:34:06.013094+00:00'
     reason: 'Region resolved via Wikidata P131: XX->27 (KR-27)'
+    valid_to: '2025-12-07T16:42:09.799698+00:00'
+  - ghcid: KR-11-SAJ-A-CANDRM-the_commemorative_association_of_the_national_debt
+    ghcid_numeric: 9044899511559617162
+    valid_from: '2025-12-07T16:42:09.799698+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Sajik-tong (11)'
   location_resolution:
-    method: WIKIDATA_P131
+    method: GOOGLE_PLACES_GEONAMES
     country_code: KR
-    country_label: South Korea
-    region_code: '27'
-    city_code: XXX
-    city_label: ''
-    region_name: KR-27
-    iso_code_source: KR-27
-    resolution_timestamp: '2025-12-06T23:34:06.013081+00:00'
+    region_code: '11'
+    region_name: Seoul
+    city_code: SAJ
+    city_name: Sajik-tong
+    geonames_id: 6800579
+    feature_code: PPL
+    google_place_id: ChIJCR0bi--ifDURuR4iwKEJmSo
+    latitude: 37.571365500000006
+    longitude: 126.97370459999999
+    resolution_date: '2025-12-07T16:42:09.799698+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: The Commemorative Association of the National Debt Redemption Movement
@@ -60,3 +68,12 @@ unesco_mow_enrichment:
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:34:06Z: XX->27 via Wikidata P131 (KR-27)'
+google_maps_enrichment:
+  place_id: ChIJCR0bi--ifDURuR4iwKEJmSo
+  formatted_address: South Korea, Seoul, Jongno District, Dangju-dong, Sejong-daero
+    23-gil, 47 5 새문안광화문빌딩 층 524, 525호
+  website: http://www.consumer.or.kr/
+  latitude: 37.571365500000006
+  longitude: 126.97370459999999
+  enriched_at: '2025-12-07T16:42:09.799698+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/KR-27-XXX-A-CANDRM.yaml b/data/custodian/KR-11-SAJ-A-CANDRM.yaml
similarity index 66%
rename from data/custodian/KR-27-XXX-A-CANDRM.yaml
rename to data/custodian/KR-11-SAJ-A-CANDRM.yaml
index 167d2546b5..895c49be0a 100644
--- a/data/custodian/KR-27-XXX-A-CANDRM.yaml
+++ b/data/custodian/KR-11-SAJ-A-CANDRM.yaml
@@ -19,7 +19,7 @@ wikidata_enrichment:
   - archive
   - corporation
 ghcid:
-  ghcid_current: KR-27-XXX-A-CANDRM
+  ghcid_current: KR-11-SAJ-A-CANDRM
   ghcid_original: KR-XX-XXX-A-CANDRM
   ghcid_uuid: 2b3839f8-8ff9-5f0e-bad6-a05647acce3c
   ghcid_uuid_sha256: 7d85f02f-0f9d-8a8a-98f5-262f66c3a369
@@ -34,16 +34,24 @@ ghcid:
   - ghcid: KR-27-XXX-A-CANDRM
     valid_from: '2025-12-06T23:34:30.360259+00:00'
     reason: 'Region resolved via Wikidata P131: XX->27 (KR-27)'
+    valid_to: '2025-12-07T16:42:10.485881+00:00'
+  - ghcid: KR-11-SAJ-A-CANDRM
+    ghcid_numeric: 9044899511559617162
+    valid_from: '2025-12-07T16:42:10.485881+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Sajik-tong (11)'
   location_resolution:
-    method: WIKIDATA_P131
+    method: GOOGLE_PLACES_GEONAMES
     country_code: KR
-    country_label: South Korea
-    region_code: '27'
-    city_code: XXX
-    city_label: ''
-    region_name: KR-27
-    iso_code_source: KR-27
-    resolution_timestamp: '2025-12-06T23:34:30.360248+00:00'
+    region_code: '11'
+    region_name: Seoul
+    city_code: SAJ
+    city_name: Sajik-tong
+    geonames_id: 6800579
+    feature_code: PPL
+    google_place_id: ChIJCR0bi--ifDURuR4iwKEJmSo
+    latitude: 37.571365500000006
+    longitude: 126.97370459999999
+    resolution_date: '2025-12-07T16:42:10.485881+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: The Commemorative Association of the National Debt Redemption Movement
@@ -60,3 +68,12 @@ unesco_mow_enrichment:
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:34:30Z: XX->27 via Wikidata P131 (KR-27)'
+google_maps_enrichment:
+  place_id: ChIJCR0bi--ifDURuR4iwKEJmSo
+  formatted_address: South Korea, Seoul, Jongno District, Dangju-dong, Sejong-daero
+    23-gil, 47 5 새문안광화문빌딩 층 524, 525호
+  website: http://www.consumer.or.kr/
+  latitude: 37.571365500000006
+  longitude: 126.97370459999999
+  enriched_at: '2025-12-07T16:42:10.485881+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/KR-11-XXX-C-DI-the_dong_a_ilbo.yaml b/data/custodian/KR-11-SEO-C-DI-the_dong_a_ilbo.yaml
similarity index 65%
rename from data/custodian/KR-11-XXX-C-DI-the_dong_a_ilbo.yaml
rename to data/custodian/KR-11-SEO-C-DI-the_dong_a_ilbo.yaml
index 320c1e57fb..85ae9550a7 100644
--- a/data/custodian/KR-11-XXX-C-DI-the_dong_a_ilbo.yaml
+++ b/data/custodian/KR-11-SEO-C-DI-the_dong_a_ilbo.yaml
@@ -14,7 +14,7 @@ wikidata_enrichment:
     inscribed documents
   instance_of: newspaper
 ghcid:
-  ghcid_current: KR-11-XXX-C-DI-the_dong_a_ilbo
+  ghcid_current: KR-11-SEO-C-DI-the_dong_a_ilbo
   ghcid_original: KR-XX-XXX-C-DI
   ghcid_uuid: 1cd56245-cdb2-51b1-8a72-a6b75a0b963a
   ghcid_uuid_sha256: affd368c-495c-8e90-9d80-081767efb4b5
@@ -29,16 +29,24 @@ ghcid:
   - ghcid: KR-11-XXX-C-DI-the_dong_a_ilbo
     valid_from: '2025-12-06T23:32:09.469971+00:00'
     reason: 'Region resolved via Wikidata P131: XX->11 (KR-11)'
+    valid_to: '2025-12-07T16:42:08.389379+00:00'
+  - ghcid: KR-11-SEO-C-DI-the_dong_a_ilbo
+    ghcid_numeric: 12681352101899288208
+    valid_from: '2025-12-07T16:42:08.389379+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Seoul (11)'
   location_resolution:
-    method: WIKIDATA_P131
+    method: GOOGLE_PLACES_GEONAMES
     country_code: KR
-    country_label: South Korea
     region_code: '11'
-    city_code: XXX
-    city_label: ''
-    region_name: KR-11
-    iso_code_source: KR-11
-    resolution_timestamp: '2025-12-06T23:32:09.469930+00:00'
+    region_name: Seoul
+    city_code: SEO
+    city_name: Seoul
+    geonames_id: 1835848
+    feature_code: PPLC
+    google_place_id: ChIJE8UZ8OyifDURYx0GF4eFKUc
+    latitude: 37.5695565
+    longitude: 126.9778724
+    resolution_date: '2025-12-07T16:42:08.389379+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: The Dong-a Ilbo
@@ -55,3 +63,11 @@ unesco_mow_enrichment:
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:32:09Z: XX->11 via Wikidata P131 (KR-11)'
+google_maps_enrichment:
+  place_id: ChIJE8UZ8OyifDURYx0GF4eFKUc
+  formatted_address: 1 Cheonggyecheon-ro, Jongno District, Seoul, South Korea
+  website: http://www.donga.com/
+  latitude: 37.5695565
+  longitude: 126.9778724
+  enriched_at: '2025-12-07T16:42:08.389379+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/KR-11-XXX-C-DI.yaml b/data/custodian/KR-11-SEO-C-DI.yaml
similarity index 66%
rename from data/custodian/KR-11-XXX-C-DI.yaml
rename to data/custodian/KR-11-SEO-C-DI.yaml
index d481d52ecd..55761afa4f 100644
--- a/data/custodian/KR-11-XXX-C-DI.yaml
+++ b/data/custodian/KR-11-SEO-C-DI.yaml
@@ -14,7 +14,7 @@ wikidata_enrichment:
     inscribed documents
   instance_of: newspaper
 ghcid:
-  ghcid_current: KR-11-XXX-C-DI
+  ghcid_current: KR-11-SEO-C-DI
   ghcid_original: KR-XX-XXX-C-DI
   ghcid_uuid: 1cd56245-cdb2-51b1-8a72-a6b75a0b963a
   ghcid_uuid_sha256: affd368c-495c-8e90-9d80-081767efb4b5
@@ -29,16 +29,24 @@ ghcid:
   - ghcid: KR-11-XXX-C-DI
     valid_from: '2025-12-06T23:35:08.842102+00:00'
     reason: 'Region resolved via Wikidata P131: XX->11 (KR-11)'
+    valid_to: '2025-12-07T16:42:09.047035+00:00'
+  - ghcid: KR-11-SEO-C-DI
+    ghcid_numeric: 12681352101899288208
+    valid_from: '2025-12-07T16:42:09.047035+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Seoul (11)'
   location_resolution:
-    method: WIKIDATA_P131
+    method: GOOGLE_PLACES_GEONAMES
     country_code: KR
-    country_label: South Korea
     region_code: '11'
-    city_code: XXX
-    city_label: ''
-    region_name: KR-11
-    iso_code_source: KR-11
-    resolution_timestamp: '2025-12-06T23:35:08.842092+00:00'
+    region_name: Seoul
+    city_code: SEO
+    city_name: Seoul
+    geonames_id: 1835848
+    feature_code: PPLC
+    google_place_id: ChIJE8UZ8OyifDURYx0GF4eFKUc
+    latitude: 37.5695565
+    longitude: 126.9778724
+    resolution_date: '2025-12-07T16:42:09.047035+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: The Dong-a Ilbo
@@ -55,3 +63,11 @@ unesco_mow_enrichment:
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:35:08Z: XX->11 via Wikidata P131 (KR-11)'
+google_maps_enrichment:
+  place_id: ChIJE8UZ8OyifDURYx0GF4eFKUc
+  formatted_address: 1 Cheonggyecheon-ro, Jongno District, Seoul, South Korea
+  website: http://www.donga.com/
+  latitude: 37.5695565
+  longitude: 126.9778724
+  enriched_at: '2025-12-07T16:42:09.047035+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-BA-XXX-X-ISC.yaml b/data/custodian/MX-BCS-LPA-X-ISC.yaml
similarity index 82%
rename from data/custodian/MX-BA-XXX-X-ISC.yaml
rename to data/custodian/MX-BCS-LPA-X-ISC.yaml
index 401bf6ef7c..ef15b66c5a 100644
--- a/data/custodian/MX-BA-XXX-X-ISC.yaml
+++ b/data/custodian/MX-BCS-LPA-X-ISC.yaml
@@ -31,7 +31,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.032033+00:00'
 ghcid:
-  ghcid_current: MX-BA-XXX-X-ISC
+  ghcid_current: MX-BCS-LPA-X-ISC
   ghcid_original: MX-BA-XXX-X-ISC
   ghcid_uuid: bf07b3dc-1862-505a-87da-d8159094322a
   ghcid_uuid_sha256: 3e263639-0ffc-8642-3f51-4b8b12901a10
@@ -39,22 +39,35 @@ ghcid:
   record_id: 5e45943b-76fe-42b3-997c-26de623b367a
   generation_timestamp: '2025-12-06T23:39:02.032033+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: BA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: BCS
+    region_name: Baja California Sur
+    city_code: LPA
+    city_name: La Paz
+    geonames_id: 4000900
+    feature_code: PPLA
+    google_place_id: ChIJv8Ui6kXTr4YRIcRLTW2VewQ
+    latitude: 24.148371599999997
+    longitude: -110.31770979999999
+    resolution_date: '2025-12-07T16:40:07.122204+00:00'
   ghcid_history:
   - ghcid: MX-BA-XXX-X-ISC
     ghcid_numeric: 4478326498175759938
     valid_from: '2025-12-06T23:39:02.032033+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:07.122204+00:00'
+  - ghcid: MX-BCS-LPA-X-ISC
+    ghcid_numeric: 4478326498175759938
+    valid_from: '2025-12-07T16:40:07.122204+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: La Paz (BCS)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Instituto Sudcaliforniano de Cultura
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-BA-XXX-X-ISC
+  identifier_value: MX-BCS-LPA-X-ISC
 - identifier_scheme: GHCID_UUID
   identifier_value: bf07b3dc-1862-505a-87da-d8159094322a
 - identifier_scheme: GHCID_UUID_SHA256
@@ -136,3 +149,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.032033+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJv8Ui6kXTr4YRIcRLTW2VewQ
+  formatted_address: Calle Ignacio Altamirano 2640, Zona Central, 23000 La Paz, B.C.S.,
+    Mexico
+  website: https://culturabcs.gob.mx/
+  latitude: 24.148371599999997
+  longitude: -110.31770979999999
+  enriched_at: '2025-12-07T16:40:07.122204+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-CA-XXX-X-CDP.yaml b/data/custodian/MX-CAM-CAL-X-CDP.yaml
similarity index 83%
rename from data/custodian/MX-CA-XXX-X-CDP.yaml
rename to data/custodian/MX-CAM-CAL-X-CDP.yaml
index 5672006150..8668656da4 100644
--- a/data/custodian/MX-CA-XXX-X-CDP.yaml
+++ b/data/custodian/MX-CAM-CAL-X-CDP.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.040816+00:00'
 ghcid:
-  ghcid_current: MX-CA-XXX-X-CDP
+  ghcid_current: MX-CAM-CAL-X-CDP
   ghcid_original: MX-CA-XXX-X-CDP
   ghcid_uuid: f4ddb2b7-288b-5c5b-8e43-ff48123dc9e1
   ghcid_uuid_sha256: 1f886ac5-f06e-81c2-a1e3-c5454fd210e9
@@ -35,22 +35,35 @@ ghcid:
   record_id: 3e709fed-8265-4ed7-8aff-5117252ebe0a
   generation_timestamp: '2025-12-06T23:39:02.040816+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: CA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: CAM
+    region_name: Campeche
+    city_code: CAL
+    city_name: Calakmul
+    geonames_id: 9289821
+    feature_code: PPL
+    google_place_id: ChIJ-Q0Hra2zWI8RwTwjeIChCMY
+    latitude: 18.105866499999998
+    longitude: -89.81023239999999
+    resolution_date: '2025-12-07T16:40:08.798870+00:00'
   ghcid_history:
   - ghcid: MX-CA-XXX-X-CDP
     ghcid_numeric: 2272183410383258050
     valid_from: '2025-12-06T23:39:02.040816+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:08.798870+00:00'
+  - ghcid: MX-CAM-CAL-X-CDP
+    ghcid_numeric: 2272183410383258050
+    valid_from: '2025-12-07T16:40:08.798870+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Calakmul (CAM)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Calakmul Digital Project
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-CA-XXX-X-CDP
+  identifier_value: MX-CAM-CAL-X-CDP
 - identifier_scheme: GHCID_UUID
   identifier_value: f4ddb2b7-288b-5c5b-8e43-ff48123dc9e1
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.040816+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ-Q0Hra2zWI8RwTwjeIChCMY
+  formatted_address: 24655 Campeche, Mexico
+  website: null
+  latitude: 18.105866499999998
+  longitude: -89.81023239999999
+  enriched_at: '2025-12-07T16:40:08.798870+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-CA-XXX-A-CCA.yaml b/data/custodian/MX-CAM-CAM-A-CCA.yaml
similarity index 82%
rename from data/custodian/MX-CA-XXX-A-CCA.yaml
rename to data/custodian/MX-CAM-CAM-A-CCA.yaml
index ed0f2236a7..49a96321c3 100644
--- a/data/custodian/MX-CA-XXX-A-CCA.yaml
+++ b/data/custodian/MX-CAM-CAM-A-CCA.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.043202+00:00'
 ghcid:
-  ghcid_current: MX-CA-XXX-A-CCA
+  ghcid_current: MX-CAM-CAM-A-CCA
   ghcid_original: MX-CA-XXX-A-CCA
   ghcid_uuid: 55382536-942b-561a-a598-f8cade222a57
   ghcid_uuid_sha256: 30b11f81-4892-84f5-77e1-c6a77070c9cb
@@ -35,22 +35,35 @@ ghcid:
   record_id: 14d435eb-91f6-4679-9be2-391fc5e9ce41
   generation_timestamp: '2025-12-06T23:39:02.043202+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: CA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: CAM
+    region_name: Campeche
+    city_code: CAM
+    city_name: Campeche
+    geonames_id: 3531732
+    feature_code: PPLA
+    google_place_id: ChIJEbgpIvoz-IUR0l2C9Zg_ndU
+    latitude: 19.8465998
+    longitude: -90.5343192
+    resolution_date: '2025-12-07T16:40:08.045402+00:00'
   ghcid_history:
   - ghcid: MX-CA-XXX-A-CCA
     ghcid_numeric: 3508620224827110645
     valid_from: '2025-12-06T23:39:02.043202+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:08.045402+00:00'
+  - ghcid: MX-CAM-CAM-A-CCA
+    ghcid_numeric: 3508620224827110645
+    valid_from: '2025-12-07T16:40:08.045402+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Campeche (CAM)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Colonial Campeche Archive
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-CA-XXX-A-CCA
+  identifier_value: MX-CAM-CAM-A-CCA
 - identifier_scheme: GHCID_UUID
   identifier_value: 55382536-942b-561a-a598-f8cade222a57
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.043202+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJEbgpIvoz-IUR0l2C9Zg_ndU
+  formatted_address: C. 10, Zona Centro, 24000 San Francisco de Campeche, Camp., Mexico
+  website: http://www.hotelplazacolonial.com/
+  latitude: 19.8465998
+  longitude: -90.5343192
+  enriched_at: '2025-12-07T16:40:08.045402+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-ZA-XXX-A-CA.yaml b/data/custodian/MX-CMX-BNO-A-CA.yaml
similarity index 83%
rename from data/custodian/MX-ZA-XXX-A-CA.yaml
rename to data/custodian/MX-CMX-BNO-A-CA.yaml
index e6f0e5e224..0163b28741 100644
--- a/data/custodian/MX-ZA-XXX-A-CA.yaml
+++ b/data/custodian/MX-CMX-BNO-A-CA.yaml
@@ -35,7 +35,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.235444+00:00'
 ghcid:
-  ghcid_current: MX-ZA-XXX-A-CA
+  ghcid_current: MX-CMX-BNO-A-CA
   ghcid_original: MX-ZA-XXX-A-CA
   ghcid_uuid: c1e9b00b-22ee-5503-a89c-4fb48dca9cee
   ghcid_uuid_sha256: 7947df5b-1678-87ac-0397-225c0a27de86
@@ -43,22 +43,35 @@ ghcid:
   record_id: d754d37a-a4e6-4249-b0e6-077774594548
   generation_timestamp: '2025-12-06T23:39:02.235444+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: ZA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: CMX
+    region_name: Mexico City
+    city_code: BNO
+    city_name: Barrio Norte
+    geonames_id: 3532347
+    feature_code: PPL
+    google_place_id: ChIJmY2jkwIA0oUR9KclwrpJWj4
+    latitude: 19.3460525
+    longitude: -99.19108879999999
+    resolution_date: '2025-12-07T16:40:15.568887+00:00'
   ghcid_history:
   - ghcid: MX-ZA-XXX-A-CA
     ghcid_numeric: 8739199184247773100
     valid_from: '2025-12-06T23:39:02.235444+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:15.568887+00:00'
+  - ghcid: MX-CMX-BNO-A-CA
+    ghcid_numeric: 8739199184247773100
+    valid_from: '2025-12-07T16:40:15.568887+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Barrio Norte (CMX)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Casasola Archive
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-ZA-XXX-A-CA
+  identifier_value: MX-CMX-BNO-A-CA
 - identifier_scheme: GHCID_UUID
   identifier_value: c1e9b00b-22ee-5503-a89c-4fb48dca9cee
 - identifier_scheme: GHCID_UUID_SHA256
@@ -154,3 +167,12 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q5575146
   wikidata_label_en: Casasola Archive
+google_maps_enrichment:
+  place_id: ChIJmY2jkwIA0oUR9KclwrpJWj4
+  formatted_address: C. de la Amargura 17, San Ángel, Álvaro Obregón, 01000 Ciudad
+    de México, CDMX, Mexico
+  website: https://casasolamexico.com/
+  latitude: 19.3460525
+  longitude: -99.19108879999999
+  enriched_at: '2025-12-07T16:40:15.568887+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-ZA-XXX-O-CR.yaml b/data/custodian/MX-CMX-BNO-O-CR.yaml
similarity index 82%
rename from data/custodian/MX-ZA-XXX-O-CR.yaml
rename to data/custodian/MX-CMX-BNO-O-CR.yaml
index 7a56a4f79a..9f87e46612 100644
--- a/data/custodian/MX-ZA-XXX-O-CR.yaml
+++ b/data/custodian/MX-CMX-BNO-O-CR.yaml
@@ -31,7 +31,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.215571+00:00'
 ghcid:
-  ghcid_current: MX-ZA-XXX-O-CR
+  ghcid_current: MX-CMX-BNO-O-CR
   ghcid_original: MX-ZA-XXX-O-CR
   ghcid_uuid: a8fbd6db-e8e9-5fe6-8b09-23ebe647bd7a
   ghcid_uuid_sha256: e38cdf6a-741b-8419-9a66-abb221c2cc80
@@ -39,22 +39,35 @@ ghcid:
   record_id: 39a41985-fb9d-4cde-8a77-0434e2b53337
   generation_timestamp: '2025-12-06T23:39:02.215571+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: ZA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: CMX
+    region_name: Mexico City
+    city_code: BNO
+    city_name: Barrio Norte
+    geonames_id: 3532347
+    feature_code: PPL
+    google_place_id: ChIJAf_cSoz_0YUR0YV1WxIHlJw
+    latitude: 19.3645152
+    longitude: -99.1816293
+    resolution_date: '2025-12-07T16:40:19.742910+00:00'
   ghcid_history:
   - ghcid: MX-ZA-XXX-O-CR
     ghcid_numeric: 16396725991656625177
     valid_from: '2025-12-06T23:39:02.215571+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:19.742910+00:00'
+  - ghcid: MX-CMX-BNO-O-CR
+    ghcid_numeric: 16396725991656625177
+    valid_from: '2025-12-07T16:40:19.742910+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Barrio Norte (CMX)'
 custodian_name:
   claim_type: custodian_name
   claim_value: CONACYT Repository
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-ZA-XXX-O-CR
+  identifier_value: MX-CMX-BNO-O-CR
 - identifier_scheme: GHCID_UUID
   identifier_value: a8fbd6db-e8e9-5fe6-8b09-23ebe647bd7a
 - identifier_scheme: GHCID_UUID_SHA256
@@ -136,3 +149,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.215571+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJAf_cSoz_0YUR0YV1WxIHlJw
+  formatted_address: Av. Insurgentes Centro 1582, Crédito Constructor, Benito Juárez,
+    03940 Ciudad de México, CDMX, Mexico
+  website: https://www.conahcyt.mx/
+  latitude: 19.3645152
+  longitude: -99.1816293
+  enriched_at: '2025-12-07T16:40:19.742910+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-ZA-XXX-A-IA.yaml b/data/custodian/MX-CMX-COY-A-IA.yaml
similarity index 82%
rename from data/custodian/MX-ZA-XXX-A-IA.yaml
rename to data/custodian/MX-CMX-COY-A-IA.yaml
index 00d4d663f1..a969afea53 100644
--- a/data/custodian/MX-ZA-XXX-A-IA.yaml
+++ b/data/custodian/MX-CMX-COY-A-IA.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.220716+00:00'
 ghcid:
-  ghcid_current: MX-ZA-XXX-A-IA
+  ghcid_current: MX-CMX-COY-A-IA
   ghcid_original: MX-ZA-XXX-A-IA
   ghcid_uuid: 9c36feb8-04f5-5303-b39b-62533b0e19c4
   ghcid_uuid_sha256: f1ea0423-b8bd-83ec-a1ac-127b1be8bb33
@@ -35,22 +35,35 @@ ghcid:
   record_id: edb2b422-0e57-4cf7-8ed8-78cb8b2adee2
   generation_timestamp: '2025-12-06T23:39:02.220716+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: ZA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: CMX
+    region_name: Mexico City
+    city_code: COY
+    city_name: Coyoacan
+    geonames_id: 3530139
+    feature_code: PPL
+    google_place_id: ChIJBbUMW7__0YURkrybACwbKFM
+    latitude: 19.3618093
+    longitude: -99.1632856
+    resolution_date: '2025-12-07T16:40:17.257793+00:00'
   ghcid_history:
   - ghcid: MX-ZA-XXX-A-IA
     ghcid_numeric: 17431749859160687596
     valid_from: '2025-12-06T23:39:02.220716+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:17.257793+00:00'
+  - ghcid: MX-CMX-COY-A-IA
+    ghcid_numeric: 17431749859160687596
+    valid_from: '2025-12-07T16:40:17.257793+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Coyoacan (CMX)'
 custodian_name:
   claim_type: custodian_name
   claim_value: INPI Archives
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-ZA-XXX-A-IA
+  identifier_value: MX-CMX-COY-A-IA
 - identifier_scheme: GHCID_UUID
   identifier_value: 9c36feb8-04f5-5303-b39b-62533b0e19c4
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.220716+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJBbUMW7__0YURkrybACwbKFM
+  formatted_address: Av. México Coyoacán 343, Xoco, Benito Juárez, 03330 Ciudad de
+    México, CDMX, Mexico
+  website: http://www.inpi.gob.mx/
+  latitude: 19.3618093
+  longitude: -99.1632856
+  enriched_at: '2025-12-07T16:40:17.257793+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-AG-XXX-X-PCIC.yaml b/data/custodian/MX-CMX-CUA-X-PCIC.yaml
similarity index 81%
rename from data/custodian/MX-AG-XXX-X-PCIC.yaml
rename to data/custodian/MX-CMX-CUA-X-PCIC.yaml
index 4cb7af185e..4207bdefc2 100644
--- a/data/custodian/MX-AG-XXX-X-PCIC.yaml
+++ b/data/custodian/MX-CMX-CUA-X-PCIC.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.026687+00:00'
 ghcid:
-  ghcid_current: MX-AG-XXX-X-PCIC
+  ghcid_current: MX-CMX-CUA-X-PCIC
   ghcid_original: MX-AG-XXX-X-PCIC
   ghcid_uuid: 400d291d-1c6c-5369-9b0c-696313ae0a45
   ghcid_uuid_sha256: 62840fed-8abc-884c-de84-d40f7935106d
@@ -35,22 +35,35 @@ ghcid:
   record_id: d1a0669b-fc5a-4bb6-91a9-4a6480f74f8d
   generation_timestamp: '2025-12-06T23:39:02.026687+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: AG
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: CMX
+    region_name: Mexico City
+    city_code: CUA
+    city_name: Cuauhtemoc
+    geonames_id: 3827409
+    feature_code: PPL
+    google_place_id: ChIJJ-tKP9n40YURp5pHADS1W0g
+    latitude: 19.448989
+    longitude: -99.14980940000001
+    resolution_date: '2025-12-07T16:40:06.369227+00:00'
   ghcid_history:
   - ghcid: MX-AG-XXX-X-PCIC
     ghcid_numeric: 7098816425552029772
     valid_from: '2025-12-06T23:39:02.026687+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:06.369227+00:00'
+  - ghcid: MX-CMX-CUA-X-PCIC
+    ghcid_numeric: 7098816425552029772
+    valid_from: '2025-12-07T16:40:06.369227+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Cuauhtemoc (CMX)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Patrimonio Cultural Inmaterial Catalog
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-AG-XXX-X-PCIC
+  identifier_value: MX-CMX-CUA-X-PCIC
 - identifier_scheme: GHCID_UUID
   identifier_value: 400d291d-1c6c-5369-9b0c-696313ae0a45
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.026687+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJJ-tKP9n40YURp5pHADS1W0g
+  formatted_address: C. Juan Aldama, Buenavista, Cuauhtémoc, 06350 Ciudad de México,
+    CDMX, Mexico
+  website: https://m.facebook.com/pages/category/Community/Tianguis-Cultural-del-Chopo-58127775224/
+  latitude: 19.448989
+  longitude: -99.14980940000001
+  enriched_at: '2025-12-07T16:40:06.369227+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-CH-XXX-A-ILA.yaml b/data/custodian/MX-CMX-MEX-A-ILA.yaml
similarity index 81%
rename from data/custodian/MX-CH-XXX-A-ILA.yaml
rename to data/custodian/MX-CMX-MEX-A-ILA.yaml
index 13ed9fac92..d0f4f047f9 100644
--- a/data/custodian/MX-CH-XXX-A-ILA.yaml
+++ b/data/custodian/MX-CMX-MEX-A-ILA.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.053661+00:00'
 ghcid:
-  ghcid_current: MX-CH-XXX-A-ILA
+  ghcid_current: MX-CMX-MEX-A-ILA
   ghcid_original: MX-CH-XXX-A-ILA
   ghcid_uuid: 1df1275f-69d7-5775-8cef-eff8e61cbd0d
   ghcid_uuid_sha256: ee42bedb-6b4a-8beb-f90f-5eb9947452c0
@@ -35,22 +35,35 @@ ghcid:
   record_id: 2ee0d1dc-bd57-4434-a115-5fd166d16521
   generation_timestamp: '2025-12-06T23:39:02.053661+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: CH
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: CMX
+    region_name: Mexico City
+    city_code: MEX
+    city_name: Mexico City
+    geonames_id: 3530597
+    feature_code: PPLC
+    google_place_id: ChIJ76TsO0350YUR709JWgzW-lU
+    latitude: 19.436322699999998
+    longitude: -99.1132475
+    resolution_date: '2025-12-07T16:40:09.724976+00:00'
   ghcid_history:
   - ghcid: MX-CH-XXX-A-ILA
     ghcid_numeric: 17168494579096906731
     valid_from: '2025-12-06T23:39:02.053661+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:09.724976+00:00'
+  - ghcid: MX-CMX-MEX-A-ILA
+    ghcid_numeric: 17168494579096906731
+    valid_from: '2025-12-07T16:40:09.724976+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Mexico City (CMX)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Indigenous Languages Archive
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-CH-XXX-A-ILA
+  identifier_value: MX-CMX-MEX-A-ILA
 - identifier_scheme: GHCID_UUID
   identifier_value: 1df1275f-69d7-5775-8cef-eff8e61cbd0d
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.053661+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ76TsO0350YUR709JWgzW-lU
+  formatted_address: Avenida Ingeniero Eduardo Molina, Ingreso también por, Héroe
+    de Nacozari 113, Venustiano Carranza, 15280 Ciudad de México, CDMX, Mexico
+  website: http://www.gob.mx/agn
+  latitude: 19.436322699999998
+  longitude: -99.1132475
+  enriched_at: '2025-12-07T16:40:09.724976+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-CMX-XXX-A-SCJN-supreme_court_of_justice_of_the_nation.yaml b/data/custodian/MX-CMX-MEX-A-SCJN-supreme_court_of_justice_of_the_nation.yaml
similarity index 67%
rename from data/custodian/MX-CMX-XXX-A-SCJN-supreme_court_of_justice_of_the_nation.yaml
rename to data/custodian/MX-CMX-MEX-A-SCJN-supreme_court_of_justice_of_the_nation.yaml
index 400b105d26..7588d7a863 100644
--- a/data/custodian/MX-CMX-XXX-A-SCJN-supreme_court_of_justice_of_the_nation.yaml
+++ b/data/custodian/MX-CMX-MEX-A-SCJN-supreme_court_of_justice_of_the_nation.yaml
@@ -16,7 +16,7 @@ wikidata_enrichment:
     inscribed documents
   instance_of: supreme court
 ghcid:
-  ghcid_current: MX-CMX-XXX-A-SCJN-supreme_court_of_justice_of_the_nation
+  ghcid_current: MX-CMX-MEX-A-SCJN-supreme_court_of_justice_of_the_nation
   ghcid_original: MX-XX-XXX-A-SCJN
   ghcid_uuid: 5de08558-262e-587f-8772-faf3da3aa0cc
   ghcid_uuid_sha256: 8a58bc0d-73ae-8842-86a3-5ccc5ca4b338
@@ -31,16 +31,24 @@ ghcid:
   - ghcid: MX-CMX-XXX-A-SCJN-supreme_court_of_justice_of_the_nation
     valid_from: '2025-12-06T23:32:41.864295+00:00'
     reason: 'Region resolved via Wikidata P131: XX->CMX (MX-CMX)'
+    valid_to: '2025-12-07T16:42:11.901501+00:00'
+  - ghcid: MX-CMX-MEX-A-SCJN-supreme_court_of_justice_of_the_nation
+    ghcid_numeric: 9968924541146036290
+    valid_from: '2025-12-07T16:42:11.901501+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Mexico City (CMX)'
   location_resolution:
-    method: WIKIDATA_P131
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    country_label: Mexico
     region_code: CMX
-    city_code: XXX
-    city_label: ''
-    region_name: MX-CMX
-    iso_code_source: MX-CMX
-    resolution_timestamp: '2025-12-06T23:32:41.864284+00:00'
+    region_name: Mexico City
+    city_code: MEX
+    city_name: Mexico City
+    geonames_id: 3530597
+    feature_code: PPLC
+    google_place_id: ChIJRaFp_cz-0YURSCHbFZpyA5g
+    latitude: 19.4311644
+    longitude: -99.13201509999999
+    resolution_date: '2025-12-07T16:42:11.901501+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: Supreme Court of Justice of the Nation
@@ -59,3 +67,12 @@ unesco_mow_enrichment:
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:32:41Z: XX->CMX via Wikidata P131 (MX-CMX)'
+google_maps_enrichment:
+  place_id: ChIJRaFp_cz-0YURSCHbFZpyA5g
+  formatted_address: José María Pino Suárez 2, Centro Histórico de la Cdad. de México,
+    Centro, Cuauhtémoc, 06065 Ciudad de México, CDMX, Mexico
+  website: http://www.scjn.gob.mx/
+  latitude: 19.4311644
+  longitude: -99.13201509999999
+  enriched_at: '2025-12-07T16:42:11.901501+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-ZA-XXX-L-LC.yaml b/data/custodian/MX-CMX-MEX-L-LC.yaml
similarity index 80%
rename from data/custodian/MX-ZA-XXX-L-LC.yaml
rename to data/custodian/MX-CMX-MEX-L-LC.yaml
index c7a9ae10c0..d0ac60b81d 100644
--- a/data/custodian/MX-ZA-XXX-L-LC.yaml
+++ b/data/custodian/MX-CMX-MEX-L-LC.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.230718+00:00'
 ghcid:
-  ghcid_current: MX-ZA-XXX-L-LC
+  ghcid_current: MX-CMX-MEX-L-LC
   ghcid_original: MX-ZA-XXX-L-LC
   ghcid_uuid: b0682eef-6520-5927-adf9-c351ebb846c5
   ghcid_uuid_sha256: 3b6bd205-1222-85e1-dbc6-0b73a1d5151d
@@ -35,22 +35,35 @@ ghcid:
   record_id: 69608be1-1af7-4db9-9e19-2e3001233b82
   generation_timestamp: '2025-12-06T23:39:02.230718+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: ZA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: CMX
+    region_name: Mexico City
+    city_code: MEX
+    city_name: Mexico City
+    geonames_id: 3530597
+    feature_code: PPLC
+    google_place_id: ChIJgdknbr340YURy6SWyipwyTM
+    latitude: 19.4355463
+    longitude: -99.1378798
+    resolution_date: '2025-12-07T16:40:17.990954+00:00'
   ghcid_history:
   - ghcid: MX-ZA-XXX-L-LC
     ghcid_numeric: 4281746789966693857
     valid_from: '2025-12-06T23:39:02.230718+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:17.990954+00:00'
+  - ghcid: MX-CMX-MEX-L-LC
+    ghcid_numeric: 4281746789966693857
+    valid_from: '2025-12-07T16:40:17.990954+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Mexico City (CMX)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Library of Congress
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-ZA-XXX-L-LC
+  identifier_value: MX-CMX-MEX-L-LC
 - identifier_scheme: GHCID_UUID
   identifier_value: b0682eef-6520-5927-adf9-c351ebb846c5
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.230718+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJgdknbr340YURy6SWyipwyTM
+  formatted_address: Cuauhtémoc, C. de Tacuba 29, Centro Histórico de la Cdad. de
+    México, Centro, Cuauhtémoc, 06110 Ciudad de México, CDMX, Mexico
+  website: http://biblioteca.diputados.gob.mx/janium-bin/busqueda_rapida.pl?Id=20150731122432
+  latitude: 19.4355463
+  longitude: -99.1378798
+  enriched_at: '2025-12-07T16:40:17.990954+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-ZA-XXX-M-CMN.yaml b/data/custodian/MX-CMX-MHI-M-CMN.yaml
similarity index 81%
rename from data/custodian/MX-ZA-XXX-M-CMN.yaml
rename to data/custodian/MX-CMX-MHI-M-CMN.yaml
index 73b6fd66ef..1e8b890941 100644
--- a/data/custodian/MX-ZA-XXX-M-CMN.yaml
+++ b/data/custodian/MX-CMX-MHI-M-CMN.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.225892+00:00'
 ghcid:
-  ghcid_current: MX-ZA-XXX-M-CMN
+  ghcid_current: MX-CMX-MHI-M-CMN
   ghcid_original: MX-ZA-XXX-M-CMN
   ghcid_uuid: 33b6319e-9050-5c06-827f-1c8699cf6f7e
   ghcid_uuid_sha256: 48a2d160-107e-86f8-ab9b-2ec3d85bd8f1
@@ -35,22 +35,35 @@ ghcid:
   record_id: 471d05b1-7a9c-469f-b001-5a6a825d7727
   generation_timestamp: '2025-12-06T23:39:02.225892+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: ZA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: CMX
+    region_name: Mexico City
+    city_code: MHI
+    city_name: Miguel Hidalgo
+    geonames_id: 3827408
+    feature_code: PPL
+    google_place_id: ChIJCT06bhoC0oURszwDTCLicpM
+    latitude: 19.4406926
+    longitude: -99.2047001
+    resolution_date: '2025-12-07T16:40:18.986213+00:00'
   ghcid_history:
   - ghcid: MX-ZA-XXX-M-CMN
     ghcid_numeric: 5233975927481759480
     valid_from: '2025-12-06T23:39:02.225892+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:18.986213+00:00'
+  - ghcid: MX-CMX-MHI-M-CMN
+    ghcid_numeric: 5233975927481759480
+    valid_from: '2025-12-07T16:40:18.986213+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Miguel Hidalgo (CMX)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Community Museums Network
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-ZA-XXX-M-CMN
+  identifier_value: MX-CMX-MHI-M-CMN
 - identifier_scheme: GHCID_UUID
   identifier_value: 33b6319e-9050-5c06-827f-1c8699cf6f7e
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.225892+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJCT06bhoC0oURszwDTCLicpM
+  formatted_address: Blvd. Miguel de Cervantes Saavedra, Granada, Miguel Hidalgo,
+    11529 Ciudad de México, CDMX, Mexico
+  website: https://www.museosoumaya.org/inicio/exposiciones/plaza-carso/
+  latitude: 19.4406926
+  longitude: -99.2047001
+  enriched_at: '2025-12-07T16:40:18.986213+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-ZA-XXX-X-FT.yaml b/data/custodian/MX-CMX-SLU-X-FT.yaml
similarity index 81%
rename from data/custodian/MX-ZA-XXX-X-FT.yaml
rename to data/custodian/MX-CMX-SLU-X-FT.yaml
index bad7e1d51f..e7f979af77 100644
--- a/data/custodian/MX-ZA-XXX-X-FT.yaml
+++ b/data/custodian/MX-CMX-SLU-X-FT.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.243579+00:00'
 ghcid:
-  ghcid_current: MX-ZA-XXX-X-FT
+  ghcid_current: MX-CMX-SLU-X-FT
   ghcid_original: MX-ZA-XXX-X-FT
   ghcid_uuid: b9a0e38e-f526-5af3-8915-5a9c6793ccaa
   ghcid_uuid_sha256: d50d7c2c-e24c-8ea2-b7f9-38c295efea3c
@@ -35,22 +35,35 @@ ghcid:
   record_id: 64dd7728-4ecd-4751-8c8f-1ad8c390aac1
   generation_timestamp: '2025-12-06T23:39:02.243579+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: ZA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: CMX
+    region_name: Mexico City
+    city_code: SLU
+    city_name: Santa Lucia
+    geonames_id: 3827404
+    feature_code: PPL
+    google_place_id: ChIJCTDmQeEA0oURRC9yF2_Rbwk
+    latitude: 19.3758184
+    longitude: -99.2519525
+    resolution_date: '2025-12-07T16:40:21.816287+00:00'
   ghcid_history:
   - ghcid: MX-ZA-XXX-X-FT
     ghcid_numeric: 15352063236992941730
     valid_from: '2025-12-06T23:39:02.243579+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:21.816287+00:00'
+  - ghcid: MX-CMX-SLU-X-FT
+    ghcid_numeric: 15352063236992941730
+    valid_from: '2025-12-07T16:40:21.816287+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Santa Lucia (CMX)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Fundación Televisa
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-ZA-XXX-X-FT
+  identifier_value: MX-CMX-SLU-X-FT
 - identifier_scheme: GHCID_UUID
   identifier_value: b9a0e38e-f526-5af3-8915-5a9c6793ccaa
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.243579+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJCTDmQeEA0oURRC9yF2_Rbwk
+  formatted_address: Vasco de Quiroga 2000, Santa Fe, Sta Fé, Álvaro Obregón, 01210
+    Ciudad de México, CDMX, Mexico
+  website: https://fundaciontelevisa.org/
+  latitude: 19.3758184
+  longitude: -99.2519525
+  enriched_at: '2025-12-07T16:40:21.816287+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-ZA-XXX-A-AA.yaml b/data/custodian/MX-CMX-TLA-A-AA.yaml
similarity index 81%
rename from data/custodian/MX-ZA-XXX-A-AA.yaml
rename to data/custodian/MX-CMX-TLA-A-AA.yaml
index 9dba70c8d1..e4932a5bfb 100644
--- a/data/custodian/MX-ZA-XXX-A-AA.yaml
+++ b/data/custodian/MX-CMX-TLA-A-AA.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.246105+00:00'
 ghcid:
-  ghcid_current: MX-ZA-XXX-A-AA
+  ghcid_current: MX-CMX-TLA-A-AA
   ghcid_original: MX-ZA-XXX-A-AA
   ghcid_uuid: f146d647-2175-5d0e-bea7-a61f585786ef
   ghcid_uuid_sha256: 5f460cd1-6c26-8224-bee5-629ff47baf8e
@@ -35,22 +35,35 @@ ghcid:
   record_id: 1b80ff61-fc20-4250-aaf2-eaba4ce22f09
   generation_timestamp: '2025-12-06T23:39:02.246105+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: ZA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: CMX
+    region_name: Mexico City
+    city_code: TLA
+    city_name: Tlalpan
+    geonames_id: 3515428
+    feature_code: PPL
+    google_place_id: ChIJN5XQfxEAzoUReg854-fZ3HA
+    latitude: 19.319763599999998
+    longitude: -99.1756466
+    resolution_date: '2025-12-07T16:40:14.832541+00:00'
   ghcid_history:
   - ghcid: MX-ZA-XXX-A-AA
     ghcid_numeric: 6865188775575048740
     valid_from: '2025-12-06T23:39:02.246105+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:14.832541+00:00'
+  - ghcid: MX-CMX-TLA-A-AA
+    ghcid_numeric: 6865188775575048740
+    valid_from: '2025-12-07T16:40:14.832541+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Tlalpan (CMX)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Agrasanchez Archive
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-ZA-XXX-A-AA
+  identifier_value: MX-CMX-TLA-A-AA
 - identifier_scheme: GHCID_UUID
   identifier_value: f146d647-2175-5d0e-bea7-a61f585786ef
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.246105+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJN5XQfxEAzoUReg854-fZ3HA
+  formatted_address: Circuito Maestro, Mario de La Cueva S/N, Coyoacán, C.U., Coyoacán,
+    04510 Ciudad de México, CDMX, Mexico
+  website: https://www.filmoteca.unam.mx/
+  latitude: 19.319763599999998
+  longitude: -99.1756466
+  enriched_at: '2025-12-07T16:40:14.832541+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-CH-XXX-M-PSM.yaml b/data/custodian/MX-COA-SDO-M-PSM.yaml
similarity index 80%
rename from data/custodian/MX-CH-XXX-M-PSM.yaml
rename to data/custodian/MX-COA-SDO-M-PSM.yaml
index 68c820f7e5..15fc7a800f 100644
--- a/data/custodian/MX-CH-XXX-M-PSM.yaml
+++ b/data/custodian/MX-COA-SDO-M-PSM.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.048660+00:00'
 ghcid:
-  ghcid_current: MX-CH-XXX-M-PSM
+  ghcid_current: MX-COA-SDO-M-PSM
   ghcid_original: MX-CH-XXX-M-PSM
   ghcid_uuid: e1df4a28-6ba7-5dc7-b7fc-c78311f63efd
   ghcid_uuid_sha256: e3ee9987-a95b-8bbc-006b-f8d4f4ad424b
@@ -35,22 +35,35 @@ ghcid:
   record_id: 88f6513a-5e08-47df-ab55-7f30d132a212
   generation_timestamp: '2025-12-06T23:39:02.048660+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: CH
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: COA
+    region_name: Chiapas
+    city_code: SDO
+    city_name: Santo Domingo
+    geonames_id: 8916899
+    feature_code: PPL
+    google_place_id: ChIJO1QAncdE8oURwkonpQK1VmE
+    latitude: 17.4883964
+    longitude: -92.04201409999999
+    resolution_date: '2025-12-07T16:40:10.755094+00:00'
   ghcid_history:
   - ghcid: MX-CH-XXX-M-PSM
     ghcid_numeric: 16424233699007769532
     valid_from: '2025-12-06T23:39:02.048660+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:10.755094+00:00'
+  - ghcid: MX-COA-SDO-M-PSM
+    ghcid_numeric: 16424233699007769532
+    valid_from: '2025-12-07T16:40:10.755094+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Santo Domingo (COA)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Palenque Site Museum
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-CH-XXX-M-PSM
+  identifier_value: MX-COA-SDO-M-PSM
 - identifier_scheme: GHCID_UUID
   identifier_value: e1df4a28-6ba7-5dc7-b7fc-c78311f63efd
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.048660+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJO1QAncdE8oURwkonpQK1VmE
+  formatted_address: Carr. Zona Arqueológica " Palenque " Km. 6.5, 29960 Palenque,
+    Chis., Mexico
+  website: https://lugares.inah.gob.mx/es/museos-inah/museo/440-museo-de-sitio-de-palenque-alberto-ruz-l-huillier.html
+  latitude: 17.4883964
+  longitude: -92.04201409999999
+  enriched_at: '2025-12-07T16:40:10.755094+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-ZA-XXX-A-FN.yaml b/data/custodian/MX-HID-PDS-A-FN.yaml
similarity index 84%
rename from data/custodian/MX-ZA-XXX-A-FN.yaml
rename to data/custodian/MX-HID-PDS-A-FN.yaml
index d7bd2bcdfd..296a24e896 100644
--- a/data/custodian/MX-ZA-XXX-A-FN.yaml
+++ b/data/custodian/MX-HID-PDS-A-FN.yaml
@@ -35,7 +35,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.238264+00:00'
 ghcid:
-  ghcid_current: MX-ZA-XXX-A-FN
+  ghcid_current: MX-HID-PDS-A-FN
   ghcid_original: MX-ZA-XXX-A-FN
   ghcid_uuid: d278c03f-0a25-57e1-9bb4-3d1f02bb38a8
   ghcid_uuid_sha256: e31b4f8f-41b5-802f-be5d-af437ef399fc
@@ -43,22 +43,35 @@ ghcid:
   record_id: 9fb008cb-5b2e-4a8f-983a-085fdcb9ef61
   generation_timestamp: '2025-12-06T23:39:02.238264+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: ZA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: HID
+    region_name: Hidalgo
+    city_code: PDS
+    city_name: Pachuca de Soto
+    geonames_id: 3522210
+    feature_code: PPLA
+    google_place_id: ChIJ12Ov_uMJ0YURYVKQ4k0PTiA
+    latitude: 20.120946200000002
+    longitude: -98.73162669999999
+    resolution_date: '2025-12-07T16:40:16.437004+00:00'
   ghcid_history:
   - ghcid: MX-ZA-XXX-A-FN
     ghcid_numeric: 16364761147682185263
     valid_from: '2025-12-06T23:39:02.238264+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:16.437004+00:00'
+  - ghcid: MX-HID-PDS-A-FN
+    ghcid_numeric: 16364761147682185263
+    valid_from: '2025-12-07T16:40:16.437004+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Pachuca de Soto (HID)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Fototeca Nacional
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-ZA-XXX-A-FN
+  identifier_value: MX-HID-PDS-A-FN
 - identifier_scheme: GHCID_UUID
   identifier_value: d278c03f-0a25-57e1-9bb4-3d1f02bb38a8
 - identifier_scheme: GHCID_UUID_SHA256
@@ -154,3 +167,11 @@ ch_annotator:
 wikidata_enrichment:
   wikidata_entity_id: Q5411481
   wikidata_label_en: Fototeca Nacional
+google_maps_enrichment:
+  place_id: ChIJ12Ov_uMJ0YURYVKQ4k0PTiA
+  formatted_address: Casasola s/n, Centro, 42000 Pachuca de Soto, Hgo., Mexico
+  website: null
+  latitude: 20.120946200000002
+  longitude: -98.73162669999999
+  enriched_at: '2025-12-07T16:40:16.437004+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-ZA-XXX-X-SN.yaml b/data/custodian/MX-HID-PDS-X-SN.yaml
similarity index 82%
rename from data/custodian/MX-ZA-XXX-X-SN.yaml
rename to data/custodian/MX-HID-PDS-X-SN.yaml
index ca48a61ca3..b2413a0007 100644
--- a/data/custodian/MX-ZA-XXX-X-SN.yaml
+++ b/data/custodian/MX-HID-PDS-X-SN.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.241020+00:00'
 ghcid:
-  ghcid_current: MX-ZA-XXX-X-SN
+  ghcid_current: MX-HID-PDS-X-SN
   ghcid_original: MX-ZA-XXX-X-SN
   ghcid_uuid: f2481210-014b-5b15-b440-e2d47c91e93e
   ghcid_uuid_sha256: 79942f9c-da0b-887d-e9d8-89a8cbec688a
@@ -35,22 +35,35 @@ ghcid:
   record_id: 836aac0a-6384-4772-afc5-a33d3708fb96
   generation_timestamp: '2025-12-06T23:39:02.241020+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: ZA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: HID
+    region_name: Hidalgo
+    city_code: PDS
+    city_name: Pachuca de Soto
+    geonames_id: 3522210
+    feature_code: PPLA
+    google_place_id: ChIJ12Ov_uMJ0YURYVKQ4k0PTiA
+    latitude: 20.120946200000002
+    longitude: -98.73162669999999
+    resolution_date: '2025-12-07T16:40:23.254008+00:00'
   ghcid_history:
   - ghcid: MX-ZA-XXX-X-SN
     ghcid_numeric: 8760679525862062205
     valid_from: '2025-12-06T23:39:02.241020+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:23.254008+00:00'
+  - ghcid: MX-HID-PDS-X-SN
+    ghcid_numeric: 8760679525862062205
+    valid_from: '2025-12-07T16:40:23.254008+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Pachuca de Soto (HID)'
 custodian_name:
   claim_type: custodian_name
   claim_value: SINAFO Network
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-ZA-XXX-X-SN
+  identifier_value: MX-HID-PDS-X-SN
 - identifier_scheme: GHCID_UUID
   identifier_value: f2481210-014b-5b15-b440-e2d47c91e93e
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.241020+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ12Ov_uMJ0YURYVKQ4k0PTiA
+  formatted_address: Casasola s/n, Centro, 42000 Pachuca de Soto, Hgo., Mexico
+  website: null
+  latitude: 20.120946200000002
+  longitude: -98.73162669999999
+  enriched_at: '2025-12-07T16:40:23.254008+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-QU-XXX-A-GAQR.yaml b/data/custodian/MX-ROO-CHE-A-GAQR.yaml
similarity index 82%
rename from data/custodian/MX-QU-XXX-A-GAQR.yaml
rename to data/custodian/MX-ROO-CHE-A-GAQR.yaml
index ebe00edfd5..53d8a0ab64 100644
--- a/data/custodian/MX-QU-XXX-A-GAQR.yaml
+++ b/data/custodian/MX-ROO-CHE-A-GAQR.yaml
@@ -30,7 +30,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.172111+00:00'
 ghcid:
-  ghcid_current: MX-QU-XXX-A-GAQR
+  ghcid_current: MX-ROO-CHE-A-GAQR
   ghcid_original: MX-QU-XXX-A-GAQR
   ghcid_uuid: 7ff03eb7-b1d7-5249-a5a1-c9d7d15505e6
   ghcid_uuid_sha256: d05d0ec5-fa3f-8f71-c017-4a27c8565d33
@@ -38,22 +38,35 @@ ghcid:
   record_id: 15da8421-38e2-4f27-86bf-020a8c880809
   generation_timestamp: '2025-12-06T23:39:02.172111+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: QU
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: ROO
+    region_name: Quintana Roo
+    city_code: CHE
+    city_name: Chetumal
+    geonames_id: 3531023
+    feature_code: PPLA
+    google_place_id: ChIJR68vKHyjW48RbkZwFt_PC3Y
+    latitude: 18.5113926
+    longitude: -88.2899551
+    resolution_date: '2025-12-07T16:40:11.508113+00:00'
   ghcid_history:
   - ghcid: MX-QU-XXX-A-GAQR
     ghcid_numeric: 15014172976192946033
     valid_from: '2025-12-06T23:39:02.172111+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:11.508113+00:00'
+  - ghcid: MX-ROO-CHE-A-GAQR
+    ghcid_numeric: 15014172976192946033
+    valid_from: '2025-12-07T16:40:11.508113+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Chetumal (ROO)'
 custodian_name:
   claim_type: custodian_name
   claim_value: General Archive of Quintana Roo
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-QU-XXX-A-GAQR
+  identifier_value: MX-ROO-CHE-A-GAQR
 - identifier_scheme: GHCID_UUID
   identifier_value: 7ff03eb7-b1d7-5249-a5a1-c9d7d15505e6
 - identifier_scheme: GHCID_UUID_SHA256
@@ -135,3 +148,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.172111+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJR68vKHyjW48RbkZwFt_PC3Y
+  formatted_address: Manuel M Diegüez S/N Entre calzada Veracruz, And. Adolfo López
+    Mateos y, Colonia, 77000 Chetumal, Q.R., Mexico
+  website: null
+  latitude: 18.5113926
+  longitude: -88.2899551
+  enriched_at: '2025-12-07T16:40:11.508113+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-QU-XXX-M-CCM.yaml b/data/custodian/MX-ROO-CHE-M-CCM.yaml
similarity index 83%
rename from data/custodian/MX-QU-XXX-M-CCM.yaml
rename to data/custodian/MX-ROO-CHE-M-CCM.yaml
index e764885cf6..4946d6993d 100644
--- a/data/custodian/MX-QU-XXX-M-CCM.yaml
+++ b/data/custodian/MX-ROO-CHE-M-CCM.yaml
@@ -30,7 +30,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.169625+00:00'
 ghcid:
-  ghcid_current: MX-QU-XXX-M-CCM
+  ghcid_current: MX-ROO-CHE-M-CCM
   ghcid_original: MX-QU-XXX-M-CCM
   ghcid_uuid: f1f92360-86a3-538c-a8f4-376f1668f73c
   ghcid_uuid_sha256: c4391444-0d93-89ca-ac58-d56fd5744d5b
@@ -38,22 +38,35 @@ ghcid:
   record_id: e8f99442-73e0-4daf-b79c-8699cbf6de4c
   generation_timestamp: '2025-12-06T23:39:02.169625+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: QU
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: ROO
+    region_name: Quintana Roo
+    city_code: CHE
+    city_name: Chetumal
+    geonames_id: 3531023
+    feature_code: PPLA
+    google_place_id: ChIJEYeuo2-jW48RvnKF-WuATDo
+    latitude: 18.5014462
+    longitude: -88.29666569999999
+    resolution_date: '2025-12-07T16:40:12.375018+00:00'
   ghcid_history:
   - ghcid: MX-QU-XXX-M-CCM
     ghcid_numeric: 14139354787624491466
     valid_from: '2025-12-06T23:39:02.169625+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:12.375018+00:00'
+  - ghcid: MX-ROO-CHE-M-CCM
+    ghcid_numeric: 14139354787624491466
+    valid_from: '2025-12-07T16:40:12.375018+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Chetumal (ROO)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Chetumal City Museum
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-QU-XXX-M-CCM
+  identifier_value: MX-ROO-CHE-M-CCM
 - identifier_scheme: GHCID_UUID
   identifier_value: f1f92360-86a3-538c-a8f4-376f1668f73c
 - identifier_scheme: GHCID_UUID_SHA256
@@ -135,3 +148,11 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.169625+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJEYeuo2-jW48RvnKF-WuATDo
+  formatted_address: Av de los Héroes 108, Centro, 77000 Chetumal, Q.R., Mexico
+  website: null
+  latitude: 18.5014462
+  longitude: -88.29666569999999
+  enriched_at: '2025-12-07T16:40:12.375018+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-SI-XXX-O-UR.yaml b/data/custodian/MX-SIN-LLI-O-UR.yaml
similarity index 82%
rename from data/custodian/MX-SI-XXX-O-UR.yaml
rename to data/custodian/MX-SIN-LLI-O-UR.yaml
index cb0df9f2ae..574cbb0f8c 100644
--- a/data/custodian/MX-SI-XXX-O-UR.yaml
+++ b/data/custodian/MX-SIN-LLI-O-UR.yaml
@@ -31,7 +31,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.177803+00:00'
 ghcid:
-  ghcid_current: MX-SI-XXX-O-UR
+  ghcid_current: MX-SIN-LLI-O-UR
   ghcid_original: MX-SI-XXX-O-UR
   ghcid_uuid: 2d4e4f7f-c164-5db3-9f22-7a441ab44198
   ghcid_uuid_sha256: f4b63169-6b02-8b02-9995-8f64a2a28230
@@ -39,22 +39,35 @@ ghcid:
   record_id: e1219f1f-5775-4097-b3e2-c31bd70b285b
   generation_timestamp: '2025-12-06T23:39:02.177803+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: SI
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: SIN
+    region_name: Sinaloa
+    city_code: LLI
+    city_name: La Lima
+    geonames_id: 3998594
+    feature_code: PPL
+    google_place_id: ChIJv2KJV_DZvIYR__YAtzs59TM
+    latitude: 24.8230373
+    longitude: -107.3794585
+    resolution_date: '2025-12-07T16:40:13.386489+00:00'
   ghcid_history:
   - ghcid: MX-SI-XXX-O-UR
     ghcid_numeric: 17633335719852403458
     valid_from: '2025-12-06T23:39:02.177803+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:13.386489+00:00'
+  - ghcid: MX-SIN-LLI-O-UR
+    ghcid_numeric: 17633335719852403458
+    valid_from: '2025-12-07T16:40:13.386489+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: La Lima (SIN)'
 custodian_name:
   claim_type: custodian_name
   claim_value: UAS Repository
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-SI-XXX-O-UR
+  identifier_value: MX-SIN-LLI-O-UR
 - identifier_scheme: GHCID_UUID
   identifier_value: 2d4e4f7f-c164-5db3-9f22-7a441ab44198
 - identifier_scheme: GHCID_UUID_SHA256
@@ -136,3 +149,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.177803+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJv2KJV_DZvIYR__YAtzs59TM
+  formatted_address: C. Josefa Ortiz de Domínguez S/N, Cd Universitaria, Ciudad Universitaria,
+    80040 Culiacán Rosales, Sin., Mexico
+  website: http://innovacion.uas.edu.mx/
+  latitude: 24.8230373
+  longitude: -107.3794585
+  enriched_at: '2025-12-07T16:40:13.386489+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-TA-XXX-X-ITCA.yaml b/data/custodian/MX-TAM-CVI-X-ITCA.yaml
similarity index 82%
rename from data/custodian/MX-TA-XXX-X-ITCA.yaml
rename to data/custodian/MX-TAM-CVI-X-ITCA.yaml
index d2ee28c8e5..00ce8049f8 100644
--- a/data/custodian/MX-TA-XXX-X-ITCA.yaml
+++ b/data/custodian/MX-TAM-CVI-X-ITCA.yaml
@@ -35,7 +35,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.189089+00:00'
 ghcid:
-  ghcid_current: MX-TA-XXX-X-ITCA
+  ghcid_current: MX-TAM-CVI-X-ITCA
   ghcid_original: MX-TA-XXX-X-ITCA
   ghcid_uuid: ec0b30bd-390d-5fa4-b2d1-2150ae68f60a
   ghcid_uuid_sha256: 5933fb42-2bc2-8991-93c2-ded50e187312
@@ -43,22 +43,35 @@ ghcid:
   record_id: 36bb8395-6ef8-497b-89da-0fa480da1297
   generation_timestamp: '2025-12-06T23:39:02.189089+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: TA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: TAM
+    region_name: Tamaulipas
+    city_code: CVI
+    city_name: Ciudad Victoria
+    geonames_id: 3530580
+    feature_code: PPLA
+    google_place_id: ChIJvx9uYv1TeYYRz4IWj3wVaTw
+    latitude: 23.7345184
+    longitude: -99.1491288
+    resolution_date: '2025-12-07T16:40:14.126607+00:00'
   ghcid_history:
   - ghcid: MX-TA-XXX-X-ITCA
     ghcid_numeric: 6427757354808416657
     valid_from: '2025-12-06T23:39:02.189089+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:14.126607+00:00'
+  - ghcid: MX-TAM-CVI-X-ITCA
+    ghcid_numeric: 6427757354808416657
+    valid_from: '2025-12-07T16:40:14.126607+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Ciudad Victoria (TAM)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Instituto Tamaulipeco para la Cultura y las Artes
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-TA-XXX-X-ITCA
+  identifier_value: MX-TAM-CVI-X-ITCA
 - identifier_scheme: GHCID_UUID
   identifier_value: ec0b30bd-390d-5fa4-b2d1-2150ae68f60a
 - identifier_scheme: GHCID_UUID_SHA256
@@ -141,3 +154,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.189089+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJvx9uYv1TeYYRz4IWj3wVaTw
+  formatted_address: Calle Guerrero No. 421 Entre Emiliano P. Nafarrete y, Gaspar
+    de la Garza, Colonia Centro, 87000 Cdad. Victoria, Tamps., Mexico
+  website: http://www.tamaulipas.gob.mx/cultura/
+  latitude: 23.7345184
+  longitude: -99.1491288
+  enriched_at: '2025-12-07T16:40:14.126607+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/MX-ZA-XXX-X-FD.yaml b/data/custodian/MX-ZA-LAN-X-FD.yaml
similarity index 87%
rename from data/custodian/MX-ZA-XXX-X-FD.yaml
rename to data/custodian/MX-ZA-LAN-X-FD.yaml
index 9f3554fa2b..b3466a738d 100644
--- a/data/custodian/MX-ZA-XXX-X-FD.yaml
+++ b/data/custodian/MX-ZA-LAN-X-FD.yaml
@@ -1,53 +1,96 @@
-original_entry:
-  name: FAMSI Database
-  institution_type: MIXED
-  source: CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
-  identifiers:
-  - identifier_scheme: GHCID
-    identifier_value: MX-ZAC-XXX-M-FD
-  - identifier_scheme: GHCID_NUMERIC
-    identifier_value: '12900171635447274444'
-  - &id001
-    identifier_scheme: OLD_ID
-    identifier_value: https://w3id.org/heritage/custodian/mx/m-famsi-database-0078
-  - identifier_scheme: GHCID_UUID
-    identifier_value: 00a83194-49a7-5a18-9b21-41bc5039c28e
-    identifier_url: urn:uuid:00a83194-49a7-5a18-9b21-41bc5039c28e
-  - identifier_scheme: GHCID_UUID_SHA256
-    identifier_value: b3069dc1-2067-8bcc-90b4-4b512c0486fa
-    identifier_url: urn:uuid:b3069dc1-2067-8bcc-90b4-4b512c0486fa
-  - identifier_scheme: RECORD_ID
-    identifier_value: 019a58fd-3228-784d-b229-4880d81dbd8d
-    identifier_url: urn:uuid:019a58fd-3228-784d-b229-4880d81dbd8d
-  - &id002
-    identifier_scheme: OLD_ID
-    identifier_value: 12900171635447274444
-  locations:
-  - region: ZACATECAS
-    country: MX
-processing_timestamp: '2025-12-06T23:39:02.233045+00:00'
-ghcid:
-  ghcid_current: MX-ZA-XXX-X-FD
-  ghcid_original: MX-ZA-XXX-X-FD
-  ghcid_uuid: 7424e633-0d53-5eb1-890b-56a6baee3301
-  ghcid_uuid_sha256: 599128c8-2712-8908-5665-ccd2c42a6e26
-  ghcid_numeric: 6453984581112740104
-  record_id: 2966eba9-f4d6-4d21-8241-84fef4f484f3
-  generation_timestamp: '2025-12-06T23:39:02.233045+00:00'
-  location_resolution:
-    country_code: MX
-    region_code: ZA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
-  ghcid_history:
-  - ghcid: MX-ZA-XXX-X-FD
-    ghcid_numeric: 6453984581112740104
-    valid_from: '2025-12-06T23:39:02.233045+00:00'
-    reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+ch_annotator:
+  annotation_metadata:
+    confidence_score: 0.9
+    verification_date: null
+    verified: false
+    verified_by: null
+  annotation_provenance:
+    annotation_agent: opencode-claude-sonnet-4
+    annotation_date: '2025-12-06T21:13:56.173868+00:00'
+    annotation_method: retroactive CH-Annotator application via batch script
+    source_file: latin_american_institutions_AUTHORITATIVE.yaml
+  convention_id: ch_annotator-v1_7_0
+  convention_version: 1.7.0
+  entity_claims:
+  - claim_type: full_name
+    claim_value: FAMSI Database
+    confidence: 0.9
+    property_uri: skos:prefLabel
+    provenance:
+      agent: claude-conversation
+      context_convention: ch_annotator-v1_7_0
+      namespace: glam
+      path: /conversations/mixed
+      timestamp: '2025-11-06T07:54:59.620656+00:00'
+  - claim_type: institution_type
+    claim_value: MIXED
+    confidence: 0.95
+    property_uri: rdf:type
+    provenance:
+      agent: claude-conversation
+      context_convention: ch_annotator-v1_7_0
+      namespace: glam
+      path: /conversations/mixed
+      timestamp: '2025-11-06T07:54:59.620656+00:00'
+  - claim_type: ghcid
+    claim_value: MX-ZAC-XXX-M-FD
+    confidence: 1.0
+    property_uri: glam:ghcid
+    provenance:
+      agent: claude-conversation
+      context_convention: ch_annotator-v1_7_0
+      namespace: glam
+      path: /conversations/mixed
+      timestamp: '2025-11-06T07:54:59.620656+00:00'
+  entity_classification:
+    alternative_classes:
+    - org:FormalOrganization
+    - rov:RegisteredOrganization
+    - glam:HeritageCustodian
+    hypernym: GRP
+    hypernym_label: GROUP
+    ontology_class: glam:HeritageCustodian
+    subtype: GRP.HER.MIX
+    subtype_label: MIXED
+  extraction_provenance:
+    agent: claude-conversation
+    context_convention: ch_annotator-v1_7_0
+    namespace: glam
+    path: /conversations/mixed
+    timestamp: '2025-11-06T07:54:59.620656+00:00'
+  integration_note:
+    created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
+    creation_date: '2025-12-06T23:39:02.233045+00:00'
+    creation_method: create_custodian_from_ch_annotator.py
 custodian_name:
   claim_type: custodian_name
   claim_value: FAMSI Database
   source_type: ch_annotator
+ghcid:
+  generation_timestamp: '2025-12-06T23:39:02.233045+00:00'
+  ghcid_current: US-CA-LAN-X-FD
+  ghcid_history:
+  - ghcid: MX-ZA-XXX-X-FD
+    ghcid_numeric: 6453984581112740104
+    reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_from: '2025-12-06T23:39:02.233045+00:00'
+  ghcid_numeric: 6453984581112740104
+  ghcid_original: MX-ZA-XXX-X-FD
+  ghcid_uuid: 7424e633-0d53-5eb1-890b-56a6baee3301
+  ghcid_uuid_sha256: 599128c8-2712-8908-5665-ccd2c42a6e26
+  location_resolution:
+    city_code: LAN
+    city_name: Los Angeles
+    country_code: US
+    geonames_id: 5368361
+    latitude: 34.0639
+    longitude: -118.3592
+    method: MANUAL_RESEARCH
+    notes: FAMSI (Foundation for the Advancement of Mesoamerican Studies) is US-based
+    region_code: CA
+    region_name: California
+    resolution_date: '2025-12-07T16:44:07.076818+00:00'
+  record_id: 2966eba9-f4d6-4d21-8241-84fef4f484f3
 identifiers:
 - identifier_scheme: GHCID
   identifier_value: MX-ZA-XXX-X-FD
@@ -59,75 +102,39 @@ identifiers:
   identifier_value: '6453984581112740104'
 - identifier_scheme: RECORD_ID
   identifier_value: 2966eba9-f4d6-4d21-8241-84fef4f484f3
-- *id001
-- *id002
+- &id001
+  identifier_scheme: OLD_ID
+  identifier_value: https://w3id.org/heritage/custodian/mx/m-famsi-database-0078
+- &id002
+  identifier_scheme: OLD_ID
+  identifier_value: 12900171635447274444
+original_entry:
+  identifiers:
+  - identifier_scheme: GHCID
+    identifier_value: MX-ZAC-XXX-M-FD
+  - identifier_scheme: GHCID_NUMERIC
+    identifier_value: '12900171635447274444'
+  - *id001
+  - identifier_scheme: GHCID_UUID
+    identifier_url: urn:uuid:00a83194-49a7-5a18-9b21-41bc5039c28e
+    identifier_value: 00a83194-49a7-5a18-9b21-41bc5039c28e
+  - identifier_scheme: GHCID_UUID_SHA256
+    identifier_url: urn:uuid:b3069dc1-2067-8bcc-90b4-4b512c0486fa
+    identifier_value: b3069dc1-2067-8bcc-90b4-4b512c0486fa
+  - identifier_scheme: RECORD_ID
+    identifier_url: urn:uuid:019a58fd-3228-784d-b229-4880d81dbd8d
+    identifier_value: 019a58fd-3228-784d-b229-4880d81dbd8d
+  - *id002
+  institution_type: MIXED
+  locations:
+  - country: MX
+    region: ZACATECAS
+  name: FAMSI Database
+  source: CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+processing_timestamp: '2025-12-06T23:39:02.233045+00:00'
 provenance:
+  confidence_score: 0.9
   data_source: CONVERSATION_NLP
   data_tier: TIER_4_INFERRED
   extraction_date: '2025-11-06T07:54:59.620656+00:00'
   extraction_method: 'Created from CH-Annotator file: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml'
-  confidence_score: 0.9
-ch_annotator:
-  convention_id: ch_annotator-v1_7_0
-  convention_version: 1.7.0
-  entity_classification:
-    hypernym: GRP
-    hypernym_label: GROUP
-    subtype: GRP.HER.MIX
-    subtype_label: MIXED
-    ontology_class: glam:HeritageCustodian
-    alternative_classes:
-    - org:FormalOrganization
-    - rov:RegisteredOrganization
-    - glam:HeritageCustodian
-  extraction_provenance:
-    namespace: glam
-    path: /conversations/mixed
-    timestamp: '2025-11-06T07:54:59.620656+00:00'
-    agent: claude-conversation
-    context_convention: ch_annotator-v1_7_0
-  annotation_provenance:
-    annotation_agent: opencode-claude-sonnet-4
-    annotation_date: '2025-12-06T21:13:56.173868+00:00'
-    annotation_method: retroactive CH-Annotator application via batch script
-    source_file: latin_american_institutions_AUTHORITATIVE.yaml
-  annotation_metadata:
-    confidence_score: 0.9
-    verified: false
-    verification_date: null
-    verified_by: null
-  entity_claims:
-  - claim_type: full_name
-    claim_value: FAMSI Database
-    property_uri: skos:prefLabel
-    provenance:
-      namespace: glam
-      path: /conversations/mixed
-      timestamp: '2025-11-06T07:54:59.620656+00:00'
-      agent: claude-conversation
-      context_convention: ch_annotator-v1_7_0
-    confidence: 0.9
-  - claim_type: institution_type
-    claim_value: MIXED
-    property_uri: rdf:type
-    provenance:
-      namespace: glam
-      path: /conversations/mixed
-      timestamp: '2025-11-06T07:54:59.620656+00:00'
-      agent: claude-conversation
-      context_convention: ch_annotator-v1_7_0
-    confidence: 0.95
-  - claim_type: ghcid
-    claim_value: MX-ZAC-XXX-M-FD
-    property_uri: glam:ghcid
-    provenance:
-      namespace: glam
-      path: /conversations/mixed
-      timestamp: '2025-11-06T07:54:59.620656+00:00'
-      agent: claude-conversation
-      context_convention: ch_annotator-v1_7_0
-    confidence: 1.0
-  integration_note:
-    created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
-    creation_date: '2025-12-06T23:39:02.233045+00:00'
-    creation_method: create_custodian_from_ch_annotator.py
diff --git a/data/custodian/MX-ZA-XXX-X-DFC.yaml b/data/custodian/MX-ZA-PRO-X-DFC.yaml
similarity index 84%
rename from data/custodian/MX-ZA-XXX-X-DFC.yaml
rename to data/custodian/MX-ZA-PRO-X-DFC.yaml
index ae94425cd4..2758accd2b 100644
--- a/data/custodian/MX-ZA-XXX-X-DFC.yaml
+++ b/data/custodian/MX-ZA-PRO-X-DFC.yaml
@@ -1,57 +1,96 @@
-original_entry:
-  name: Digital Florentine Codex
-  institution_type: MIXED
-  source: CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
-  identifiers:
-  - &id001
-    identifier_scheme: Website
-    identifier_value: https://florentinecodex.getty.edu/
-    identifier_url: https://florentinecodex.getty.edu/
-  - identifier_scheme: GHCID
-    identifier_value: MX-ZAC-XXX-M-DFC
-  - identifier_scheme: GHCID_NUMERIC
-    identifier_value: '3286469584513853184'
-  - &id002
-    identifier_scheme: OLD_ID
-    identifier_value: https://w3id.org/heritage/custodian/mx/m-digital-florentine-codex-0076
-  - identifier_scheme: GHCID_UUID
-    identifier_value: 0e111a7d-fec9-5494-b040-9b6dcbdc08e8
-    identifier_url: urn:uuid:0e111a7d-fec9-5494-b040-9b6dcbdc08e8
-  - identifier_scheme: GHCID_UUID_SHA256
-    identifier_value: 2d9be2ac-b612-8700-b8b9-4eb27cbbddbc
-    identifier_url: urn:uuid:2d9be2ac-b612-8700-b8b9-4eb27cbbddbc
-  - identifier_scheme: RECORD_ID
-    identifier_value: 019a58fd-3228-7fc2-8a69-ccedf6c8e297
-    identifier_url: urn:uuid:019a58fd-3228-7fc2-8a69-ccedf6c8e297
-  - &id003
-    identifier_scheme: OLD_ID
-    identifier_value: 3286469584513853184
-  locations:
-  - region: ZACATECAS
-    country: MX
-processing_timestamp: '2025-12-06T23:39:02.228275+00:00'
-ghcid:
-  ghcid_current: MX-ZA-XXX-X-DFC
-  ghcid_original: MX-ZA-XXX-X-DFC
-  ghcid_uuid: 9a907e80-7a4d-5952-8094-c329f2bb7efd
-  ghcid_uuid_sha256: 7c9960f7-8c26-836b-e8c0-12ea12d19576
-  ghcid_numeric: 8978313948464329579
-  record_id: 1af318e6-ece0-4c80-84cf-c7c8a1580b52
-  generation_timestamp: '2025-12-06T23:39:02.228275+00:00'
-  location_resolution:
-    country_code: MX
-    region_code: ZA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
-  ghcid_history:
-  - ghcid: MX-ZA-XXX-X-DFC
-    ghcid_numeric: 8978313948464329579
-    valid_from: '2025-12-06T23:39:02.228275+00:00'
-    reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+ch_annotator:
+  annotation_metadata:
+    confidence_score: 0.9
+    verification_date: null
+    verified: false
+    verified_by: null
+  annotation_provenance:
+    annotation_agent: opencode-claude-sonnet-4
+    annotation_date: '2025-12-06T21:13:56.173868+00:00'
+    annotation_method: retroactive CH-Annotator application via batch script
+    source_file: latin_american_institutions_AUTHORITATIVE.yaml
+  convention_id: ch_annotator-v1_7_0
+  convention_version: 1.7.0
+  entity_claims:
+  - claim_type: full_name
+    claim_value: Digital Florentine Codex
+    confidence: 0.9
+    property_uri: skos:prefLabel
+    provenance:
+      agent: claude-conversation
+      context_convention: ch_annotator-v1_7_0
+      namespace: glam
+      path: /conversations/mixed
+      timestamp: '2025-11-06T07:54:59.620650+00:00'
+  - claim_type: institution_type
+    claim_value: MIXED
+    confidence: 0.95
+    property_uri: rdf:type
+    provenance:
+      agent: claude-conversation
+      context_convention: ch_annotator-v1_7_0
+      namespace: glam
+      path: /conversations/mixed
+      timestamp: '2025-11-06T07:54:59.620650+00:00'
+  - claim_type: ghcid
+    claim_value: MX-ZAC-XXX-M-DFC
+    confidence: 1.0
+    property_uri: glam:ghcid
+    provenance:
+      agent: claude-conversation
+      context_convention: ch_annotator-v1_7_0
+      namespace: glam
+      path: /conversations/mixed
+      timestamp: '2025-11-06T07:54:59.620650+00:00'
+  entity_classification:
+    alternative_classes:
+    - org:FormalOrganization
+    - rov:RegisteredOrganization
+    - glam:HeritageCustodian
+    hypernym: GRP
+    hypernym_label: GROUP
+    ontology_class: glam:HeritageCustodian
+    subtype: GRP.HER.MIX
+    subtype_label: MIXED
+  extraction_provenance:
+    agent: claude-conversation
+    context_convention: ch_annotator-v1_7_0
+    namespace: glam
+    path: /conversations/mixed
+    timestamp: '2025-11-06T07:54:59.620650+00:00'
+  integration_note:
+    created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
+    creation_date: '2025-12-06T23:39:02.228275+00:00'
+    creation_method: create_custodian_from_ch_annotator.py
 custodian_name:
   claim_type: custodian_name
   claim_value: Digital Florentine Codex
   source_type: ch_annotator
+ghcid:
+  generation_timestamp: '2025-12-06T23:39:02.228275+00:00'
+  ghcid_current: US-UT-PRO-X-DFC
+  ghcid_history:
+  - ghcid: MX-ZA-XXX-X-DFC
+    ghcid_numeric: 8978313948464329579
+    reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_from: '2025-12-06T23:39:02.228275+00:00'
+  ghcid_numeric: 8978313948464329579
+  ghcid_original: MX-ZA-XXX-X-DFC
+  ghcid_uuid: 9a907e80-7a4d-5952-8094-c329f2bb7efd
+  ghcid_uuid_sha256: 7c9960f7-8c26-836b-e8c0-12ea12d19576
+  location_resolution:
+    city_code: PRO
+    city_name: Provo
+    country_code: US
+    geonames_id: 5780026
+    latitude: 40.2338
+    longitude: -111.6585
+    method: MANUAL_RESEARCH
+    notes: Digital Florentine Codex project at Brigham Young University
+    region_code: UT
+    region_name: Utah
+    resolution_date: '2025-12-07T16:44:07.084315+00:00'
+  record_id: 1af318e6-ece0-4c80-84cf-c7c8a1580b52
 identifiers:
 - identifier_scheme: GHCID
   identifier_value: MX-ZA-XXX-X-DFC
@@ -63,76 +102,44 @@ identifiers:
   identifier_value: '8978313948464329579'
 - identifier_scheme: RECORD_ID
   identifier_value: 1af318e6-ece0-4c80-84cf-c7c8a1580b52
-- *id001
-- *id002
-- *id003
+- &id001
+  identifier_scheme: Website
+  identifier_url: https://florentinecodex.getty.edu/
+  identifier_value: https://florentinecodex.getty.edu/
+- &id002
+  identifier_scheme: OLD_ID
+  identifier_value: https://w3id.org/heritage/custodian/mx/m-digital-florentine-codex-0076
+- &id003
+  identifier_scheme: OLD_ID
+  identifier_value: 3286469584513853184
+original_entry:
+  identifiers:
+  - *id001
+  - identifier_scheme: GHCID
+    identifier_value: MX-ZAC-XXX-M-DFC
+  - identifier_scheme: GHCID_NUMERIC
+    identifier_value: '3286469584513853184'
+  - *id002
+  - identifier_scheme: GHCID_UUID
+    identifier_url: urn:uuid:0e111a7d-fec9-5494-b040-9b6dcbdc08e8
+    identifier_value: 0e111a7d-fec9-5494-b040-9b6dcbdc08e8
+  - identifier_scheme: GHCID_UUID_SHA256
+    identifier_url: urn:uuid:2d9be2ac-b612-8700-b8b9-4eb27cbbddbc
+    identifier_value: 2d9be2ac-b612-8700-b8b9-4eb27cbbddbc
+  - identifier_scheme: RECORD_ID
+    identifier_url: urn:uuid:019a58fd-3228-7fc2-8a69-ccedf6c8e297
+    identifier_value: 019a58fd-3228-7fc2-8a69-ccedf6c8e297
+  - *id003
+  institution_type: MIXED
+  locations:
+  - country: MX
+    region: ZACATECAS
+  name: Digital Florentine Codex
+  source: CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+processing_timestamp: '2025-12-06T23:39:02.228275+00:00'
 provenance:
+  confidence_score: 0.9
   data_source: CONVERSATION_NLP
   data_tier: TIER_4_INFERRED
   extraction_date: '2025-11-06T07:54:59.620650+00:00'
   extraction_method: 'Created from CH-Annotator file: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml'
-  confidence_score: 0.9
-ch_annotator:
-  convention_id: ch_annotator-v1_7_0
-  convention_version: 1.7.0
-  entity_classification:
-    hypernym: GRP
-    hypernym_label: GROUP
-    subtype: GRP.HER.MIX
-    subtype_label: MIXED
-    ontology_class: glam:HeritageCustodian
-    alternative_classes:
-    - org:FormalOrganization
-    - rov:RegisteredOrganization
-    - glam:HeritageCustodian
-  extraction_provenance:
-    namespace: glam
-    path: /conversations/mixed
-    timestamp: '2025-11-06T07:54:59.620650+00:00'
-    agent: claude-conversation
-    context_convention: ch_annotator-v1_7_0
-  annotation_provenance:
-    annotation_agent: opencode-claude-sonnet-4
-    annotation_date: '2025-12-06T21:13:56.173868+00:00'
-    annotation_method: retroactive CH-Annotator application via batch script
-    source_file: latin_american_institutions_AUTHORITATIVE.yaml
-  annotation_metadata:
-    confidence_score: 0.9
-    verified: false
-    verification_date: null
-    verified_by: null
-  entity_claims:
-  - claim_type: full_name
-    claim_value: Digital Florentine Codex
-    property_uri: skos:prefLabel
-    provenance:
-      namespace: glam
-      path: /conversations/mixed
-      timestamp: '2025-11-06T07:54:59.620650+00:00'
-      agent: claude-conversation
-      context_convention: ch_annotator-v1_7_0
-    confidence: 0.9
-  - claim_type: institution_type
-    claim_value: MIXED
-    property_uri: rdf:type
-    provenance:
-      namespace: glam
-      path: /conversations/mixed
-      timestamp: '2025-11-06T07:54:59.620650+00:00'
-      agent: claude-conversation
-      context_convention: ch_annotator-v1_7_0
-    confidence: 0.95
-  - claim_type: ghcid
-    claim_value: MX-ZAC-XXX-M-DFC
-    property_uri: glam:ghcid
-    provenance:
-      namespace: glam
-      path: /conversations/mixed
-      timestamp: '2025-11-06T07:54:59.620650+00:00'
-      agent: claude-conversation
-      context_convention: ch_annotator-v1_7_0
-    confidence: 1.0
-  integration_note:
-    created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
-    creation_date: '2025-12-06T23:39:02.228275+00:00'
-    creation_method: create_custodian_from_ch_annotator.py
diff --git a/data/custodian/MX-ZA-XXX-X-IRPM.yaml b/data/custodian/MX-ZAC-CSC-X-IRPM.yaml
similarity index 82%
rename from data/custodian/MX-ZA-XXX-X-IRPM.yaml
rename to data/custodian/MX-ZAC-CSC-X-IRPM.yaml
index e7c4c9e625..a92d026f4d 100644
--- a/data/custodian/MX-ZA-XXX-X-IRPM.yaml
+++ b/data/custodian/MX-ZAC-CSC-X-IRPM.yaml
@@ -27,7 +27,7 @@ original_entry:
     country: MX
 processing_timestamp: '2025-12-06T23:39:02.210265+00:00'
 ghcid:
-  ghcid_current: MX-ZA-XXX-X-IRPM
+  ghcid_current: MX-ZAC-CSC-X-IRPM
   ghcid_original: MX-ZA-XXX-X-IRPM
   ghcid_uuid: 3d3a19a4-49f2-5e43-8c8b-0c440dc050d8
   ghcid_uuid_sha256: e5738cb7-0748-85e7-361b-0a57e6fba9d9
@@ -35,22 +35,35 @@ ghcid:
   record_id: 618d82b1-cddb-4c33-b3da-866e5b7f5813
   generation_timestamp: '2025-12-06T23:39:02.210265+00:00'
   location_resolution:
+    method: GOOGLE_PLACES_GEONAMES
     country_code: MX
-    region_code: ZA
-    city_code: XXX
-    method: CH_ANNOTATOR_SOURCE
+    region_code: ZAC
+    region_name: Zacatecas
+    city_code: CSC
+    city_name: Cerro Santa Clara
+    geonames_id: 8945732
+    feature_code: PPL
+    google_place_id: ChIJ8xSR6oZOgoYRa-pG-NLfvHo
+    latitude: 22.7795778
+    longitude: -102.5715283
+    resolution_date: '2025-12-07T16:40:22.585455+00:00'
   ghcid_history:
   - ghcid: MX-ZA-XXX-X-IRPM
     ghcid_numeric: 16533713374736295399
     valid_from: '2025-12-06T23:39:02.210265+00:00'
     reason: Initial GHCID from CH-Annotator (latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml)
+    valid_to: '2025-12-07T16:40:22.585455+00:00'
+  - ghcid: MX-ZAC-CSC-X-IRPM
+    ghcid_numeric: 16533713374736295399
+    valid_from: '2025-12-07T16:40:22.585455+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Cerro Santa Clara (ZAC)'
 custodian_name:
   claim_type: custodian_name
   claim_value: Instituto Regional del Patrimonio Mundial
   source_type: ch_annotator
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: MX-ZA-XXX-X-IRPM
+  identifier_value: MX-ZAC-CSC-X-IRPM
 - identifier_scheme: GHCID_UUID
   identifier_value: 3d3a19a4-49f2-5e43-8c8b-0c440dc050d8
 - identifier_scheme: GHCID_UUID_SHA256
@@ -131,3 +144,12 @@ ch_annotator:
     created_from: latin_american_institutions_AUTHORITATIVE_ch_annotator.yaml
     creation_date: '2025-12-06T23:39:02.210265+00:00'
     creation_method: create_custodian_from_ch_annotator.py
+google_maps_enrichment:
+  place_id: ChIJ8xSR6oZOgoYRa-pG-NLfvHo
+  formatted_address: 'Juan de Tolosa #831, Zacatecas Centro, 98000 Zacatecas, Zac.,
+    Mexico'
+  website: http://irpmzcc2.org/
+  latitude: 22.7795778
+  longitude: -102.5715283
+  enriched_at: '2025-12-07T16:40:22.585455+00:00'
+  source: Google Places API (New)
diff --git a/data/custodian/PH-00-XXX-O-NMP.yaml b/data/custodian/PH-NCR-MAN-O-NMP.yaml
similarity index 64%
rename from data/custodian/PH-00-XXX-O-NMP.yaml
rename to data/custodian/PH-NCR-MAN-O-NMP.yaml
index 1b52483419..eef1cb506a 100644
--- a/data/custodian/PH-00-XXX-O-NMP.yaml
+++ b/data/custodian/PH-NCR-MAN-O-NMP.yaml
@@ -17,7 +17,7 @@ wikidata_enrichment:
   - government agency
   - cultural institution
 ghcid:
-  ghcid_current: PH-00-XXX-O-NMP
+  ghcid_current: PH-NCR-MAN-O-NMP
   ghcid_original: PH-XX-XXX-O-NMP
   ghcid_uuid: 803575b5-fcf1-5743-a719-c61fd3a8aeec
   ghcid_uuid_sha256: 7c8933d7-a9ff-8b1a-8397-5b98549d4097
@@ -32,16 +32,24 @@ ghcid:
   - ghcid: PH-00-XXX-O-NMP
     valid_from: '2025-12-06T23:35:49.583112+00:00'
     reason: 'Region resolved via Wikidata P131: XX->00 (PH-00)'
+    valid_to: '2025-12-07T16:43:01.366082+00:00'
+  - ghcid: PH-NCR-MAN-O-NMP
+    ghcid_numeric: 8973760733875522330
+    valid_from: '2025-12-07T16:43:01.366082+00:00'
+    reason: 'Location resolved via Google Places + GeoNames: Manila (NCR)'
   location_resolution:
-    method: WIKIDATA_P131
+    method: GOOGLE_PLACES_GEONAMES
     country_code: PH
-    country_label: Philippines
-    region_code: '00'
-    city_code: XXX
-    city_label: ''
-    region_name: PH-00
-    iso_code_source: PH-00
-    resolution_timestamp: '2025-12-06T23:35:49.583013+00:00'
+    region_code: NCR
+    region_name: Metro Manila
+    city_code: MAN
+    city_name: Manila
+    geonames_id: 1701668
+    feature_code: PPLC
+    google_place_id: ChIJa5tW0CPKlzMRKuDqk7sMx88
+    latitude: 14.5870316
+    longitude: 120.98102519999999
+    resolution_date: '2025-12-07T16:43:01.366082+00:00'
 custodian_name:
   claim_type: custodian_name
   claim_value: National Museum of the Philippines
@@ -58,3 +66,12 @@ unesco_mow_enrichment:
 provenance:
   notes:
   - 'Region resolved 2025-12-06T23:35:49Z: XX->00 via Wikidata P131 (PH-00)'
+google_maps_enrichment:
+  place_id: ChIJa5tW0CPKlzMRKuDqk7sMx88
+  formatted_address: Ground Floor, National Museum of Fine Arts Building, P Padre
+    Burgos Ave, Ermita, Manila, 1000 Metro Manila, Philippines
+  website: https://www.nationalmuseum.gov.ph/our-museums/national-museum-of-fine-arts/
+  latitude: 14.5870316
+  longitude: 120.98102519999999
+  enriched_at: '2025-12-07T16:43:01.366082+00:00'
+  source: Google Places API (New)