diff --git a/allstarr/wwwroot/index.html b/allstarr/wwwroot/index.html
index 24f9a90..70c6f14 100644
--- a/allstarr/wwwroot/index.html
+++ b/allstarr/wwwroot/index.html
@@ -1583,7 +1583,12 @@
                     } else if (t.isLocal === false) {
                         statusBadge = '<span class="status-badge warning" style="font-size:0.75rem;padding:2px 8px;margin-left:8px;"><span class="status-dot"></span>External</span>';
                         // Add manual map button for external tracks
-                        mapButton = `<button class="small" onclick="openManualMap('${escapeHtml(name)}', ${t.position}, '${escapeHtml(t.title)}', '${escapeHtml(t.artists[0])}', '${t.spotifyId}')" style="margin-left:8px;font-size:0.75rem;padding:4px 8px;">Map to Local</button>`;
+                        // Use JSON.stringify to properly escape strings for JavaScript
+                        const escapedName = JSON.stringify(name);
+                        const escapedTitle = JSON.stringify(t.title);
+                        const escapedArtist = JSON.stringify(t.artists[0] || '');
+                        const escapedSpotifyId = JSON.stringify(t.spotifyId);
+                        mapButton = `<button class="small" onclick="openManualMap(${escapedName}, ${t.position}, ${escapedTitle}, ${escapedArtist}, ${escapedSpotifyId})" style="margin-left:8px;font-size:0.75rem;padding:4px 8px;">Map to Local</button>`;
                     }
                     
                     return `