diff --git a/src/blackgui/views/aircraftmodelview.cpp b/src/blackgui/views/aircraftmodelview.cpp
index 926decb38..eaed4e090 100644
--- a/src/blackgui/views/aircraftmodelview.cpp
+++ b/src/blackgui/views/aircraftmodelview.cpp
@@ -125,6 +125,11 @@ namespace BlackGui
             return delta;
         }
 
+        int CAircraftModelView::removeModelsWithModelString(const CAircraftModelList &models, Qt::CaseSensitivity sensitivity)
+        {
+            return this->removeModelsWithModelString(models.getModelStrings(), sensitivity);
+        }
+
         void CAircraftModelView::setHighlightModelStrings(const QStringList &highlightModels)
         {
             this->derivedModel()->setHighlightModelStrings(highlightModels);
@@ -249,7 +254,7 @@ namespace BlackGui
                 // this function requires that someone provides the model strings to be highlighted
                 QAction *a = menu.addAction(CIcons::appDbStash16(), "Highlight stashed", this, SLOT(ps_toggleHighlightStashedModels()));
                 a->setCheckable(true);
-                a->setChecked(this->derivedModel()->highlightDbData());
+                a->setChecked(this->derivedModel()->highlightModelStrings());
             }
             if (this->m_menus.testFlag(MenuHighlightInvalid))
             {
diff --git a/src/blackgui/views/aircraftmodelview.h b/src/blackgui/views/aircraftmodelview.h
index 7b793e7c3..050f9dce0 100644
--- a/src/blackgui/views/aircraftmodelview.h
+++ b/src/blackgui/views/aircraftmodelview.h
@@ -55,6 +55,9 @@ namespace BlackGui
             //! Remove models with model strings
             int removeModelsWithModelString(const QStringList &modelStrings, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive);
 
+            //! Remove models with model strings
+            int removeModelsWithModelString(const BlackMisc::Simulation::CAircraftModelList &models, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive);
+
             //! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightModelStrings(const QStringList &)
             void setHighlightModelStrings(const QStringList &highlightModels);
 
diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp
index 243ee01c5..5a1aca9c9 100644
--- a/src/blackmisc/simulation/aircraftmodel.cpp
+++ b/src/blackmisc/simulation/aircraftmodel.cpp
@@ -349,15 +349,8 @@ namespace BlackMisc
 
         bool CAircraftModel::matchesModelString(const QString &modelString, Qt::CaseSensitivity sensitivity) const
         {
-            if (sensitivity == Qt::CaseSensitive)
-            {
-                return modelString == this->m_modelString;
-            }
-            else
-            {
-                return this->m_modelString.length() == modelString.length() &&
-                       this->m_modelString.indexOf(modelString) == 0;
-            }
+            return this->m_modelString.length() == modelString.length() &&
+                   this->m_modelString.startsWith(modelString, sensitivity);
         }
 
         CStatusMessageList CAircraftModel::validate(bool withNestedObjects) const