diff --git a/web/getting-started.cloud.mixed/src/main/webapp/WEB-INF/html/index.html b/web/getting-started.cloud.mixed/src/main/webapp/WEB-INF/html/index.html
index 0c6a897..4bd0719 100644
--- a/web/getting-started.cloud.mixed/src/main/webapp/WEB-INF/html/index.html
+++ b/web/getting-started.cloud.mixed/src/main/webapp/WEB-INF/html/index.html
@@ -152,8 +152,8 @@ <h3>Evidence Used</h3>
             if (isValidValue(areasWkt) && areasWkt !== EMPTY_POLYGON) {
                 document.getElementById('map-section').style.display = 'block';
                 var map = L.map('map');
-                L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', {
-                    attribution: '&copy; OpenStreetMap contributors &copy; CARTO',
+                L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+                    attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
                     subdomains: 'abcd',
                     maxZoom: 19
                 }).addTo(map);
@@ -183,8 +183,8 @@ <h3>Evidence Used</h3>
                 var lng = parseFloat(longitude);
                 if (!isNaN(lat) && !isNaN(lng)) {
                     var map = L.map('map').setView([lat, lng], 10);
-                    L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', {
-                        attribution: '&copy; OpenStreetMap contributors &copy; CARTO',
+                    L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+                        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
                         subdomains: 'abcd',
                         maxZoom: 19
                     }).addTo(map);
diff --git a/web/getting-started.cloud/src/main/webapp/WEB-INF/html/index.html b/web/getting-started.cloud/src/main/webapp/WEB-INF/html/index.html
index 05e1d42..07f0c58 100644
--- a/web/getting-started.cloud/src/main/webapp/WEB-INF/html/index.html
+++ b/web/getting-started.cloud/src/main/webapp/WEB-INF/html/index.html
@@ -115,7 +115,7 @@ <h3 id="map-title">Location Map</h3>
             var map = L.map('map');
             
             // Add CartoDB Positron tile layer - shows all place names in English
-            L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', {
+            L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
                 attribution: '© OpenStreetMap contributors © CARTO',
                 subdomains: 'abcd',
                 maxZoom: 19
@@ -166,7 +166,7 @@ <h3 id="map-title">Location Map</h3>
             if (!isNaN(lat) && !isNaN(lng)) {
                 var map = L.map('map').setView([lat, lng], 10);
                 
-                L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', {
+                L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
                     attribution: '© OpenStreetMap contributors © CARTO',
                     subdomains: 'abcd',
                     maxZoom: 19
diff --git a/web/getting-started.mixed/src/main/webapp/js/examples.min.js b/web/getting-started.mixed/src/main/webapp/js/examples.min.js
index db99294..4fbfed4 100644
--- a/web/getting-started.mixed/src/main/webapp/js/examples.min.js
+++ b/web/getting-started.mixed/src/main/webapp/js/examples.min.js
@@ -1 +1 @@
-(function(d){"use strict";var f={};f.bindDeviceCallback=function(e){if(e=e||{},!(typeof d.fod>"u"||!d.fod.complete)){var a=e.targetId||"content",r=e.fields||C;d.fod.complete(function(i){_(a,r(i))})}};function C(e){var a=e&&e.device||{},r=typeof a.hardwarename>"u"?"Unknown":[].concat(a.hardwarename).join(", ");return[["Hardware Name:",r],["Platform:",m(a.platformname,a.platformversion)],["Browser:",m(a.browsername,a.browserversion)],["Screen width (pixels):",a.screenpixelswidth],["Screen height (pixels):",a.screenpixelsheight],["Device Id:",a.deviceid]]}function m(e,a){return[e,a].filter(function(r){return r!=null&&r!==""}).join(" ")}function _(e,a){var r=document.getElementById(e);if(r){var i=document.createElement("table");i.className="c-eg-table";var t=document.createElement("tr");t.className="c-eg-table__row c-eg-table__head",o(t,"th","Key",!1),o(t,"th","Value",!1),i.appendChild(t),a.forEach(function(l){var n=document.createElement("tr");n.className="c-eg-table__row c-eg-table__row--used",o(n,"td",l[0],!0),o(n,"td",l[1],!1),i.appendChild(n)}),r.appendChild(i)}}function o(e,a,r,i){var t=document.createElement(a);t.className="c-eg-table__cell"+(i?" c-eg-table__cell--key":"");var l=document.createTextNode(r??"");if(i){var n=document.createElement("strong");n.appendChild(l),l=n}t.appendChild(l),e.appendChild(t)}f.initLocationMap=function(e){e=e||{};var a=d.L;if(a){var r=e.sectionId||"map-section",i=e.canvasId||"map",t=e.areasWkt||"",l=e.latitude,n=e.longitude,v=e.labels||{ipLocation:"IP Location",lat:"Lat",lng:"Lng"},h=e.tileUrl||"https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png",w={attribution:"\xA9 OpenStreetMap contributors \xA9 CARTO",subdomains:"abcd",maxZoom:19};if(c(t)&&t!=="POLYGON EMPTY"&&d.wellknown){u(r,!0);var s=a.map(i);a.tileLayer(h,w).addTo(s);try{var g=d.wellknown.parse(t);if(g){var E=a.geoJSON(g,{style:{color:"#CC2B27",weight:2,opacity:.8,fillColor:"#CC2B27",fillOpacity:.2}}).addTo(s);s.fitBounds(E.getBounds()),p(a,s,l,n,v)}}catch(k){console.error("Error parsing polygon:",k),u(r,!1)}}else if(c(l)&&c(n)){var b=parseFloat(l),N=parseFloat(n);if(!isNaN(b)&&!isNaN(N)){u(r,!0);var y=a.map(i).setView([b,N],10);a.tileLayer(h,w).addTo(y),p(a,y,l,n,v)}}}};function p(e,a,r,i,t){if(!(!c(r)||!c(i))){var l=parseFloat(r),n=parseFloat(i);isNaN(l)||isNaN(n)||e.marker([l,n]).addTo(a).bindPopup(t.ipLocation+"<br>"+t.lat+": "+l+"<br>"+t.lng+": "+n).openPopup()}}function u(e,a){var r=document.getElementById(e);r&&(r.style.display=a?"block":"none")}function c(e){return e&&String(e).indexOf("Unknown")===-1&&e!=="0"&&e!==""}d.fodExamples=f})(window);
+(function(d){"use strict";var f={};f.bindDeviceCallback=function(e){if(e=e||{},!(typeof d.fod>"u"||!d.fod.complete)){var a=e.targetId||"content",r=e.fields||C;d.fod.complete(function(i){_(a,r(i))})}};function C(e){var a=e&&e.device||{},r=typeof a.hardwarename>"u"?"Unknown":[].concat(a.hardwarename).join(", ");return[["Hardware Name:",r],["Platform:",m(a.platformname,a.platformversion)],["Browser:",m(a.browsername,a.browserversion)],["Screen width (pixels):",a.screenpixelswidth],["Screen height (pixels):",a.screenpixelsheight],["Device Id:",a.deviceid]]}function m(e,a){return[e,a].filter(function(r){return r!=null&&r!==""}).join(" ")}function _(e,a){var r=document.getElementById(e);if(r){var i=document.createElement("table");i.className="c-eg-table";var t=document.createElement("tr");t.className="c-eg-table__row c-eg-table__head",o(t,"th","Key",!1),o(t,"th","Value",!1),i.appendChild(t),a.forEach(function(l){var n=document.createElement("tr");n.className="c-eg-table__row c-eg-table__row--used",o(n,"td",l[0],!0),o(n,"td",l[1],!1),i.appendChild(n)}),r.appendChild(i)}}function o(e,a,r,i){var t=document.createElement(a);t.className="c-eg-table__cell"+(i?" c-eg-table__cell--key":"");var l=document.createTextNode(r??"");if(i){var n=document.createElement("strong");n.appendChild(l),l=n}t.appendChild(l),e.appendChild(t)}f.initLocationMap=function(e){e=e||{};var a=d.L;if(a){var r=e.sectionId||"map-section",i=e.canvasId||"map",t=e.areasWkt||"",l=e.latitude,n=e.longitude,v=e.labels||{ipLocation:"IP Location",lat:"Lat",lng:"Lng"},h=e.tileUrl||"https://tile.openstreetmap.org/{z}/{x}/{y}.png",w={attribution:"&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors",subdomains:"abcd",maxZoom:19};if(c(t)&&t!=="POLYGON EMPTY"&&d.wellknown){u(r,!0);var s=a.map(i);a.tileLayer(h,w).addTo(s);try{var g=d.wellknown.parse(t);if(g){var E=a.geoJSON(g,{style:{color:"#CC2B27",weight:2,opacity:.8,fillColor:"#CC2B27",fillOpacity:.2}}).addTo(s);s.fitBounds(E.getBounds()),p(a,s,l,n,v)}}catch(k){console.error("Error parsing polygon:",k),u(r,!1)}}else if(c(l)&&c(n)){var b=parseFloat(l),N=parseFloat(n);if(!isNaN(b)&&!isNaN(N)){u(r,!0);var y=a.map(i).setView([b,N],10);a.tileLayer(h,w).addTo(y),p(a,y,l,n,v)}}}};function p(e,a,r,i,t){if(!(!c(r)||!c(i))){var l=parseFloat(r),n=parseFloat(i);isNaN(l)||isNaN(n)||e.marker([l,n]).addTo(a).bindPopup(t.ipLocation+"<br>"+t.lat+": "+l+"<br>"+t.lng+": "+n).openPopup()}}function u(e,a){var r=document.getElementById(e);r&&(r.style.display=a?"block":"none")}function c(e){return e&&String(e).indexOf("Unknown")===-1&&e!=="0"&&e!==""}d.fodExamples=f})(window);
diff --git a/web/getting-started.onprem/src/main/webapp/js/examples.min.js b/web/getting-started.onprem/src/main/webapp/js/examples.min.js
index db99294..4fbfed4 100644
--- a/web/getting-started.onprem/src/main/webapp/js/examples.min.js
+++ b/web/getting-started.onprem/src/main/webapp/js/examples.min.js
@@ -1 +1 @@
-(function(d){"use strict";var f={};f.bindDeviceCallback=function(e){if(e=e||{},!(typeof d.fod>"u"||!d.fod.complete)){var a=e.targetId||"content",r=e.fields||C;d.fod.complete(function(i){_(a,r(i))})}};function C(e){var a=e&&e.device||{},r=typeof a.hardwarename>"u"?"Unknown":[].concat(a.hardwarename).join(", ");return[["Hardware Name:",r],["Platform:",m(a.platformname,a.platformversion)],["Browser:",m(a.browsername,a.browserversion)],["Screen width (pixels):",a.screenpixelswidth],["Screen height (pixels):",a.screenpixelsheight],["Device Id:",a.deviceid]]}function m(e,a){return[e,a].filter(function(r){return r!=null&&r!==""}).join(" ")}function _(e,a){var r=document.getElementById(e);if(r){var i=document.createElement("table");i.className="c-eg-table";var t=document.createElement("tr");t.className="c-eg-table__row c-eg-table__head",o(t,"th","Key",!1),o(t,"th","Value",!1),i.appendChild(t),a.forEach(function(l){var n=document.createElement("tr");n.className="c-eg-table__row c-eg-table__row--used",o(n,"td",l[0],!0),o(n,"td",l[1],!1),i.appendChild(n)}),r.appendChild(i)}}function o(e,a,r,i){var t=document.createElement(a);t.className="c-eg-table__cell"+(i?" c-eg-table__cell--key":"");var l=document.createTextNode(r??"");if(i){var n=document.createElement("strong");n.appendChild(l),l=n}t.appendChild(l),e.appendChild(t)}f.initLocationMap=function(e){e=e||{};var a=d.L;if(a){var r=e.sectionId||"map-section",i=e.canvasId||"map",t=e.areasWkt||"",l=e.latitude,n=e.longitude,v=e.labels||{ipLocation:"IP Location",lat:"Lat",lng:"Lng"},h=e.tileUrl||"https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png",w={attribution:"\xA9 OpenStreetMap contributors \xA9 CARTO",subdomains:"abcd",maxZoom:19};if(c(t)&&t!=="POLYGON EMPTY"&&d.wellknown){u(r,!0);var s=a.map(i);a.tileLayer(h,w).addTo(s);try{var g=d.wellknown.parse(t);if(g){var E=a.geoJSON(g,{style:{color:"#CC2B27",weight:2,opacity:.8,fillColor:"#CC2B27",fillOpacity:.2}}).addTo(s);s.fitBounds(E.getBounds()),p(a,s,l,n,v)}}catch(k){console.error("Error parsing polygon:",k),u(r,!1)}}else if(c(l)&&c(n)){var b=parseFloat(l),N=parseFloat(n);if(!isNaN(b)&&!isNaN(N)){u(r,!0);var y=a.map(i).setView([b,N],10);a.tileLayer(h,w).addTo(y),p(a,y,l,n,v)}}}};function p(e,a,r,i,t){if(!(!c(r)||!c(i))){var l=parseFloat(r),n=parseFloat(i);isNaN(l)||isNaN(n)||e.marker([l,n]).addTo(a).bindPopup(t.ipLocation+"<br>"+t.lat+": "+l+"<br>"+t.lng+": "+n).openPopup()}}function u(e,a){var r=document.getElementById(e);r&&(r.style.display=a?"block":"none")}function c(e){return e&&String(e).indexOf("Unknown")===-1&&e!=="0"&&e!==""}d.fodExamples=f})(window);
+(function(d){"use strict";var f={};f.bindDeviceCallback=function(e){if(e=e||{},!(typeof d.fod>"u"||!d.fod.complete)){var a=e.targetId||"content",r=e.fields||C;d.fod.complete(function(i){_(a,r(i))})}};function C(e){var a=e&&e.device||{},r=typeof a.hardwarename>"u"?"Unknown":[].concat(a.hardwarename).join(", ");return[["Hardware Name:",r],["Platform:",m(a.platformname,a.platformversion)],["Browser:",m(a.browsername,a.browserversion)],["Screen width (pixels):",a.screenpixelswidth],["Screen height (pixels):",a.screenpixelsheight],["Device Id:",a.deviceid]]}function m(e,a){return[e,a].filter(function(r){return r!=null&&r!==""}).join(" ")}function _(e,a){var r=document.getElementById(e);if(r){var i=document.createElement("table");i.className="c-eg-table";var t=document.createElement("tr");t.className="c-eg-table__row c-eg-table__head",o(t,"th","Key",!1),o(t,"th","Value",!1),i.appendChild(t),a.forEach(function(l){var n=document.createElement("tr");n.className="c-eg-table__row c-eg-table__row--used",o(n,"td",l[0],!0),o(n,"td",l[1],!1),i.appendChild(n)}),r.appendChild(i)}}function o(e,a,r,i){var t=document.createElement(a);t.className="c-eg-table__cell"+(i?" c-eg-table__cell--key":"");var l=document.createTextNode(r??"");if(i){var n=document.createElement("strong");n.appendChild(l),l=n}t.appendChild(l),e.appendChild(t)}f.initLocationMap=function(e){e=e||{};var a=d.L;if(a){var r=e.sectionId||"map-section",i=e.canvasId||"map",t=e.areasWkt||"",l=e.latitude,n=e.longitude,v=e.labels||{ipLocation:"IP Location",lat:"Lat",lng:"Lng"},h=e.tileUrl||"https://tile.openstreetmap.org/{z}/{x}/{y}.png",w={attribution:"&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors",subdomains:"abcd",maxZoom:19};if(c(t)&&t!=="POLYGON EMPTY"&&d.wellknown){u(r,!0);var s=a.map(i);a.tileLayer(h,w).addTo(s);try{var g=d.wellknown.parse(t);if(g){var E=a.geoJSON(g,{style:{color:"#CC2B27",weight:2,opacity:.8,fillColor:"#CC2B27",fillOpacity:.2}}).addTo(s);s.fitBounds(E.getBounds()),p(a,s,l,n,v)}}catch(k){console.error("Error parsing polygon:",k),u(r,!1)}}else if(c(l)&&c(n)){var b=parseFloat(l),N=parseFloat(n);if(!isNaN(b)&&!isNaN(N)){u(r,!0);var y=a.map(i).setView([b,N],10);a.tileLayer(h,w).addTo(y),p(a,y,l,n,v)}}}};function p(e,a,r,i,t){if(!(!c(r)||!c(i))){var l=parseFloat(r),n=parseFloat(i);isNaN(l)||isNaN(n)||e.marker([l,n]).addTo(a).bindPopup(t.ipLocation+"<br>"+t.lat+": "+l+"<br>"+t.lng+": "+n).openPopup()}}function u(e,a){var r=document.getElementById(e);r&&(r.style.display=a?"block":"none")}function c(e){return e&&String(e).indexOf("Unknown")===-1&&e!=="0"&&e!==""}d.fodExamples=f})(window);