diff --git a/templates/partials/projects/location_list.html b/templates/partials/projects/location_list.html
index f274373..f9279c2 100644
--- a/templates/partials/projects/location_list.html
+++ b/templates/partials/projects/location_list.html
@@ -53,7 +53,9 @@
                                 class="text-xs px-3 py-1 rounded-full bg-gray-100 text-gray-700 dark:bg-gray-800 dark:text-gray-300">
                             Edit
                         </button>
-                        <button onclick="openRemoveLocationModal('{{ item.location.id }}', {{ item.location.name | tojson }})"
+                        <button data-loc-id="{{ item.location.id }}"
+                                data-loc-name="{{ item.location.name | e }}"
+                                onclick="openRemoveLocationModal(this.dataset.locId, this.dataset.locName)"
                                 class="text-xs px-3 py-1 rounded-full bg-amber-50 text-amber-700 dark:bg-amber-900/20 dark:text-amber-300 hover:bg-amber-100"
                                 title="Mark as no longer actively monitored — preserves historical events">
                             Remove
@@ -122,7 +124,9 @@
                         </div>
 
                         <div class="flex items-center gap-2">
-                            <button onclick="restoreLocation('{{ item.location.id }}', {{ item.location.name | tojson }})"
+                            <button data-loc-id="{{ item.location.id }}"
+                                    data-loc-name="{{ item.location.name | e }}"
+                                    onclick="restoreLocation(this.dataset.locId, this.dataset.locName)"
                                     class="text-xs px-3 py-1 rounded-full bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-300 hover:bg-green-200"
                                     title="Restore to active monitoring">
                                 Restore