diff --git a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
index 30dad01d2f6ede79ff5fb08ed4811d918d8de487..b939c020bd49be3e451833bc61e430b93a1848ec 100644
--- a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
+++ b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
@@ -30,17 +30,20 @@ RefuelingVisualizer::RefuelingVisualizer(QWidget* parent)
     getCore()->getMessageBroker()->subscribe(
         Filter::fromString("Mav/GSE_TM"), this,
         [this](const Message& message, const Filter& filter)
-        { onMsgReceived(message, filter); });
+        { onMsgReceivedGSE(message); });
 
     getCore()->getMessageBroker()->subscribe(
         Filter::fromString("Mav/MOTOR_TM"), this,
         [this](const Message& message, const Filter& filter)
-        { onMsgReceived(message, filter); });
+        { onMsgReceivedMOT(message); });
 }
 
 RefuelingVisualizer::~RefuelingVisualizer()
 {
-    getCore()->getMessageBroker()->unsubscribe(filter, this);
+    getCore()->getMessageBroker()->unsubscribe(Filter::fromString("Mav/GSE_TM"),
+                                             this);
+    getCore()->getMessageBroker()->unsubscribe(Filter::fromString("Mav/MOTOR_TM"),
+                                             this);
 }
 
 QWidget* RefuelingVisualizer::toWidget() { return this; }
@@ -314,30 +317,6 @@ void RefuelingVisualizer::setupUi()
     setLayout(outerLayout);
 }
 
-/* void RefuelingVisualizer::customContextMenuActionSetup()
-{
-    QAction* action = new QAction("Choose topic and field");
-    connect(action, &QAction::triggered, this,
-            &RefuelingVisualizer::onConfigureClicked);
-    customContextMenuActions.append(action);
-} */
-
-/* void RefuelingVisualizer::onConfigureClicked()
-{
-    FilterSelector::selectFilter(
-        filter, [this](const Filter& newFilter) { setFilter(newFilter); });
-} */
-
-/* void RefuelingVisualizer::setFilter(const Filter& newFilter)
-{
-    getCore()->getMessageBroker()->unsubscribe(filter, this);
-    getCore()->getMessageBroker()->subscribe(
-        newFilter, this,
-        [this](const Message& message, const Filter& filter)
-        { onMsgReceived(message); });
-    filter = newFilter;
-} */
-
 void RefuelingVisualizer::backgroundTabs(Message msg)
 {
     uint64_t releaseValve =
@@ -498,37 +477,26 @@ void RefuelingVisualizer::backgroundTabs(Message msg)
     }
 }
 
-void RefuelingVisualizer::onMsgReceived(const Message& msg,
-                                        const Filter& filter)
+void RefuelingVisualizer::onMsgReceivedGSE(const Message& msg)
 {
+    // Change background and tabs
+    backgroundTabs(msg);
 
-    QString filterName = filter.toString();
-    int idxCol         = filterName.indexOf('/');
-    filterName         = filterName.right(filterName.size() - 1 - idxCol);
-    filterName         = filterName.left(filterName.size() - 2);
+    float vesselLoadcell = msg.getField("loadcell_vessel").getDouble();
+    float vesselPressure = msg.getField("vessel_pressure").getDouble();
 
-    if (!QString::compare(filterName, (QString) "GSE_TM", Qt::CaseInsensitive))
-    {
-        // Change background and tabs
-        backgroundTabs(msg);
-
-        float vesselLoadcell = msg.getField("loadcell_vessel").getDouble();
-        float vesselPressure = msg.getField("vessel_pressure").getDouble();
-
-        // Change data inside labels
-        loadcellVesselDataLabel->setText(
-            QString::number(vesselLoadcell, 'f', 3) + "    KG");
-        vesselPressureDataLabel->setText(
-            QString::number(vesselPressure, 'f', 3) + "   bar");
-    }
-    else
-    {
-        float tankTemperature = msg.getField("tank_temperature").getDouble();
+    // Change data inside labels
+    loadcellVesselDataLabel->setText(QString::number(vesselLoadcell, 'f', 3) +
+                                     "    KG");
+    vesselPressureDataLabel->setText(QString::number(vesselPressure, 'f', 3) +
+                                     "   bar");
+}
 
-        // Change data inside labels
-        tankTemperatureDataLabel->setText(
-            QString::number(tankTemperature, 'f', 3) + "    °C");
-    }
+void RefuelingVisualizer::onMsgReceivedMOT(const Message& msg)
+{
+    float tankTemperature = msg.getField("tank_temperature").getDouble();
 
-    printf("%s\n", filterName.toStdString().c_str());
+    // Change data inside labels
+    tankTemperatureDataLabel->setText(QString::number(tankTemperature, 'f', 3) +
+                                      "    °C");
 }
diff --git a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h
index de040c36a18c0988afe55719416867f077c270f1..5cb1074b15d9c0b4b8b950f2a8838705ce8558ab 100644
--- a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h
+++ b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h
@@ -45,7 +45,8 @@ private:
     // void addCustomActionsToMenu() override;
     // void onConfigureClicked();
     // void setFilter(const Filter& filter);
-    void onMsgReceived(const Message& msg, const Filter& filter);
+    void onMsgReceivedGSE(const Message& msg);
+    void onMsgReceivedMOT(const Message& msg);
     void backgroundTabs(Message msg);
 
     QGridLayout* outerLayout;