diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimDataFilterInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimDataFilterInViewCollection.cpp
index dc264282b1..37dc3684ec 100644
--- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimDataFilterInViewCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimDataFilterInViewCollection.cpp
@@ -59,6 +59,7 @@ void RimDataFilterInViewCollection::setSourceCollection( RimDataFilterCollection
 {
     if ( m_sourceCollection() == sourceCollection ) return;
 
+    if ( m_sourceCollection() ) m_sourceCollection()->filtersChanged.disconnect( this );
     m_sourceCollection = sourceCollection;
     connectSourceSignal();
     syncWithSource();
@@ -92,9 +93,7 @@ void RimDataFilterInViewCollection::syncWithSource()
 
     if ( !m_sourceCollection() )
     {
-        m_wrappers.clearWithoutDelete();
-        for ( auto* w : existing )
-            delete w;
+        m_wrappers.deleteChildren();
         updateConnectedEditors();
         return;
     }
diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp
index da3b47c303..d2dfc5b472 100644
--- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp
+++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp
@@ -201,10 +201,8 @@ void RimEclipsePropertyFilter::fieldChangedByUi( const caf::PdmFieldHandle* chan
         updateIconState();
         uiCapability()->updateConnectedEditors();
 
-        if ( auto* container = parentContainer() )
-            container->updateDisplayModelNotifyManagedViews( this );
-        else
-            triggerFilterChanged();
+        if ( auto* container = parentContainer() ) container->updateDisplayModelNotifyManagedViews( this );
+        triggerFilterChanged();
     }
 }