diff --git a/dzgui/managers/connection.py b/dzgui/managers/connection.py
index c7516a8..643dffd 100644
--- a/dzgui/managers/connection.py
+++ b/dzgui/managers/connection.py
@@ -145,6 +145,7 @@ class ConnectionManager:
             binary_missing = True
 
         prefs = self.controller.get_prefs()
+        remote_mods: list[list[str]] = []
         if res.is_modded():
             try:
                 remote_mods, missing_mods = self._query_modlist(record)
diff --git a/dzgui/managers/filter.py b/dzgui/managers/filter.py
index 3ccfbbe..b4c02e5 100644
--- a/dzgui/managers/filter.py
+++ b/dzgui/managers/filter.py
@@ -80,6 +80,7 @@ class FilterManager:
         if maps is None:
             return
         if len(maps) < 1:
+            self.reinit_map_store()
             return
 
         self.reinit_map_store()
diff --git a/dzgui/model/servers.py b/dzgui/model/servers.py
index 092c8ab..7b5f657 100644
--- a/dzgui/model/servers.py
+++ b/dzgui/model/servers.py
@@ -395,8 +395,10 @@ class ServerModelManager:
         self.first_iteration = False
 
     def _cleanup_on_success(self) -> None:
-        proxy = self._get_proxy_man().get_proxy_model()
+        proxy = self.proxy_man.get_proxy_model()
         self.tv.set_model(proxy)
+        if self.preserve_on_fail is True:
+            self.proxy_man.wipe_cache()
 
         self.emitter.emit("servers_loaded", self.enum)
         if self.first_iteration: