diff --git a/src/blackgui/components/statusmessageformsmall.cpp b/src/blackgui/components/statusmessageformsmall.cpp
index b317ea216..3bc95fbd6 100644
--- a/src/blackgui/components/statusmessageformsmall.cpp
+++ b/src/blackgui/components/statusmessageformsmall.cpp
@@ -37,7 +37,7 @@ namespace BlackGui
         {
             ui->te_Message->setPlainText(message.getMessage());
             ui->lbl_SeverityIcon->setPixmap(message.toPixmap());
-            ui->le_Categories->setText(message.getHumanReadablePattern());
+            ui->le_Categories->setText(message.getHumanOrTechnicalCategoriesAsString());
             ui->le_Severity->setText(message.getSeverityAsString());
             ui->le_Timestamp->setText(message.getFormattedUtcTimestampYmdhms());
         }
diff --git a/src/blackgui/models/aircraftmodellistmodel.cpp b/src/blackgui/models/aircraftmodellistmodel.cpp
index d95d71165..86653a32b 100644
--- a/src/blackgui/models/aircraftmodellistmodel.cpp
+++ b/src/blackgui/models/aircraftmodellistmodel.cpp
@@ -61,13 +61,11 @@ namespace BlackGui
                 break;
 
             case OwnSimulatorModelMapping:
-                this->m_columns.addColumn(CColumn::standardValueObject("call", "callsign", CAircraftModel::IndexCallsign));
                 this->m_columns.addColumn(CColumn::standardString("model", CAircraftModel::IndexModelString));
+                this->m_columns.addColumn(CColumn::standardValueObject("call", "callsign", CAircraftModel::IndexCallsign));
                 this->m_columns.addColumn(CColumn::standardString("ac", "aircraft ICAO", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexAircraftDesignator}));
                 this->m_columns.addColumn(CColumn::standardString("al", "airline ICAO", { CAircraftModel::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineDesignator}));
                 // this->m_columns.addColumn(CColumn::standardString("ct", "combined type", { CAircraftModel::IndexIcao, CAircraftIcaoData::IndexCombinedAircraftType}));
-                this->m_columns.addColumn(CColumn("q.?", "queried", CAircraftModel::IndexHasQueriedModelString,
-                                                  new CBoolIconFormatter(CIcons::StandardIconTick16, CIcons::StandardIconCross16, "queried", "not queried")));
                 this->m_columns.addColumn(CColumn::standardString("description",  CAircraftModel::IndexDescription));
                 this->m_columns.addColumn(CColumn::standardString("filename",  CAircraftModel::IndexFileName));
 
diff --git a/src/blackgui/models/statusmessagelistmodel.cpp b/src/blackgui/models/statusmessagelistmodel.cpp
index c9b36c9fb..69175f457 100644
--- a/src/blackgui/models/statusmessagelistmodel.cpp
+++ b/src/blackgui/models/statusmessagelistmodel.cpp
@@ -40,10 +40,10 @@ namespace BlackGui
             case Detailed:
                 {
                     this->m_columns.addColumn(CColumn("time", CStatusMessage::IndexUtcTimestamp, new CDateTimeFormatter(CDateTimeFormatter::formatHms())));
-                    this->m_columns.addColumn(CColumn::standardString("category", CStatusMessage::IndexCategoryHumanReadableOrTechnicalAsString));
                     CColumn col = CColumn("severity", CStatusMessage::IndexIcon);
                     col.setSortPropertyIndex(CStatusMessage::IndexSeverityAsString);
                     this->m_columns.addColumn(col);
+                    this->m_columns.addColumn(CColumn::standardString("category", CStatusMessage::IndexCategoryHumanReadableOrTechnicalAsString));
                     this->m_columns.addColumn(CColumn::standardString("message", CStatusMessage::IndexMessage));
 
                     this->m_sortedColumn = CStatusMessage::IndexUtcTimestamp;
diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp
index 5a1aca9c9..3b9c8bcfd 100644
--- a/src/blackmisc/simulation/aircraftmodel.cpp
+++ b/src/blackmisc/simulation/aircraftmodel.cpp
@@ -220,7 +220,7 @@ namespace BlackMisc
             case IndexName:
                 return this->m_name.compare(compareValue.getName(), Qt::CaseInsensitive);
             case IndexCallsign:
-                break;
+                return this->m_callsign.comparePropertyByIndex(compareValue.getCallsign(), index.copyFrontRemoved());
             case IndexFileName:
                 return this->m_fileName.compare(compareValue.getFileName(), Qt::CaseInsensitive);
             case IndexModelType: