diff --git a/src/blackcore/fsd/fsdclient.cpp b/src/blackcore/fsd/fsdclient.cpp
index 298d78c3b..c7a87cf5a 100644
--- a/src/blackcore/fsd/fsdclient.cpp
+++ b/src/blackcore/fsd/fsdclient.cpp
@@ -520,8 +520,10 @@ namespace BlackCore
             // Removed with T353 although it is standard
             // const QString route = QString(flightPlan.getRoute()).replace(" ", ".");
 
-            const QString route   = flightPlan.getRoute();
-            const QString remarks = flightPlan.getRemarks();
+            QString route   = flightPlan.getRoute();
+            QString remarks = flightPlan.getRemarks();
+            route.remove(':');
+            remarks.remove(':');
 
             //! \fixme that would be the official string, can this be used?
             const QString alt = flightPlan.getCruiseAltitude().asFpVatsimAltitudeString();
diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp
index de7a2d27f..30c4f1a52 100644
--- a/src/blackgui/components/flightplancomponent.cpp
+++ b/src/blackgui/components/flightplancomponent.cpp
@@ -18,6 +18,7 @@
 #include "blackcore/context/contextownaircraft.h"
 #include "blackcore/context/contextsimulator.h"
 #include "blackcore/webdataservices.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/aviation/aircrafticaocode.h"
 #include "blackmisc/aviation/airportlist.h"
 #include "blackmisc/aviation/altitude.h"
@@ -27,11 +28,12 @@
 #include "blackmisc/pq/units.h"
 #include "blackmisc/logcategory.h"
 #include "blackmisc/logmessage.h"
-#include "blackconfig/buildconfig.h"
 #include "blackmisc/network/user.h"
-#include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/directoryutils.h"
 #include "blackmisc/statusmessage.h"
+#include "blackmisc/stringutils.h"
+#include "blackconfig/buildconfig.h"
+
 #include "ui_flightplancomponent.h"
 
 #include <QCheckBox>
@@ -1103,11 +1105,18 @@ namespace BlackGui
             const QObject *sender = QObject::sender();
             if (sender == ui->cb_VoiceCapabilities)
             {
+                const QString ct = ui->cb_VoiceCapabilitiesFirstPage->currentText();
+                if (stringCompare(ct, text, Qt::CaseInsensitive)) { return; }
                 ui->cb_VoiceCapabilitiesFirstPage->setCurrentText(text);
             }
             else
             {
-                ui->cb_VoiceCapabilities->setCurrentText(text);
+                const QString ct = ui->cb_VoiceCapabilities->currentText();
+                if (!stringCompare(ct, text, Qt::CaseInsensitive))
+                {
+                    // avoid unnecessary roundtrips
+                    ui->cb_VoiceCapabilities->setCurrentText(text);
+                }
                 const QString r = CFlightPlanRemarks::replaceVoiceCapabilities(CFlightPlanRemarks::textToVoiceCapabilitiesRemarks(text), ui->pte_Remarks->toPlainText());
                 if (ui->pte_Remarks->toPlainText() != r)
                 {
diff --git a/src/blackgui/components/flightplancomponent.h b/src/blackgui/components/flightplancomponent.h
index 9f22fb025..80446ed76 100644
--- a/src/blackgui/components/flightplancomponent.h
+++ b/src/blackgui/components/flightplancomponent.h
@@ -132,7 +132,7 @@ namespace BlackGui
             QString getDefaultFilename(bool load);
 
             //! Call \sa buildRemarksString from combo box signal
-            void currentTextChangedToBuildRemarks(const QString &text) { this->buildRemarksString(); Q_UNUSED(text); }
+            void currentTextChangedToBuildRemarks(const QString &text) { this->buildRemarksString(); Q_UNUSED(text) }
 
             //! Voice combo boxes shall display the same
             void syncVoiceComboBoxes(const QString &text);