diff --git a/public_html/index.html b/public_html/index.html
index f34a599..73f916b 100644
--- a/public_html/index.html
+++ b/public_html/index.html
@@ -199,7 +199,7 @@
 							</thead>
 							<tbody>
 								<tr id="plane_row_template" class="plane_table_row hidden">
-									<td style="text-transform: uppercase">ICAO</td>
+									<td class="icaoCodeColumn">ICAO</td>
 									<td><img style="width: 20px; height=12px" src="about:blank" alt="Flag"></td>
 									<td>FLIGHT</td>
 									<td>REGISTRATION</td>
diff --git a/public_html/planeObject.js b/public_html/planeObject.js
index 827b0e8..d16e03f 100644
--- a/public_html/planeObject.js
+++ b/public_html/planeObject.js
@@ -217,14 +217,10 @@ PlaneObject.prototype.getDataSource = function() {
         return 'adsb';
     }
 
-    var emptyHexRegex = /^0*$/;
-    // No position and no ICAO hex code - Mode A/C
-    if (emptyHexRegex.test(this.icao)) {
-        return 'mode_ac';
-    }
-
-    // No position and ICAO hex code present - Mode S
+    // Otherwise Mode S
     return 'mode_s';
+
+    // TODO: add support for Mode A/C
 };
 
 PlaneObject.prototype.getMarkerColor = function() {
diff --git a/public_html/script.js b/public_html/script.js
index dd4560a..1261b31 100644
--- a/public_html/script.js
+++ b/public_html/script.js
@@ -8,7 +8,7 @@ var SiteCircleFeatures = new ol.Collection();
 var PlaneIconFeatures = new ol.Collection();
 var PlaneTrailFeatures = new ol.Collection();
 var Planes        = {};
-var PlanesModeAc  = {};
+var PlanesNoHex   = {};
 var PlanesOrdered = [];
 var PlaneFilter   = {};
 var SelectedPlane = null;
@@ -74,8 +74,8 @@ function processReceiverUpdate(data) {
 
 		if (hex !== "000000" && Planes[hex]) {
 			plane = Planes[hex];
-        } else if (hex === "000000" && PlanesModeAc[squawk]) {
-            plane = PlanesModeAc[squawk];
+        } else if (hex === "000000" && PlanesNoHex[squawk]) {
+            plane = PlanesNoHex[squawk];
 		} else {
 			plane = new PlaneObject(hex);
                         plane.filter = PlaneFilter;
@@ -123,7 +123,7 @@ function processReceiverUpdate(data) {
 
                                 Planes[hex] = plane;
                         } else {
-                                PlanesModeAc[squawk] = plane;
+                                PlanesNoHex[squawk] = plane;
                         }
                         PlanesOrdered.push(plane);
 		}
@@ -695,7 +695,7 @@ function reaper() {
                         plane.tr.parentNode.removeChild(plane.tr);
                         plane.tr = null;
                         if (plane.icao === "000000") {
-                                delete PlanesModeAc[plane.squawk];
+                                delete PlanesNoHex[plane.squawk];
                         } else {
                                 delete Planes[plane.icao];
                         }
diff --git a/public_html/style.css b/public_html/style.css
index c0bc047..f5fafc8 100644
--- a/public_html/style.css
+++ b/public_html/style.css
@@ -134,6 +134,11 @@ div#loader { z-index: 99; position: absolute; left: 0; top: 0; bottom: 0; right:
     font-family: "Courier New",monospace;
 }
 
+.icaoCodeColumn {
+    font-family: monospace;
+    text-transform: uppercase;
+}
+
 .vPosition  { background-color: #C3FFDF; }
 .mlat       { background-color: #C7EAFC; }
 .squawk7500 { font-weight: bold; background-color: #ff5555; }