diff --git a/data-full.json b/data-full.json
index c80e97d..5b084d5 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-04-30T02:21:53Z",
+    "timestamp_osm_base": "2022-05-01T02:40:56Z",
     "copyright": "The data included in this document is from www.openstreetmap.org. The data is made available under ODbL."
   },
   "elements": [
@@ -13703,10 +13703,10 @@
 {
   "type": "node",
   "id": 539389036,
-  "lat": 38.7961004,
-  "lon": 0.1859973,
+  "lat": 38.7961272,
+  "lon": 0.1860264,
   "tags": {
-    "man_made": "lighthouse",
+    "man_made": "beacon",
     "seamark:light:character": "Fl",
     "seamark:light:colour": "red",
     "seamark:light:group": "2",
@@ -28792,6 +28792,31 @@
     "wikipedia": "fr:Phare de Naufrage"
   }
 },
+{
+  "type": "node",
+  "id": 1051564339,
+  "lat": -38.1764841,
+  "lon": 174.6651701,
+  "tags": {
+    "name": "Taharoa Offshore Terminal",
+    "ref:linz:hydrographic_id": "3909770;3909769",
+    "seamark:buoy_installation:category": "sbm",
+    "seamark:buoy_installation:colour": "orange",
+    "seamark:buoy_installation:reflectivity": "reflector",
+    "seamark:buoy_installation:shape": "super-buoy",
+    "seamark:light:character": "Fl",
+    "seamark:light:colour": "white",
+    "seamark:light:group": "1",
+    "seamark:light:period": "5",
+    "seamark:light:range": "6",
+    "seamark:light:sequence": "1+(4)",
+    "seamark:name": "Taharoa Offshore Terminal",
+    "seamark:radio_station:mmsi": "995121026",
+    "seamark:type": "buoy_installation",
+    "source": "LINZ;Taharoa Offshore Terminal Chart;NI 285/2015",
+    "source:date": "2015-12-09"
+  }
+},
 {
   "type": "node",
   "id": 1052814961,
@@ -303263,6 +303288,7 @@
   "lat": 38.7948561,
   "lon": 0.1871132,
   "tags": {
+    "man_made": "beacon",
     "seamark:light:character": "Fl",
     "seamark:light:colour": "green",
     "seamark:light:height": "11",
@@ -432322,24 +432348,6 @@
     "source:date": "2016-06-01"
   }
 },
-{
-  "type": "node",
-  "id": 9234597322,
-  "lat": -38.1764678,
-  "lon": 174.6652255,
-  "tags": {
-    "ref:linz:hydrographic_id": "3909770",
-    "seamark:light:character": "Fl",
-    "seamark:light:colour": "white",
-    "seamark:light:group": "1",
-    "seamark:light:period": "5",
-    "seamark:light:range": "6",
-    "seamark:light:sequence": "1+(4)",
-    "seamark:type": "light_minor",
-    "source": "LINZ;Taharoa Offshore Terminal Chart;NI 285/2015",
-    "source:date": "2015-12-09"
-  }
-},
 {
   "type": "node",
   "id": 9234653376,
@@ -433631,7 +433639,6 @@
   "lat": -45.7945780,
   "lon": 170.7076779,
   "tags": {
-    "description": "AIS AtoN, MMSI 995121037",
     "height": "5",
     "name": "No. 9",
     "ref:linz:hydrographic_id": "273339;273189;273280",
@@ -433647,6 +433654,7 @@
     "seamark:light:range": "3",
     "seamark:light:sequence": "(1)+3",
     "seamark:name": "9",
+    "seamark:radio_station:mmsi": "995121037",
     "seamark:topmark:colour": "green",
     "seamark:topmark:shape": "cone, point up",
     "seamark:type": "beacon_lateral",
@@ -433660,7 +433668,6 @@
   "lat": -45.7917391,
   "lon": 170.7158480,
   "tags": {
-    "description": "AIS AtoN, MMSI 995121035",
     "height": "3",
     "name": "No. 5",
     "ref:linz:hydrographic_id": "273088;273089;273090",
@@ -433676,6 +433683,7 @@
     "seamark:light:range": "3",
     "seamark:light:sequence": "0.5+(1)+0.5+(1)+0.5+(2.5)",
     "seamark:name": "5",
+    "seamark:radio_station:mmsi": "995121035",
     "seamark:topmark:colour": "green",
     "seamark:topmark:shape": "cone, point up",
     "seamark:type": "beacon_lateral",
@@ -433689,7 +433697,7 @@
   "lat": -45.7510973,
   "lon": 170.7269463,
   "tags": {
-    "description": "Pivoted at base. AIS AtoN, MMSI 995121033",
+    "description": "Pivoted at base",
     "height": "9",
     "name": "Fairway Beacon",
     "ref:linz:hydrographic_id": "272983;272985;272984",
@@ -433704,11 +433712,10 @@
     "seamark:light:range": "5",
     "seamark:light:sequence": "0.5+(1)+0.5+(3)",
     "seamark:name": "Fairway",
+    "seamark:radio_station:mmsi": "995121033",
     "seamark:topmark:colour": "red",
     "seamark:topmark:shape": "cylinder",
     "seamark:type": "beacon_lateral",
-    "seamark:virtual_aton:category": "port_lateral",
-    "seamark:virtual_aton:mmsi": "995121033",
     "source": "LINZ;Otago Harbour Chart;HITS 6612/309",
     "source:date": "2021-05-25"
   }