diff --git a/htdocs/lib/PlaneMarker.js b/htdocs/lib/PlaneMarker.js
index 47027f13..77635cb3 100644
--- a/htdocs/lib/PlaneMarker.js
+++ b/htdocs/lib/PlaneMarker.js
@@ -6,8 +6,9 @@ PlaneMarker.prototype.draw = function() {
     var svg = this.svg;
     if (!svg) return;
 
-    if (this.groundtrack) {
-        svg.style.transform = 'rotate(' + (this.groundtrack) + 'deg)';
+    var angle = this.groundtrack || this.heading;
+    if (angle) {
+        svg.style.transform = 'rotate(' + angle + 'deg)';
     } else {
         svg.style.transform = null;
     }
diff --git a/htdocs/map.js b/htdocs/map.js
index 7d267086..d4f2acd3 100644
--- a/htdocs/map.js
+++ b/htdocs/map.js
@@ -471,6 +471,12 @@ $(function(){
             if ('verticalspeed' in marker) {
                 commentString += '<div>V/S: ' + marker.verticalspeed + ' ft/min</div>';
             }
+            if ('IAS' in marker) {
+                commentString += '<div>IAS: ' + marker.IAS + ' kt</div>';
+            }
+            if ('TAS' in marker) {
+                commentString += '<div>TAS: ' + marker.TAS + ' kt</div>/';
+            }
         } else {
             linkifySource(source);
         }
diff --git a/owrx/adsb/modes.py b/owrx/adsb/modes.py
index 310f8784..c3fb91a8 100644
--- a/owrx/adsb/modes.py
+++ b/owrx/adsb/modes.py
@@ -27,6 +27,9 @@ class AirplaneLocation(IncrementalUpdate, TTLUpdate, LatLngLocation):
         "groundspeed",
         "verticalspeed",
         "identification",
+        "TAS",
+        "IAS",
+        "heading",
     ]
     ttl = 30