diff --git a/data/taginfo.json b/data/taginfo.json
index 8a9b9cf5b..5e8f15561 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1,7 +1,7 @@
 {
     "data_format": 1,
     "data_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/taginfo.json",
-    "data_updated": "20251020T140841Z",
+    "data_updated": "20251110T190102Z",
     "project": {
         "name": "CoMaps",
         "description": "CoMaps is a community-focused privacy navigation iOS & Android app for travelers - drivers, hikers, and cyclists.",
@@ -94,6 +94,18 @@
             "value": "bench",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bench.svg"
         },
+        {
+            "description": "amenity=bench + backrest=no",
+            "key": "amenity",
+            "value": "bench",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bench_backless.svg"
+        },
+        {
+            "description": "amenity=bench + backrest=no",
+            "key": "backrest",
+            "value": "no",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bench_backless.svg"
+        },
         {
             "description": "amenity=bicycle_parking",
             "key": "amenity",
@@ -130,6 +142,12 @@
             "value": "biergarten",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pub-m.svg"
         },
+        {
+            "description": "amenity=boat_rental",
+            "key": "amenity",
+            "value": "boat_rental",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/boat-rental.svg"
+        },
         {
             "description": "amenity=brothel",
             "key": "amenity",
@@ -154,6 +172,12 @@
             "value": "cafe",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/cafe-m.svg"
         },
+        {
+            "description": "amenity=car_pooling",
+            "key": "amenity",
+            "value": "car_pooling",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/parking-pooling-m.svg"
+        },
         {
             "description": "amenity=car_rental",
             "key": "amenity",
@@ -182,17 +206,67 @@
             "description": "amenity=charging_station",
             "key": "amenity",
             "value": "charging_station",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-station-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg"
         },
         {
             "description": "amenity=charging_station + motorcar?=*",
             "key": "amenity",
             "value": "charging_station",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-station-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg"
         },
         {
             "description": "amenity=charging_station + motorcar?=*",
             "key": "motorcar?",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg"
+        },
+        {
+            "description": "amenity=charging_station + motorcar?=* + capacity=1",
+            "key": "amenity",
+            "value": "charging_station",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg"
+        },
+        {
+            "description": "amenity=charging_station + motorcar?=* + capacity=1",
+            "key": "capacity",
+            "value": "1",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg"
+        },
+        {
+            "description": "amenity=charging_station + motorcar?=* + capacity=1",
+            "key": "motorcar?",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg"
+        },
+        {
+            "description": "amenity=charging_station + motorcar?=* + capacity=2",
+            "key": "amenity",
+            "value": "charging_station",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg"
+        },
+        {
+            "description": "amenity=charging_station + motorcar?=* + capacity=2",
+            "key": "capacity",
+            "value": "2",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg"
+        },
+        {
+            "description": "amenity=charging_station + motorcar?=* + capacity=2",
+            "key": "motorcar?",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-point-m.svg"
+        },
+        {
+            "description": "amenity=charging_station + motorcar?=* + capacity?=*",
+            "key": "amenity",
+            "value": "charging_station",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-station-m.svg"
+        },
+        {
+            "description": "amenity=charging_station + motorcar?=* + capacity?=*",
+            "key": "capacity?",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-station-m.svg"
+        },
+        {
+            "description": "amenity=charging_station + motorcar?=* + capacity?=*",
+            "key": "motorcar?",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/charging-station-m.svg"
         },
         {
@@ -259,7 +333,7 @@
             "description": "amenity=dojo",
             "key": "amenity",
             "value": "dojo",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/martial-arts-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/martial-arts-centre-m.svg"
         },
         {
             "description": "amenity=drinking_water",
@@ -277,7 +351,7 @@
             "description": "amenity=events_venue",
             "key": "amenity",
             "value": "events_venue",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/community-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/events_venue-m.svg"
         },
         {
             "description": "amenity=exhibition_centre",
@@ -309,6 +383,12 @@
             "value": "food_court",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/restaurant-m.svg"
         },
+        {
+            "description": "amenity=food_sharing",
+            "key": "amenity",
+            "value": "food_sharing",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/food_sharing-m.svg"
+        },
         {
             "description": "amenity=fountain",
             "key": "amenity",
@@ -327,6 +407,12 @@
             "value": "gambling",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/gambling-m.svg"
         },
+        {
+            "description": "amenity=give_box",
+            "key": "amenity",
+            "value": "give_box",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/give_box-m.svg"
+        },
         {
             "description": "amenity=hospital",
             "key": "amenity",
@@ -369,6 +455,12 @@
             "value": "library",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/library-m.svg"
         },
+        {
+            "description": "amenity=lounger",
+            "key": "amenity",
+            "value": "lounger",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/lounger-m.svg"
+        },
         {
             "description": "amenity=love_hotel",
             "key": "amenity",
@@ -387,6 +479,12 @@
             "value": "marketplace",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/marketplace-m.svg"
         },
+        {
+            "description": "amenity=mobile_money_agent",
+            "key": "amenity",
+            "value": "mobile_money_agent",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/banknote-m.svg"
+        },
         {
             "description": "amenity=money_transfer",
             "key": "amenity",
@@ -641,6 +739,12 @@
             "value": "disabled",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/parking-disabled-m.svg"
         },
+        {
+            "description": "amenity=payment_centre",
+            "key": "amenity",
+            "value": "payment_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/banknote-m.svg"
+        },
         {
             "description": "amenity=payment_terminal",
             "key": "amenity",
@@ -833,6 +937,18 @@
             "value": "recycling",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/recycling-m.svg"
         },
+        {
+            "description": "amenity=recycling + recycling_type=centre",
+            "key": "amenity",
+            "value": "recycling",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/recycling-centre-m.svg"
+        },
+        {
+            "description": "amenity=recycling + recycling_type=centre",
+            "key": "recycling_type",
+            "value": "centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/recycling-centre-m.svg"
+        },
         {
             "description": "amenity=restaurant",
             "key": "amenity",
@@ -899,6 +1015,11 @@
             "value": "shower",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/shower-m.svg"
         },
+        {
+            "description": "amenity=slipway",
+            "key": "amenity",
+            "value": "slipway"
+        },
         {
             "description": "amenity=social_facility",
             "key": "amenity",
@@ -945,7 +1066,7 @@
             "description": "amenity=townhall",
             "key": "amenity",
             "value": "townhall",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/embassy-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/public-building-m.svg"
         },
         {
             "description": "amenity=university",
@@ -1230,6 +1351,12 @@
             "value": "guardhouse",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/security-m.svg"
         },
+        {
+            "description": "building=train_station",
+            "key": "building",
+            "value": "train_station",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/train_building-m.svg"
+        },
         {
             "description": "craft=*",
             "key": "craft",
@@ -1367,6 +1494,11 @@
             "value": "winery",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/winery-m.svg"
         },
+        {
+            "description": "disused:shop=*",
+            "key": "disused:shop",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/disusedbusiness-m.svg"
+        },
         {
             "description": "emergency=assembly_point",
             "key": "emergency",
@@ -1403,10 +1535,6 @@
             "value": "phone",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/emergency-phone-m.svg"
         },
-        {
-            "description": "healthcare=*",
-            "key": "healthcare"
-        },
         {
             "description": "healthcare=alternative",
             "key": "healthcare",
@@ -1550,6 +1678,90 @@
             "value": "castle",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
         },
+        {
+            "description": "historic=castle + castle_type=castrum",
+            "key": "castle_type",
+            "value": "castrum",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg"
+        },
+        {
+            "description": "historic=castle + castle_type=castrum",
+            "key": "historic",
+            "value": "castle",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg"
+        },
+        {
+            "description": "historic=castle + castle_type=defensive",
+            "key": "castle_type",
+            "value": "defensive",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg"
+        },
+        {
+            "description": "historic=castle + castle_type=defensive",
+            "key": "historic",
+            "value": "castle",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg"
+        },
+        {
+            "description": "historic=castle + castle_type=fortified_church",
+            "key": "castle_type",
+            "value": "fortified_church",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg"
+        },
+        {
+            "description": "historic=castle + castle_type=fortified_church",
+            "key": "historic",
+            "value": "castle",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg"
+        },
+        {
+            "description": "historic=castle + castle_type=fortress",
+            "key": "castle_type",
+            "value": "fortress",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg"
+        },
+        {
+            "description": "historic=castle + castle_type=fortress",
+            "key": "historic",
+            "value": "castle",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg"
+        },
+        {
+            "description": "historic=castle + castle_type=hillfort",
+            "key": "castle_type",
+            "value": "hillfort",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg"
+        },
+        {
+            "description": "historic=castle + castle_type=hillfort",
+            "key": "historic",
+            "value": "castle",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg"
+        },
+        {
+            "description": "historic=castle + castle_type=kremlin",
+            "key": "castle_type",
+            "value": "kremlin",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg"
+        },
+        {
+            "description": "historic=castle + castle_type=kremlin",
+            "key": "historic",
+            "value": "castle",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg"
+        },
+        {
+            "description": "historic=castle + castle_type=shiro",
+            "key": "castle_type",
+            "value": "shiro",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg"
+        },
+        {
+            "description": "historic=castle + castle_type=shiro",
+            "key": "historic",
+            "value": "castle",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg"
+        },
         {
             "description": "historic=city_gate",
             "key": "historic",
@@ -1565,7 +1777,7 @@
             "description": "historic=fort",
             "key": "historic",
             "value": "fort",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/castle-m.svg"
         },
         {
             "description": "historic=gallows",
@@ -1645,6 +1857,90 @@
             "value": "ruins",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
         },
+        {
+            "description": "historic=ruins + castle_type=castrum",
+            "key": "castle_type",
+            "value": "castrum",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
+        },
+        {
+            "description": "historic=ruins + castle_type=castrum",
+            "key": "historic",
+            "value": "ruins",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
+        },
+        {
+            "description": "historic=ruins + castle_type=defensive",
+            "key": "castle_type",
+            "value": "defensive",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
+        },
+        {
+            "description": "historic=ruins + castle_type=defensive",
+            "key": "historic",
+            "value": "ruins",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
+        },
+        {
+            "description": "historic=ruins + castle_type=fortified_church",
+            "key": "castle_type",
+            "value": "fortified_church",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
+        },
+        {
+            "description": "historic=ruins + castle_type=fortified_church",
+            "key": "historic",
+            "value": "ruins",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
+        },
+        {
+            "description": "historic=ruins + castle_type=fortress",
+            "key": "castle_type",
+            "value": "fortress",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
+        },
+        {
+            "description": "historic=ruins + castle_type=fortress",
+            "key": "historic",
+            "value": "ruins",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
+        },
+        {
+            "description": "historic=ruins + castle_type=hillfort",
+            "key": "castle_type",
+            "value": "hillfort",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
+        },
+        {
+            "description": "historic=ruins + castle_type=hillfort",
+            "key": "historic",
+            "value": "ruins",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
+        },
+        {
+            "description": "historic=ruins + castle_type=kremlin",
+            "key": "castle_type",
+            "value": "kremlin",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
+        },
+        {
+            "description": "historic=ruins + castle_type=kremlin",
+            "key": "historic",
+            "value": "ruins",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
+        },
+        {
+            "description": "historic=ruins + castle_type=shiro",
+            "key": "castle_type",
+            "value": "shiro",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
+        },
+        {
+            "description": "historic=ruins + castle_type=shiro",
+            "key": "historic",
+            "value": "ruins",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/remains-m.svg"
+        },
         {
             "description": "historic=ruins + name=*",
             "key": "historic",
@@ -1766,6 +2062,12 @@
             "value": "amusement_arcade",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/arcade-m.svg"
         },
+        {
+            "description": "leisure=bandstand",
+            "key": "leisure",
+            "value": "bandstand",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bandstand-m.svg"
+        },
         {
             "description": "leisure=beach_resort",
             "key": "leisure",
@@ -1808,11 +2110,23 @@
             "value": "fitness_centre",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/fitness_centre-m.svg"
         },
+        {
+            "description": "leisure=fitness_centre + sport=yoga",
+            "key": "leisure",
+            "value": "fitness_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/yoga-centre-m.svg"
+        },
+        {
+            "description": "leisure=fitness_centre + sport=yoga",
+            "key": "sport",
+            "value": "yoga",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/yoga-centre-m.svg"
+        },
         {
             "description": "leisure=fitness_station",
             "key": "leisure",
             "value": "fitness_station",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/fitness_station-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/fitness-m.svg"
         },
         {
             "description": "leisure=golf_course",
@@ -1832,6 +2146,12 @@
             "value": "ice_rink",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pitch-m.svg"
         },
+        {
+            "description": "leisure=indoor_play",
+            "key": "leisure",
+            "value": "indoor_play",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/indoor_play-m.svg"
+        },
         {
             "description": "leisure=marina",
             "key": "leisure",
@@ -1842,7 +2162,7 @@
             "description": "leisure=miniature_golf",
             "key": "leisure",
             "value": "miniature_golf",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/golf-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/golf-centre-m.svg"
         },
         {
             "description": "leisure=nature_reserve",
@@ -1884,7 +2204,13 @@
             "description": "leisure=sauna",
             "key": "leisure",
             "value": "sauna",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/public_bath-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sauna-m.svg"
+        },
+        {
+            "description": "leisure=slipway",
+            "key": "leisure",
+            "value": "slipway",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/slipway-m.svg"
         },
         {
             "description": "leisure=sports_centre",
@@ -1892,6 +2218,390 @@
             "value": "sports_centre",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg"
         },
+        {
+            "description": "leisure=sports_centre + sport=american_football",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/america-football-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=american_football",
+            "key": "sport",
+            "value": "american_football",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/america-football-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=archery",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/archery-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=archery",
+            "key": "sport",
+            "value": "archery",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/archery-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=athletics",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=athletics",
+            "key": "sport",
+            "value": "athletics",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=australian_football",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/australian-football-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=australian_football",
+            "key": "sport",
+            "value": "australian_football",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/australian-football-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=badminton",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/badminton-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=badminton",
+            "key": "sport",
+            "value": "badminton",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/badminton-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=baseball",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/baseball-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=baseball",
+            "key": "sport",
+            "value": "baseball",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/baseball-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=basketball",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/basketball-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=basketball",
+            "key": "sport",
+            "value": "basketball",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/basketball-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=beachvolleyball",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/volleyball-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=beachvolleyball",
+            "key": "sport",
+            "value": "beachvolleyball",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/volleyball-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=bowls",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=bowls",
+            "key": "sport",
+            "value": "bowls",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=climbing",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/climbing-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=climbing",
+            "key": "sport",
+            "value": "climbing",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/climbing-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=cricket",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/cricket-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=cricket",
+            "key": "sport",
+            "value": "cricket",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/cricket-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=curling",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/curling-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=curling",
+            "key": "sport",
+            "value": "curling",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/curling-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=equestrian",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/equestrian-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=equestrian",
+            "key": "sport",
+            "value": "equestrian",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/equestrian-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=field_hockey",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/hockey-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=field_hockey",
+            "key": "sport",
+            "value": "field_hockey",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/hockey-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=futsal",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/soccer-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=futsal",
+            "key": "sport",
+            "value": "futsal",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/soccer-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=golf",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/golf-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=golf",
+            "key": "sport",
+            "value": "golf",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/golf-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=gymnastics",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=gymnastics",
+            "key": "sport",
+            "value": "gymnastics",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=handball",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/handball-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=handball",
+            "key": "sport",
+            "value": "handball",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/handball-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=ice_hockey",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/hockey-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=ice_hockey",
+            "key": "sport",
+            "value": "ice_hockey",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/hockey-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=multi",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=multi",
+            "key": "sport",
+            "value": "multi",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/sports_centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=padel",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/padel-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=padel",
+            "key": "sport",
+            "value": "padel",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/padel-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=pelota",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pelota-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=pelota",
+            "key": "sport",
+            "value": "pelota",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pelota-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=scuba_diving",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/diving-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=scuba_diving",
+            "key": "sport",
+            "value": "scuba_diving",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/diving-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=shooting",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/archery-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=shooting",
+            "key": "sport",
+            "value": "shooting",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/archery-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=skateboard",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/skateboard-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=skateboard",
+            "key": "sport",
+            "value": "skateboard",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/skateboard-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=skiing",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/skiing-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=skiing",
+            "key": "sport",
+            "value": "skiing",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/skiing-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=soccer",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/soccer-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=soccer",
+            "key": "sport",
+            "value": "soccer",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/soccer-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=swimming",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/swimming-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=swimming",
+            "key": "sport",
+            "value": "swimming",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/swimming-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=table_tennis",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/table-tennis-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=table_tennis",
+            "key": "sport",
+            "value": "table_tennis",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/table-tennis-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=tennis",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/tennis-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=tennis",
+            "key": "sport",
+            "value": "tennis",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/tennis-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=volleyball",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/volleyball-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=volleyball",
+            "key": "sport",
+            "value": "volleyball",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/volleyball-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=yoga",
+            "key": "leisure",
+            "value": "sports_centre",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/yoga-centre-m.svg"
+        },
+        {
+            "description": "leisure=sports_centre + sport=yoga",
+            "key": "sport",
+            "value": "yoga",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/yoga-centre-m.svg"
+        },
         {
             "description": "leisure=sports_hall",
             "key": "leisure",
@@ -1924,7 +2634,7 @@
             "description": "leisure=water_park",
             "key": "leisure",
             "value": "water_park",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/swimming-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/swimming-centre-m.svg"
         },
         {
             "description": "man_made=cairn",
@@ -1980,6 +2690,12 @@
             "value": "mast",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/dot-m.svg"
         },
+        {
+            "description": "man_made=observatory",
+            "key": "man_made",
+            "value": "observatory",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/observatory-m.svg"
+        },
         {
             "description": "man_made=petroleum_well",
             "key": "man_made",
@@ -2004,6 +2720,48 @@
             "value": "survey_point",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/survey_point-m.svg"
         },
+        {
+            "description": "man_made=telescope",
+            "key": "man_made",
+            "value": "telescope",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/telescope-m.svg"
+        },
+        {
+            "description": "man_made=telescope + telescope:type=gamma",
+            "key": "man_made",
+            "value": "telescope",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/telescope-gamma-m.svg"
+        },
+        {
+            "description": "man_made=telescope + telescope:type=gamma",
+            "key": "telescope:type",
+            "value": "gamma",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/telescope-gamma-m.svg"
+        },
+        {
+            "description": "man_made=telescope + telescope:type=optical",
+            "key": "man_made",
+            "value": "telescope",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/telescope-optical-m.svg"
+        },
+        {
+            "description": "man_made=telescope + telescope:type=optical",
+            "key": "telescope:type",
+            "value": "optical",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/telescope-optical-m.svg"
+        },
+        {
+            "description": "man_made=telescope + telescope:type=radio",
+            "key": "man_made",
+            "value": "telescope",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/telescope-radio-m.svg"
+        },
+        {
+            "description": "man_made=telescope + telescope:type=radio",
+            "key": "telescope:type",
+            "value": "radio",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/telescope-radio-m.svg"
+        },
         {
             "description": "man_made=tower",
             "key": "man_made",
@@ -2281,6 +3039,18 @@
             "value": "funicular",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/funicular-m.svg"
         },
+        {
+            "description": "railway=station + station=light_rail",
+            "key": "railway",
+            "value": "station",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/train_light-m.svg"
+        },
+        {
+            "description": "railway=station + station=light_rail",
+            "key": "station",
+            "value": "light_rail",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/train_light-m.svg"
+        },
         {
             "description": "railway=tram_stop",
             "key": "railway",
@@ -2292,6 +3062,12 @@
             "key": "shop",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/shop-m.svg"
         },
+        {
+            "description": "shop=agrarian",
+            "key": "shop",
+            "value": "agrarian",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/shop-industry-m.svg"
+        },
         {
             "description": "shop=alcohol",
             "key": "shop",
@@ -2490,11 +3266,6 @@
             "value": "dry_cleaning",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/dry_cleaning-m.svg"
         },
-        {
-            "description": "shop=electrical",
-            "key": "shop",
-            "value": "electrical"
-        },
         {
             "description": "shop=electronics",
             "key": "shop",
@@ -2543,6 +3314,12 @@
             "value": "garden_centre",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/garden_center-m.svg"
         },
+        {
+            "description": "shop=gas",
+            "key": "shop",
+            "value": "gas",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/shop-industry-m.svg"
+        },
         {
             "description": "shop=gift",
             "key": "shop",
@@ -2643,7 +3420,7 @@
             "description": "shop=massage",
             "key": "shop",
             "value": "massage",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/public_bath-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/massage_salon-m.svg"
         },
         {
             "description": "shop=mobile_phone",
@@ -2715,7 +3492,7 @@
             "description": "shop=pawnbroker",
             "key": "shop",
             "value": "pawnbroker",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/bookmaker-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/shop-m.svg"
         },
         {
             "description": "shop=pet",
@@ -2795,6 +3572,12 @@
             "value": "tattoo",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/craft-m.svg"
         },
+        {
+            "description": "shop=telecommunication",
+            "key": "shop",
+            "value": "telecommunication",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/mobile_phone-m.svg"
+        },
         {
             "description": "shop=ticket",
             "key": "shop",
@@ -2813,6 +3596,12 @@
             "value": "toys",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/toys-m.svg"
         },
+        {
+            "description": "shop=trade",
+            "key": "shop",
+            "value": "trade",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/shop-industry-m.svg"
+        },
         {
             "description": "shop=tyres",
             "key": "shop",
@@ -2849,6 +3638,18 @@
             "value": "wine",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/alcohol-m.svg"
         },
+        {
+            "description": "social_facility=food_bank",
+            "key": "social_facility",
+            "value": "food_bank",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/food_bank-m.svg"
+        },
+        {
+            "description": "social_facility=soup_kitchen",
+            "key": "social_facility",
+            "value": "soup_kitchen",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/soup_kitchen-m.svg"
+        },
         {
             "description": "sport=*",
             "key": "sport",
@@ -2878,6 +3679,12 @@
             "value": "archery",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/archery-m.svg"
         },
+        {
+            "description": "sport=athletics",
+            "key": "sport",
+            "value": "athletics",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pitch-m.svg"
+        },
         {
             "description": "sport=australian_football",
             "key": "sport",
@@ -2908,6 +3715,12 @@
             "value": "beachvolleyball",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/volleyball-m.svg"
         },
+        {
+            "description": "sport=bowls",
+            "key": "sport",
+            "value": "bowls",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pitch-m.svg"
+        },
         {
             "description": "sport=chess",
             "key": "sport",
@@ -2956,6 +3769,12 @@
             "value": "golf",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/golf-m.svg"
         },
+        {
+            "description": "sport=gymnastics",
+            "key": "sport",
+            "value": "gymnastics",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pitch-m.svg"
+        },
         {
             "description": "sport=handball",
             "key": "sport",
@@ -2968,6 +3787,12 @@
             "value": "ice_hockey",
             "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/hockey-m.svg"
         },
+        {
+            "description": "sport=multi",
+            "key": "sport",
+            "value": "multi",
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/pitch-m.svg"
+        },
         {
             "description": "sport=padel",
             "key": "sport",
@@ -3114,7 +3939,7 @@
             "description": "tourism=guest_house",
             "key": "tourism",
             "value": "guest_house",
-            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/apartment-m.svg"
+            "icon_url": "https://codeberg.org/comaps/comaps/raw/branch/main/data/styles/default/light/symbols/guest_house-m.svg"
         },
         {
             "description": "tourism=hostel",