diff --git a/swimming_bathing.json b/swimming_bathing.json
index 76ce3e3de..c252dc0b7 100644
--- a/swimming_bathing.json
+++ b/swimming_bathing.json
@@ -71,7 +71,10 @@
         "{% if data.zoom <= map.zoom %}",
         "  <tr>",
         "    <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
-        "    <td>{{ keyTrans(value) }} {% if data.append %}({{ trans(data.append) }}){% endif %}</td>",
+        "    <td title=\"{% if data.taginfo %}{{ data.taginfo }}{% else %}{{ value }}{% endif %}\">",
+        "      {{ keyTrans(value) }}",
+        "      {% if data.append %}({{ trans(data.append) }}){% endif %}",
+        "    </td>",
         "  </tr>",
         "{% endif %}",
         "{% endfor %}",
@@ -93,11 +96,13 @@
         "leisure=sports_centre": {
           "zoom": 13,
           "append": "tag:sport=swimming",
+          "taginfo": "leisure=swimming_area, sport=swimming",
           "sign": "<img data-src='maki:basketball'>"
         },
         "natural=water": {
           "zoom": 13,
           "append": "tag:sport=swimming",
+          "taginfo": "natural=water, sport=swimming",
           "sign": "<img data-src='maki:swimming?fill=blue'>"
         },
         "natural=beach": {
@@ -106,6 +111,7 @@
         },
         "amenity=public_bath": {
           "zoom": 13,
+          "taginfo": "amenity=public_bath, bath:type=*",
           "sign": "<i class=\"fa fa-bath\" style='color: black' aria-hidden=\"true\"></i>"
         },
         "tourism=spa_resort": {
@@ -115,10 +121,12 @@
         "leisure=swimming_pool": {
           "zoom": 16,
           "append": "tag:access!=private",
+          "taginfo": "leisure=swimming_pool, access!=private",
           "sign": "<img data-src='maki:swimming?size=11'>"
         },
         "leisure=sauna": {
           "zoom": 16,
+          "taginfo": "leisure=sauna, sauna:type=*",
           "sign": "<i class=\"fa fa-thermometer-full\" aria-hidden=\"true\"></i>"
         }
     }