diff --git a/apps/web/src/app/xtream-tauri/category-view/category-view.component.html b/apps/web/src/app/xtream-tauri/category-view/category-view.component.html
index c94586314..4f846df56 100644
--- a/apps/web/src/app/xtream-tauri/category-view/category-view.component.html
+++ b/apps/web/src/app/xtream-tauri/category-view/category-view.component.html
@@ -9,7 +9,9 @@
                 {{
                     item.category_name || $any(item).name || 'No category name'
                 }}
-                <span class="item-count">({{ getItemCount(item) }})</span>
+                @if (showCounts()) {
+                    <span class="item-count">({{ getItemCount(item) }})</span>
+                }
             </mat-list-item>
         } @empty {
             <app-playlist-error-view
diff --git a/apps/web/src/app/xtream-tauri/category-view/category-view.component.ts b/apps/web/src/app/xtream-tauri/category-view/category-view.component.ts
index 0136e1b44..35e73073f 100644
--- a/apps/web/src/app/xtream-tauri/category-view/category-view.component.ts
+++ b/apps/web/src/app/xtream-tauri/category-view/category-view.component.ts
@@ -20,6 +20,7 @@ export class CategoryViewComponent {
     readonly items = input([]);
     readonly selectedCategoryId = input<number>();
     readonly itemCounts = input<Map<number, number>>(new Map());
+    readonly showCounts = input<boolean>(false);
 
     readonly categoryClicked = output<XtreamCategory>();
 
diff --git a/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.html b/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.html
index cee63ce9c..cb34a6c50 100644
--- a/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.html
+++ b/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.html
@@ -30,6 +30,7 @@
             [items]="categories()"
             [itemCounts]="categoryItemCounts()"
             (categoryClicked)="selectCategory($event)"
+            [showCounts]="true"
         />
     }
 </div>
diff --git a/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.ts b/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.ts
index c899b7931..11e5178b5 100644
--- a/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.ts
+++ b/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.ts
@@ -84,6 +84,13 @@ export class LiveStreamLayoutComponent implements OnInit {
     playLive(item: any) {
         const streamUrl = this.xtreamStore.constructStreamUrl(item);
         this.streamUrl = streamUrl;
+        const isEmbeddedPlayer =
+            this.player() === 'videojs' ||
+            this.player() === 'html5' ||
+            this.player() === 'artplayer';
+        if (isEmbeddedPlayer) {
+            return;
+        }
         this.xtreamStore.openPlayer(streamUrl, item.title, item.poster_url);
     }
 
diff --git a/apps/web/src/app/xtream-tauri/xtream-main-container.component.html b/apps/web/src/app/xtream-tauri/xtream-main-container.component.html
index 4b388fd1a..6c6895e60 100644
--- a/apps/web/src/app/xtream-tauri/xtream-main-container.component.html
+++ b/apps/web/src/app/xtream-tauri/xtream-main-container.component.html
@@ -18,6 +18,7 @@
         [selectedCategoryId]="selectedCategoryId()"
         [itemCounts]="categoryItemCounts()"
         (categoryClicked)="categoryClicked($event)"
+        [showCounts]="true"
     />
 </div>