diff --git a/HAHARUDO.gpx b/HAHARUDO.gpx
deleted file mode 100644
index 51ee980e65..0000000000
--- a/HAHARUDO.gpx
+++ /dev/null
@@ -1 +0,0 @@
-<gpx version="1.1" creator="GoogleMapsConverter"><wpt lat="41.4975394" lon="2.1089133"><name>Institute of Environmental Science and Technology (ICTA - UAB)</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-09-15 00:38:53&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=9308669943948840833"&gt;http://maps.google.com/?cid=9308669943948840833&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="38.8174449" lon="-77.1428941"><name>Taco Bamba Taqueria</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-09-14 22:17:15&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=17935802314953478740"&gt;http://maps.google.com/?cid=17935802314953478740&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="3.5356493" lon="-76.3870411"><name>Alfonso Bonilla Arag&#243;n International Airport</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-09-13 19:21:28&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=654320894779138935"&gt;http://maps.google.com/?cid=654320894779138935&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="3.4596893" lon="-76.5314704"><name>Caras Lindas</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-09-13 18:52:34&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=3465396166573065339"&gt;http://maps.google.com/?cid=3465396166573065339&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="3.4510298" lon="-76.5321732"><name>Plaza de Caicedo</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-09-13 18:42:47&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=11898042663095340097"&gt;http://maps.google.com/?cid=11898042663095340097&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="3.4540056" lon="-76.5319868"><name>Iglesia Ermita</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-09-13 18:42:36&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=1701009278817753200"&gt;http://maps.google.com/?cid=1701009278817753200&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="3.4473512" lon="-76.541512"><name>San Antonio Chapel</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-09-13 18:42:25&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=9723420234300033190"&gt;http://maps.google.com/?cid=9723420234300033190&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="3.4526661" lon="-76.5347844"><name>Bulevar del R&#237;o Cali</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-09-13 18:41:18&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=5477684040922625391"&gt;http://maps.google.com/?cid=5477684040922625391&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="3.4461829" lon="-76.5371851"><name>Sandalio Hostal</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-09-13 18:37:23&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=7142441514875560888"&gt;http://maps.google.com/?cid=7142441514875560888&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="38.7476957" lon="-77.2745893"><name>South Run Recreation Center</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-09-08 00:30:21&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=10164765318339237107"&gt;http://maps.google.com/?cid=10164765318339237107&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="38.9048349" lon="-77.2590257"><name>Chili Wok</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-09-07 21:39:07&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=5450053518942267651"&gt;http://maps.google.com/?cid=5450053518942267651&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="38.8449707" lon="-77.0681838"><name>Padaek Arlington Ridge</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-08-31 22:43:44&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=16805136294030403753"&gt;http://maps.google.com/?cid=16805136294030403753&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="38.8357472" lon="-77.1567656"><name>Chay Restaurant</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-08-24 01:53:13&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=11853455189124642782"&gt;http://maps.google.com/?cid=11853455189124642782&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="37.5540972" lon="-77.483946"><name>Les Crepes Carytown</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-08-17 18:55:44&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=2190223773879991572"&gt;http://maps.google.com/?cid=2190223773879991572&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="38.8543998" lon="-77.3290531"><name>KPOT Korean BBQ &amp; Hot Pot</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-08-13 22:38:54&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=18186107021313782400"&gt;http://maps.google.com/?cid=18186107021313782400&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="39.0102439" lon="-123.3694714"><name>Redwood Drive-In</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-08-10 03:06:30&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?cid=10962484433055443690"&gt;http://maps.google.com/?cid=10962484433055443690&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="0" lon="0"><name>0, 0</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-08-10 03:03:55&lt;br&gt;&lt;b&gt;Comment:&lt;/b&gt; No location information is available for this saved place&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?q=39.171168784740516,-123.56393046677113"&gt;http://maps.google.com/?q=39.171168784740516,-123.56393046677113&lt;/a&gt;&lt;br&gt;</desc></wpt><wpt lat="0" lon="0"><name>0, 0</name><desc>&lt;b&gt;Date bookmarked:&lt;/b&gt; 2024-08-10 03:03:39&lt;br&gt;&lt;b&gt;Comment:&lt;/b&gt; No location information is available for this saved place&lt;br&gt;&lt;b&gt;Google Maps URL:&lt;/b&gt; &lt;a href="http://maps.google.com/?q=39.171040999999995,-123.56317399999998"&gt;http://maps.google.com/?q=39.171040999999995,-123.56317399999998&lt;/a&gt;&lt;br&gt;</desc></wpt></gpx>
\ No newline at end of file
diff --git a/tools/python/google_maps_bookmarks.py b/tools/python/google_maps_bookmarks.py
index ee9450d819..04a7755cf0 100755
--- a/tools/python/google_maps_bookmarks.py
+++ b/tools/python/google_maps_bookmarks.py
@@ -126,8 +126,26 @@ class GoogleMapsConverter:
         for feature in geojson['features']:
             geometry = feature['geometry']
             coordinates = geometry['coordinates']
-
             properties = feature['properties']
+            google_maps_url = properties.get('google_maps_url', '')
+
+            # Check for "null island" coordinates [0, 0]
+            if coordinates[0] == 0 and coordinates[1] == 0:
+                # Parse the Google Maps URL to get the coordinates
+                parsed_url = urllib.parse.urlparse(google_maps_url)
+                query_params = urllib.parse.parse_qs(parsed_url.query)
+                # q parameter contains the coordinates
+                q = query_params.get('q', [None])[0]
+                # cid parameter contains the place ID
+                cid = query_params.get('cid', [None])[0]
+                if q:
+                    coordinates = q.split(',')
+                elif cid:
+                    # TODO: handle google maps URL with cid parameter
+                    continue                    
+                else:
+                    continue
+
             location = properties.get('location', {})
             name = location.get('name') or location.get('address') or ', '.join(map(str, coordinates))
             description = ""
@@ -137,8 +155,8 @@ class GoogleMapsConverter:
                 description += f"<b>Date bookmarked:</b> {self.convert_timestamp(properties['date'])}<br>"
             if 'Comment' in properties:
                 description += f"<b>Comment:</b> {properties['Comment']}<br>"
-            if 'google_maps_url' in properties:
-                description += f"<b>Google Maps URL:</b> <a href=\"{properties['google_maps_url']}\">{properties['google_maps_url']}</a><br>"
+            if google_maps_url:
+                description += f"<b>Google Maps URL:</b> <a href=\"{google_maps_url}\">{google_maps_url}</a><br>"
 
             self.places.append({'name': name, 'description': description, 'coordinates': ','.join(map(str, coordinates))})