diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_processor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_processor.cpp
index 487da8be4..bcbf78ec4 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_processor.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/MapImpl/terrain_profile_processor.cpp
@@ -24,6 +24,8 @@
 #include <Polyline.h>
 #include <Part.h>
 #include <Multipart.h>
+#include <ImmutablePart.h>
+#include <ImmutablePartCollection.h>
 #include <LinearUnit.h>
 #include <AngularUnit.h>
 
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp
index 295ffc666..4d25fa749 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp
+++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp
@@ -997,33 +997,37 @@ QSet<QString> BaseSymbolProxyModel::validBaseSymbolCodes() const
 
 void BaseSymbolProxyModel::setValidBaseSymbolCodes(const QSet<QString> &validBaseSymbolCodes)
 {
+  beginFilterChange();
   m_validBaseSymbolCodes = validBaseSymbolCodes;
-  invalidateFilter();
+  endFilterChange();
 }
 
 void BaseSymbolProxyModel::onFilterPoints(bool on)
 {
+  beginFilterChange();
   if (on)
     m_geometrySet.insert(AdvancedSymbology::GeometryType::Point);
   else
     m_geometrySet.remove(AdvancedSymbology::GeometryType::Point);
-  invalidateFilter();
+  endFilterChange();
 }
 void BaseSymbolProxyModel::onFilterLines(bool on)
 {
+  beginFilterChange();
   if (on)
     m_geometrySet.insert(AdvancedSymbology::GeometryType::Polyline);
   else
     m_geometrySet.remove(AdvancedSymbology::GeometryType::Polyline);
-  invalidateFilter();
+  endFilterChange();
 }
 void BaseSymbolProxyModel::onFilterAreas(bool on)
 {
+  beginFilterChange();
   if (on)
     m_geometrySet.insert(AdvancedSymbology::GeometryType::Polygon);
   else
     m_geometrySet.remove(AdvancedSymbology::GeometryType::Polygon);
-  invalidateFilter();
+  endFilterChange();
 }
 
 bool BaseSymbolProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const