diff --git a/data-full.json b/data-full.json
index 68e3457..97e4b73 100644
--- a/data-full.json
+++ b/data-full.json
@@ -2,7 +2,7 @@
   "version": 0.6,
   "generator": "Overpass API 0.7.57 93a4d346",
   "osm3s": {
-    "timestamp_osm_base": "2022-03-27T01:52:54Z",
+    "timestamp_osm_base": "2022-03-28T02:00:04Z",
     "copyright": "The data included in this document is from www.openstreetmap.org. The data is made available under ODbL."
   },
   "elements": [
@@ -29699,6 +29699,27 @@
     "source:date": "2017-01-01"
   }
 },
+{
+  "type": "node",
+  "id": 1052815749,
+  "lat": -36.4217501,
+  "lon": 175.3312936,
+  "tags": {
+    "man_made": "beacon",
+    "seamark:light:character": "Fl",
+    "seamark:light:colour": "white",
+    "seamark:light:group": "2",
+    "seamark:light:height": "79",
+    "seamark:light:period": "12",
+    "seamark:light:range": "9",
+    "seamark:light:reference": "K 3882",
+    "seamark:light:sequence": "0.5+(2)+0.5+(9)",
+    "seamark:name": "Channel Island",
+    "seamark:type": "light_minor",
+    "seamark:virtual_aton:mmsi": "995126024",
+    "source": "LINZ;US NGA Pub. 111. 2010-09-02."
+  }
+},
 {
   "type": "node",
   "id": 1052815795,
@@ -31766,6 +31787,7 @@
     "seamark:light:sequence": "1+(6)",
     "seamark:name": "Flat Rock",
     "seamark:type": "light_minor",
+    "seamark:virtual_aton:mmsi": "995126025",
     "source": "LINZ;US NGA Pub. 111. 2010-09-02.;Te Hāwere-a-Maki/Goat Island To Waiwera River Chart"
   }
 },
@@ -43267,25 +43289,6 @@
     "source": "US NGA Pub. 111. 2010-09-02.;LINZ;Tāmaki River Chart"
   }
 },
-{
-  "type": "node",
-  "id": 1195392973,
-  "lat": -36.4219835,
-  "lon": 175.3323523,
-  "tags": {
-    "seamark:light:character": "Fl",
-    "seamark:light:colour": "white",
-    "seamark:light:group": "2",
-    "seamark:light:height": "79",
-    "seamark:light:period": "12",
-    "seamark:light:range": "9",
-    "seamark:light:reference": "K 3882",
-    "seamark:light:sequence": "0.5+(2)+0.5+(9)",
-    "seamark:name": "Channel Island",
-    "seamark:type": "light_minor",
-    "source": "US NGA Pub. 111. 2010-09-02."
-  }
-},
 {
   "type": "node",
   "id": 1195393182,
@@ -215446,7 +215449,10 @@
   "lat": 48.5231667,
   "lon": -4.8051633,
   "tags": {
+    "heritage": "2",
+    "heritage:operator": "mhs",
     "man_made": "lighthouse",
+    "mhs:inscription_date": "2015-12-31",
     "name": "Phare du Four",
     "name:br": "Tour-tan ar Forn",
     "name:de": "Phare du Chenal du Four",
@@ -215455,6 +215461,7 @@
     "ref:aladin": "29A00214",
     "ref:arlhs": "FRA013",
     "ref:inspire": "http://www.shom.fr/BDML/BALISAGE/FR000001823500001",
+    "ref:mhs": "PA29000088",
     "ref:nga": "113-48",
     "seamark:landmark:category": "tower",
     "seamark:landmark:colour": "grey",
@@ -215470,6 +215477,7 @@
     "seamark:name": "Le Four",
     "seamark:type": "landmark",
     "source": "Shom-DAM, 2019. Balisage maritime;ANFR 08/2019;US NGA Pub. 113. 2010-10-22.",
+    "source:heritage": "Ministère de la Culture - 2022-01",
     "source:name:br": "Ofis publik ar brezhoneg",
     "wikidata": "Q2085041",
     "wikipedia": "fr:Phare du Four"
@@ -439119,15 +439127,10 @@
     4527092530,
     4527092529,
     4527092517,
-    4527092518,
     968055170,
     4527092520,
-    4527092521,
-    4527092522,
     4527092523,
-    4527092524,
     4527092525,
-    4527092526,
     4527092527,
     4527092528,
     4527092516
@@ -439138,8 +439141,9 @@
     "addr:postcode": "31328",
     "addr:state": "GA",
     "addr:street": "Taylor Street",
-    "building": "industrial",
+    "building": "yes",
     "height": "44.2",
+    "historic": "yes",
     "man_made": "lighthouse",
     "name": "Tybee Island Lighthouse",
     "phone": "(912) 786-5801",
@@ -449851,92 +449855,62 @@
 {
   "type": "node",
   "id": 968055170,
-  "lat": 32.0221995,
-  "lon": -80.8456306
+  "lat": 32.0222188,
+  "lon": -80.8456119
 },
 {
   "type": "node",
   "id": 4527092516,
-  "lat": 32.0222754,
-  "lon": -80.8456599
+  "lat": 32.0222896,
+  "lon": -80.8456538
 },
 {
   "type": "node",
   "id": 4527092517,
-  "lat": 32.0222233,
-  "lon": -80.8456092
-},
-{
-  "type": "node",
-  "id": 4527092518,
-  "lat": 32.0222097,
-  "lon": -80.8456173
+  "lat": 32.0222364,
+  "lon": -80.8456085
 },
 {
   "type": "node",
   "id": 4527092520,
-  "lat": 32.0221941,
-  "lon": -80.8456473
-},
-{
-  "type": "node",
-  "id": 4527092521,
-  "lat": 32.0221941,
-  "lon": -80.8456652
-},
-{
-  "type": "node",
-  "id": 4527092522,
-  "lat": 32.0221996,
-  "lon": -80.8456819
+  "lat": 32.0221984,
+  "lon": -80.8456484
 },
 {
   "type": "node",
   "id": 4527092523,
-  "lat": 32.0222099,
-  "lon": -80.8456951
-},
-{
-  "type": "node",
-  "id": 4527092524,
-  "lat": 32.0222235,
-  "lon": -80.8457030
+  "lat": 32.0222056,
+  "lon": -80.8456921
 },
 {
   "type": "node",
   "id": 4527092525,
-  "lat": 32.0222387,
-  "lon": -80.8457046
-},
-{
-  "type": "node",
-  "id": 4527092526,
-  "lat": 32.0222533,
-  "lon": -80.8456997
+  "lat": 32.0222361,
+  "lon": -80.8457175
 },
 {
   "type": "node",
   "id": 4527092527,
-  "lat": 32.0222654,
-  "lon": -80.8456888
+  "lat": 32.0222732,
+  "lon": -80.8457081
 },
 {
   "type": "node",
   "id": 4527092528,
-  "lat": 32.0222733,
+  "lat": 32.0222923,
   "lon": -80.8456735
 },
 {
   "type": "node",
   "id": 4527092529,
-  "lat": 32.0222619,
-  "lon": -80.8455474
+  "lat": 32.0222683,
+  "lon": -80.8455555
 },
 {
   "type": "node",
   "id": 4527092530,
-  "lat": 32.0223162,
-  "lon": -80.8455942
+  "lat": 32.0223218,
+  "lon": -80.8456003
 },
 {
   "type": "node",