diff --git a/Ferrite/Extensions/View.swift b/Ferrite/Extensions/View.swift
index 088ff70..ac67c54 100644
--- a/Ferrite/Extensions/View.swift
+++ b/Ferrite/Extensions/View.swift
@@ -37,11 +37,7 @@ extension View {
         modifier(ViewDidAppearModifier(callback: callback))
     }
 
-    func customScopeBar(_ content: some View) -> some View {
-        modifier(CustomScopeBarModifier(hostingContent: content))
-    }
-
     func customScopeBar(_ content: @escaping () -> some View) -> some View {
-        modifier(CustomScopeBarModifier(hostingContent: content()))
+        modifier(CustomScopeBarModifier(scopeBarContent: content()))
     }
 }
diff --git a/Ferrite/ViewModels/DebridManager.swift b/Ferrite/ViewModels/DebridManager.swift
index f2dcffc..db6a32d 100644
--- a/Ferrite/ViewModels/DebridManager.swift
+++ b/Ferrite/ViewModels/DebridManager.swift
@@ -526,6 +526,19 @@ public class DebridManager: ObservableObject {
         }
     }
 
+    public func fetchDebridCloud() async {
+        switch selectedDebridType {
+        case .realDebrid:
+            await fetchRdCloud()
+        case .allDebrid:
+            await fetchAdCloud()
+        case .premiumize:
+            await fetchPmCloud()
+        case .none:
+            return
+        }
+    }
+
     func fetchRdDownload(magnet: Magnet?, existingLink: String?) async {
         // If an existing link is passed in args, set it to that. Otherwise, find one from RD cloud.
         let torrentLink: String?
diff --git a/Ferrite/Views/CommonViews/Modifiers/CustomScopeBar.swift b/Ferrite/Views/CommonViews/Modifiers/CustomScopeBar.swift
index 51bf575..f2c4cf6 100644
--- a/Ferrite/Views/CommonViews/Modifiers/CustomScopeBar.swift
+++ b/Ferrite/Views/CommonViews/Modifiers/CustomScopeBar.swift
@@ -9,7 +9,7 @@ import Introspect
 import SwiftUI
 
 struct CustomScopeBarModifier<V: View>: ViewModifier {
-    let hostingContent: V
+    let scopeBarContent: V
     @State private var hostingController: UIHostingController<V>?
 
     func body(content: Content) -> some View {
@@ -26,7 +26,7 @@ struct CustomScopeBarModifier<V: View>: ViewModifier {
                     searchController.searchBar.scopeButtonTitles = [""]
                     (searchController.searchBar.value(forKey: "_scopeBar") as? UIView)?.isHidden = true
 
-                    let hostingController = UIHostingController(rootView: hostingContent)
+                    let hostingController = UIHostingController(rootView: scopeBarContent)
                     hostingController.view.translatesAutoresizingMaskIntoConstraints = false
                     hostingController.view.backgroundColor = .clear
 
@@ -53,7 +53,7 @@ struct CustomScopeBarModifier<V: View>: ViewModifier {
                 }
         } else {
             VStack {
-                hostingContent
+                scopeBarContent
                 content
                 Spacer()
             }
diff --git a/Ferrite/Views/ComponentViews/Library/Cloud/AllDebridCloudView.swift b/Ferrite/Views/ComponentViews/Library/Cloud/AllDebridCloudView.swift
index eec82e8..4bc1119 100644
--- a/Ferrite/Views/ComponentViews/Library/Cloud/AllDebridCloudView.swift
+++ b/Ferrite/Views/ComponentViews/Library/Cloud/AllDebridCloudView.swift
@@ -84,13 +84,5 @@ struct AllDebridCloudView: View {
                 }
             }
         }
-        .backport.onAppear {
-            viewTask = Task {
-                await debridManager.fetchAdCloud()
-            }
-        }
-        .onDisappear {
-            viewTask?.cancel()
-        }
     }
 }
diff --git a/Ferrite/Views/ComponentViews/Library/Cloud/PremiumizeCloudView.swift b/Ferrite/Views/ComponentViews/Library/Cloud/PremiumizeCloudView.swift
index f49b128..3b424dd 100644
--- a/Ferrite/Views/ComponentViews/Library/Cloud/PremiumizeCloudView.swift
+++ b/Ferrite/Views/ComponentViews/Library/Cloud/PremiumizeCloudView.swift
@@ -59,13 +59,5 @@ struct PremiumizeCloudView: View {
                 }
             }
         }
-        .backport.onAppear {
-            viewTask = Task {
-                await debridManager.fetchPmCloud()
-            }
-        }
-        .onDisappear {
-            viewTask?.cancel()
-        }
     }
 }
diff --git a/Ferrite/Views/ComponentViews/Library/Cloud/RealDebridCloudView.swift b/Ferrite/Views/ComponentViews/Library/Cloud/RealDebridCloudView.swift
index e796da3..7380112 100644
--- a/Ferrite/Views/ComponentViews/Library/Cloud/RealDebridCloudView.swift
+++ b/Ferrite/Views/ComponentViews/Library/Cloud/RealDebridCloudView.swift
@@ -124,13 +124,5 @@ struct RealDebridCloudView: View {
                 }
             }
         }
-        .backport.onAppear {
-            viewTask = Task {
-                await debridManager.fetchRdCloud()
-            }
-        }
-        .onDisappear {
-            viewTask?.cancel()
-        }
     }
 }
diff --git a/Ferrite/Views/ComponentViews/Library/DebridCloudView.swift b/Ferrite/Views/ComponentViews/Library/DebridCloudView.swift
index fb435bb..09efc10 100644
--- a/Ferrite/Views/ComponentViews/Library/DebridCloudView.swift
+++ b/Ferrite/Views/ComponentViews/Library/DebridCloudView.swift
@@ -12,6 +12,8 @@ struct DebridCloudView: View {
 
     @Binding var searchText: String
 
+    @State private var viewTask: Task<Void, Never>?
+
     var body: some View {
         List {
             switch debridManager.selectedDebridType {
@@ -26,5 +28,22 @@ struct DebridCloudView: View {
             }
         }
         .listStyle(.plain)
+        .backport.onAppear {
+            viewTask = Task {
+                await debridManager.fetchDebridCloud()
+            }
+        }
+        .onDisappear {
+            viewTask?.cancel()
+        }
+        .onChange(of: debridManager.selectedDebridType) { newType in
+            viewTask?.cancel()
+
+            if newType != nil {
+                viewTask = Task {
+                    await debridManager.fetchDebridCloud()
+                }
+            }
+        }
     }
 }
diff --git a/Ferrite/Views/PluginsView.swift b/Ferrite/Views/PluginsView.swift
index 0c9315d..a763b45 100644
--- a/Ferrite/Views/PluginsView.swift
+++ b/Ferrite/Views/PluginsView.swift
@@ -12,20 +12,6 @@ struct PluginsView: View {
     @EnvironmentObject var pluginManager: PluginManager
     @EnvironmentObject var navModel: NavigationViewModel
 
-    /*
-     @FetchRequest(
-         entity: Source.entity(),
-         sortDescriptors: []
-     ) var sources: FetchedResults<Source>
-      */
-
-    /*
-     @FetchRequest(
-         entity: Action.entity(),
-         sortDescriptors: []
-     ) var actions: FetchedResults<Action>
-      */
-
     @AppStorage("Behavior.AutocorrectSearch") var autocorrectSearch = true
 
     @State private var installedSourcesEmpty = false