diff --git a/JSMR.UI.Blazor/Components/JProduct.razor b/JSMR.UI.Blazor/Components/JProduct.razor
index beaa2e6..fa04a23 100644
--- a/JSMR.UI.Blazor/Components/JProduct.razor
+++ b/JSMR.UI.Blazor/Components/JProduct.razor
@@ -1,8 +1,10 @@
 @using JSMR.Application.VoiceWorks.Queries.Search
 @using JSMR.Domain.Enums
 @using JSMR.UI.Blazor.Enums
+@using JSMR.UI.Blazor.Filters
 @using JSMR.UI.Blazor.Services
 @using System.Globalization
+@using Microsoft.AspNetCore.WebUtilities
 
 <div class=@GetCardClasses(Product)>
     <div class="j-voice-work-image-container">
@@ -33,7 +35,8 @@
         <div class="j-tags">
             @foreach (var tag in Product.Tags)
             {
-                <div class="j-tag">@tag.Name</div>
+               @*  <div class="j-tag">@tag.Name</div> *@
+                <ProductTag Tag="tag"></ProductTag>
             }
         </div>
     </div>
@@ -73,20 +76,6 @@
                 <ProductIndicator Graphic="Graphic.Headphones" Color="ColorVarient.Blue" BackgroundColor="ColorVarient.Black"></ProductIndicator>
             }
         </BitStack>
-        @* <div class="j-product-indicators">
-            @if (Product.IsValid != true)
-            {
-                <ProductIndicator Graphic="Graphic.Warning" IconVarient="IconVarient.Fill" Color="ColorVarient.Orange" BackgroundColor="ColorVarient.Black"></ProductIndicator>
-            }
-            @if (Product.Favorite)
-            {
-                <ProductIndicator Graphic="Graphic.Star" Color="ColorVarient.Pink" BackgroundColor="ColorVarient.Black"></ProductIndicator>
-            }
-            @if (Product.HasTrial || Product.HasChobit)
-            {
-                <ProductIndicator Graphic="Graphic.Headphones" Color="ColorVarient.Blue" BackgroundColor="ColorVarient.Black"></ProductIndicator>
-            }
-        </div> *@
     </div>
 </div>
 
diff --git a/JSMR.UI.Blazor/Components/ProductTag.razor b/JSMR.UI.Blazor/Components/ProductTag.razor
new file mode 100644
index 0000000..593a4b9
--- /dev/null
+++ b/JSMR.UI.Blazor/Components/ProductTag.razor
@@ -0,0 +1,28 @@
+@using JSMR.Application.VoiceWorks.Queries.Search
+@using JSMR.UI.Blazor.Filters
+@using Microsoft.AspNetCore.WebUtilities
+
+<a class="j-tag" @onclick="@OnClick">@Tag.Name</a>
+@* <MudChip T="string" Icon="@Icons.Material.Outlined.Tag" @onclick="@OnClick" Variant="@MudBlazor.Variant.Filled" Color="@MudBlazor.Color.Surface">@Tag.Name</MudChip> *@
+
+@code {
+    [Inject]
+    protected NavigationManager NavigationManager { get; set; } = default!;
+
+    [Parameter]
+    public required VoiceWorkTagItem Tag { get; set; }
+
+    private void OnClick()
+    {
+        VoiceWorkFilterState state = new()
+        {
+            TagIds = [Tag.TagId]
+        };
+
+        //string basePath = new Uri(NavigationManager.Uri).GetLeftPart(UriPartial.Path);
+        string basePath = new Uri(NavigationManager.Uri).GetLeftPart(UriPartial.Authority);
+        string uri = QueryHelpers.AddQueryString($"{basePath}/voiceworks", state.ToQuery());
+
+        NavigationManager.NavigateTo(uri);
+    }
+}
\ No newline at end of file