diff --git a/html/planeObject.js b/html/planeObject.js
index c6bed69..5e78543 100644
--- a/html/planeObject.js
+++ b/html/planeObject.js
@@ -1533,7 +1533,7 @@ PlaneObject.prototype.getAircraftData = function() {
         // format [r:0, t:1, f:2]
 
         if (data[0]) {
-            this.registration = data.r;
+            this.registration = data[0];
         }
 
         if (data[1]) {
diff --git a/html/script.js b/html/script.js
index acb618d..5332ff9 100644
--- a/html/script.js
+++ b/html/script.js
@@ -1407,6 +1407,8 @@ function reaper(all) {
     var newPlanes = [];
     var plane;
     while (plane = PlanesOrdered.pop()) {
+        if (plane.selected)
+            continue;
         plane.seen = now - plane.last_message_time;
         if (all || plane.seen > 600) {
             // Reap it.                                
@@ -2230,6 +2232,8 @@ function deselectAllPlanes() {
     }
     $('#selectall_checkbox').removeClass('settingsCheckboxChecked');
     SelectedAllPlanes = false;
+    SelectedPlane.clearLines();
+    SelectedPlane.updateMarker();
     SelectedPlane = null;
     refreshFeatures();
     refreshSelected();