diff --git a/src/c3nav/editor/static/editor/js/editor.js b/src/c3nav/editor/static/editor/js/editor.js
index 61d868b8..1b266105 100644
--- a/src/c3nav/editor/static/editor/js/editor.js
+++ b/src/c3nav/editor/static/editor/js/editor.js
@@ -1599,6 +1599,7 @@ editor = {
         editor._scancollector_data.wifi.push(data);
         $collector.find('.wifi-count').text(editor._scancollector_data.wifi.length);
         $collector.siblings('[name=data]').val(JSON.stringify(editor._scancollector_data));
+        $collector.siblings('[name=data]').text(JSON.stringify(editor._scancollector_data));
     },
     _scancollector_ibeacon_result: function (data) {
         var $collector = $('#sidebar').find('.scancollector.running'),
@@ -1636,6 +1637,7 @@ editor = {
         editor._scancollector_data.ibeacon.push(data);
         $collector.find('.ibeacon-count').text(editor._scancollector_data.ibeacon.length);
         $collector.siblings('[name=data]').val(JSON.stringify(editor._scancollector_data));
+        $collector.siblings('[name=data]').text(JSON.stringify(editor._scancollector_data));
     },
     _wifi_scan_waits: false,
     _scancollector_wifi_scan_perhaps: function () {
diff --git a/src/c3nav/mapdata/models/geometry/space.py b/src/c3nav/mapdata/models/geometry/space.py
index 8fc73ec0..865a7628 100644
--- a/src/c3nav/mapdata/models/geometry/space.py
+++ b/src/c3nav/mapdata/models/geometry/space.py
@@ -433,7 +433,8 @@ class BeaconMeasurement(SpaceGeometryMixin, models.Model):
                                verbose_name=_('author'))
     comment = models.TextField(null=True, blank=True, verbose_name=_('comment'))
     data: BeaconMeasurementDataSchema = SchemaField(BeaconMeasurementDataSchema,
-                                                    verbose_name=_('Measurement list'))
+                                                    verbose_name=_('Measurement list'), 
+                                                    default=BeaconMeasurementDataSchema())
 
     class Meta:
         verbose_name = _('Beacon Measurement')
diff --git a/src/c3nav/routing/locator.py b/src/c3nav/routing/locator.py
index 1dd59efa..068a7d3e 100644
--- a/src/c3nav/routing/locator.py
+++ b/src/c3nav/routing/locator.py
@@ -124,7 +124,7 @@ class Locator:
                 continue
             peer_id = self.get_peer_id(scan_value.bssid, create=create_peers)
             if peer_id is not None:
-                result[peer_id] = ScanDataValue(rssi=scan_value.rssi, distance=scan_value.get("distance", None))
+                result[peer_id] = ScanDataValue(rssi=scan_value.rssi, distance=scan_value.distance)
         return result
 
     def convert_ibeacon_scan(self, scan_data: list[LocateIBeaconPeerSchema], create_peers=False) -> ScanData:
diff --git a/src/c3nav/site/static/site/js/fakemobileclient.js b/src/c3nav/site/static/site/js/fakemobileclient.js
index 52069a4a..f4694f43 100644
--- a/src/c3nav/site/static/site/js/fakemobileclient.js
+++ b/src/c3nav/site/static/site/js/fakemobileclient.js
@@ -13,8 +13,8 @@ mobileclient = {
         console.log('mobileclient: scanNow');
         if (mobileclient.wait) return;
         mobileclient.wait = true;
-        $.getJSON('http://localhost:'+String(mobileclient.port)+'/scan', function(data) {
-            mobileclient.setNearbyStations(data.data);
+        $.getJSON('http://localhost:'+String(mobileclient.port)+'/scan', function(response) {
+            mobileclient.setNearbyStations(response.wifi);
         }).always(function() {
             mobileclient.wait = false;
         });
diff --git a/tools/fakemobileclient.py b/tools/fakemobileclient.py
index 7f9a84a6..8e19c903 100644
--- a/tools/fakemobileclient.py
+++ b/tools/fakemobileclient.py
@@ -46,7 +46,7 @@ class FakeMobileClientHandler(http.server.BaseHTTPRequestHandler):
         self.send_header('Content-Type', 'application/json')
         self.send_header('Access-Control-Allow-Origin', '*')
         self.end_headers()
-        self.wfile.write(json.dumps({'data': stations}).encode())
+        self.wfile.write(json.dumps({'wifi':stations}).encode())
         return True