diff --git a/RBLNews.Shared/Components/Controls/SwitchWithBadge.razor b/RBLNews.Shared/Components/Controls/SwitchWithBadge.razor
index 41b5e53..6a3f3ff 100644
--- a/RBLNews.Shared/Components/Controls/SwitchWithBadge.razor
+++ b/RBLNews.Shared/Components/Controls/SwitchWithBadge.razor
@@ -1,33 +1,33 @@
 @using RBLFeederCommon.Enums
 
-<Switch @ref="this._switchFilter" Label="@Text" ValueChanged="this.SwitchChanged" />
+<Switch Class="mt-3" Value="this._filter" Label="@this.Text" ValueExpression="() => this._filter" ValueChanged="SwitchChanged" />
+
 
 @code {
 
-	private Switch _switchFilter = default!;
 	private bool _filter = true;
 	
 	[Parameter]
 	public RssFeedSources Source { get; set; }
-
+	
 	[Parameter]
 	public string Text { get; set; } = "";
-
+	
 	[Parameter]
 	public bool ShowCount { get; set; }
-
+	
 	[Parameter]
 	public int Count { get; set; }
-
+	
 	[Parameter]
 	public EventCallback<RssFeedSources> OnClickedCallback { get; set; }	
 	
 	Task SwitchChanged(bool value)
 	{
 		this._filter = value;
-
+	
 		OnClickedCallback.InvokeAsync(Source);
-
+	
 		return Task.CompletedTask;
 	}
 
diff --git a/RBLNews.Shared/Components/Pages/Feeds.razor b/RBLNews.Shared/Components/Pages/Feeds.razor
index 4c37c36..ede84a6 100644
--- a/RBLNews.Shared/Components/Pages/Feeds.razor
+++ b/RBLNews.Shared/Components/Pages/Feeds.razor
@@ -126,21 +126,17 @@ else
 	}
 
 
-	private void OnClicked(RssFeedSources source)
+	private void OnClicked(RssFeedSources source, bool value)
 	{
 		if (activeFilters.Contains(source))
+		{
 			activeFilters.Remove(source);
+		}
 		else
 		{
 			activeFilters.Add(source);
 		}
 
-		if (!activeFilters.Any())
-		{
-			FeedGroups = [.. FeedDataService.Feeds.FeedGroups];
-			return;
-		}
-
 		FeedGroups = new List<FeedGroupVM>();
 		foreach (FeedGroupVM fg in FeedDataService.Feeds.FeedGroups)
 		{