diff --git a/static/index.html b/static/index.html
index 9d5fb18..fc4cbe3 100644
--- a/static/index.html
+++ b/static/index.html
@@ -3079,12 +3079,6 @@
       const makeName = makeId ? (settingsCache.makes.find(m => m.id == makeId) || {}).name || '' : '';
       const modelName = modelId ? (settingsCache.models.find(m => m.id == modelId) || {}).name || '' : '';
 
-      const payload = {
-        machine_id: machineId,
-        name: name,
-        serial_number: document.getElementById('manSerialNumber').value.trim(),
-        description: document.getElementById('manDescription').value.trim(),
-
       // F2: Auto-populate address from GPS (only if address field is empty)
       if (AppState.gpsLat && !document.getElementById('manAddress').value.trim()) {
         const geo = await reverseGeocode(AppState.gpsLat, AppState.gpsLng);
@@ -3096,6 +3090,12 @@
           }
         }
       }
+
+      const payload = {
+        machine_id: machineId,
+        name: name,
+        serial_number: document.getElementById('manSerialNumber').value.trim(),
+        description: document.getElementById('manDescription').value.trim(),
         category: document.getElementById('manCatSelect').value || 'Other',
         make: makeName,
         model: modelName,
diff --git a/tests/test_map_api.db-shm b/tests/test_map_api.db-shm
new file mode 100644
index 0000000..fe9ac28
Binary files /dev/null and b/tests/test_map_api.db-shm differ
diff --git a/tests/test_map_api.db-wal b/tests/test_map_api.db-wal
new file mode 100644
index 0000000..e69de29