diff --git a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
index 137e90b63697fa581046cc95a3ea39d01268b5b0..b66df2fcc3c292e34a7319f1a6ea12b0c7aa8d72 100644
--- a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
+++ b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
@@ -127,6 +127,9 @@ ArduSubFirmwarePlugin::ArduSubFirmwarePlugin(void):
 
     _factRenameMap[QStringLiteral("altitudeRelative")] = QStringLiteral("Depth");
     _factRenameMap[QStringLiteral("flightTime")] = QStringLiteral("Dive Time");
+    _factRenameMap[QStringLiteral("altitudeAMSL")] = QStringLiteral("");
+    _factRenameMap[QStringLiteral("hobbs")] = QStringLiteral("");
+    _factRenameMap[QStringLiteral("airSpeed")] = QStringLiteral("");
 }
 
 QList<MAV_CMD> ArduSubFirmwarePlugin::supportedMissionCommands(void)
diff --git a/src/FlightMap/Widgets/ValuePageWidget.qml b/src/FlightMap/Widgets/ValuePageWidget.qml
index 3a9b21f8e2dfcb5e74e1265e442f561b6eb50406..703dabac3366f8ee65268af7af3b0a0b3dac1d4d 100644
--- a/src/FlightMap/Widgets/ValuePageWidget.qml
+++ b/src/FlightMap/Widgets/ValuePageWidget.qml
@@ -222,6 +222,7 @@ Column {
 
                     RowLayout {
                         spacing: _margins
+                        visible: factGroup.getFact(modelData).shortDescription !== ""
 
                         property string propertyName: factGroupName + "." + modelData