diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 1c65c9c5d..b982da9d0 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -906,7 +906,8 @@ class SensorData {
     char label[4+1];
     unsigned int unit;
     unsigned int prec;
-    unsigned int inputFlags;
+    bool autoOffset;
+    bool filter;
     bool logs;
     bool persistent;
 
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index a0531d166..139ea6fe9 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -2696,7 +2696,8 @@ class SensorField: public TransformedField {
       internalField.Append(new UnsignedField<1>(sensor.type, "type"));
       internalField.Append(new UnsignedField<5>(sensor.unit, "unit"));
       internalField.Append(new UnsignedField<2>(sensor.prec, "prec"));
-      internalField.Append(new UnsignedField<2>(sensor.inputFlags, "inputFlags"));
+      internalField.Append(new BoolField<1>(sensor.autoOffset));
+      internalField.Append(new BoolField<1>(sensor.filter));
       internalField.Append(new BoolField<1>(sensor.logs));
       internalField.Append(new BoolField<1>(sensor.persistent));
       internalField.Append(new SpareBitsField<4>());
diff --git a/companion/src/modeledit/telemetry.cpp b/companion/src/modeledit/telemetry.cpp
index ee2215640..5eb2fb33f 100644
--- a/companion/src/modeledit/telemetry.cpp
+++ b/companion/src/modeledit/telemetry.cpp
@@ -486,7 +486,8 @@ TelemetrySensorPanel::TelemetrySensorPanel(QWidget *parent, SensorData & sensor,
   ui->instance->setField(sensor.instance);
   ui->ratio->setField(sensor.ratio);
   ui->offset->setField(sensor.offset);
-  ui->inputFlags->setField(sensor.inputFlags);
+  ui->autoOffset->setField(sensor.autoOffset);
+  ui->filter->setField(sensor.filter);
   ui->logs->setField(sensor.logs);
   ui->persistent->setField(sensor.persistent);
   ui->gpsSensor->setField(sensor.gps);
diff --git a/companion/src/modeledit/telemetry_sensor.ui b/companion/src/modeledit/telemetry_sensor.ui
index 8d9e03ce1..182159ebb 100644
--- a/companion/src/modeledit/telemetry_sensor.ui
+++ b/companion/src/modeledit/telemetry_sensor.ui
@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,0,0,0,1,1,1,1,0,0,1,0,1,0,1,1,1,1,1,1,0,1,0,1,0,1,1,0,1">
+  <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,0,0,0,1,1,1,1,0,0,1,0,1,0,1,1,1,1,1,1,0,1,0,1,0,1,0,0,0,1">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -521,28 +521,23 @@
     </widget>
    </item>
    <item>
-    <widget class="AutoComboBox" name="inputFlags">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+    <widget class="AutoCheckBox" name="autoOffset">
+     <property name="layoutDirection">
+      <enum>Qt::LeftToRight</enum>
+     </property>
+     <property name="text">
+      <string>Auto Offset</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="AutoCheckBox" name="filter">
+     <property name="layoutDirection">
+      <enum>Qt::LeftToRight</enum>
+     </property>
+     <property name="text">
+      <string>Filter</string>
      </property>
-     <item>
-      <property name="text">
-       <string>---</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Auto Offset</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Filtered</string>
-      </property>
-     </item>
     </widget>
    </item>
    <item>