diff --git a/packages/api/src/utility/getMapExport.js b/packages/api/src/utility/getMapExport.js
index a4f7608c9..194354be4 100644
--- a/packages/api/src/utility/getMapExport.js
+++ b/packages/api/src/utility/getMapExport.js
@@ -18,7 +18,7 @@ const getMapExport = (geoJson) => {
     leaflet
       .tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
         maxZoom: 19,
-        attribution: '© OpenStreetMap',
+        attribution: '<a href="https://dbgate.org" title="Exported from DbGate">DbGate</a> | © OpenStreetMap',
       })
       .addTo(map);
       
@@ -47,6 +47,7 @@ const getMapExport = (geoJson) => {
           // does this feature have a property named popupContent?
           if (feature.properties && feature.properties.popupContent) {
             layer.bindPopup(feature.properties.popupContent);
+            layer.bindTooltip(feature.properties.popupContent);
           }
         },
       })
diff --git a/packages/web/src/elements/MapView.svelte b/packages/web/src/elements/MapView.svelte
index 2a45e8ef6..80161f05e 100644
--- a/packages/web/src/elements/MapView.svelte
+++ b/packages/web/src/elements/MapView.svelte
@@ -123,6 +123,7 @@
           // does this feature have a property named popupContent?
           if (feature.properties && feature.properties.popupContent) {
             layer.bindPopup(feature.properties.popupContent);
+            layer.bindTooltip(feature.properties.popupContent);
           }
         },
       })