diff --git a/html/planeObject.js b/html/planeObject.js
index f90a2b7..e22b07f 100644
--- a/html/planeObject.js
+++ b/html/planeObject.js
@@ -93,8 +93,6 @@ function PlaneObject(icao) {
 	this.typeDescription = null;
 	this.wtc = null;
 
-
-	this.filter = PlaneFilter;
 	this.trail_features = new ol.Collection();
 
 	this.layer = new ol.layer.Vector({
@@ -139,11 +137,6 @@ PlaneObject.prototype.logSel = function(loggable) {
 }
 
 PlaneObject.prototype.isFiltered = function() {
-	if (!this.filter) {
-		console.log("No filter, this shouldn't happen, PlaneObject in question:");
-		console.log(this);
-		return false;
-	}
 	if (this.filter.minAltitude != undefined && this.filter.maxAltitude != undefined) {
 		if (this.altitude == null) {
 			return true;
diff --git a/html/script.js b/html/script.js
index a2e4058..c5029ae 100644
--- a/html/script.js
+++ b/html/script.js
@@ -138,6 +138,7 @@ function processReceiverUpdate(data, init) {
 			continue;
 		} else {
 			plane = new PlaneObject(hex);
+			plane.filter = PlaneFilter;
 
 			if (!init)
 				setupPlane(hex,plane);
@@ -1097,7 +1098,7 @@ function createSiteCircleFeatures() {
 }
 
 // This looks for planes to reap out of the master Planes variable
-function reaper() {
+function reaper(all) {
 	//console.log("Reaping started..");
 
 	// Look for planes where we have seen no messages for >300 seconds
@@ -1105,7 +1106,7 @@ function reaper() {
 	var plane;
 	while (plane = PlanesOrdered.pop()) {
 		plane.seen = now - plane.last_message_time;
-		if (plane.seen > 600) {
+		if (all || plane.seen > 600) {
 			// Reap it.                                
 			//console.log("Removed " + plane.icao);
 			delete Planes[plane.icao];