diff --git a/apps/electron-backend-e2e/src/category-management.e2e.ts b/apps/electron-backend-e2e/src/category-management.e2e.ts
index 84238514c..ee5c298dd 100644
--- a/apps/electron-backend-e2e/src/category-management.e2e.ts
+++ b/apps/electron-backend-e2e/src/category-management.e2e.ts
@@ -68,6 +68,7 @@ test.describe('Electron Xtream Category Management', () => {
 
             await openSources(app.mainWindow);
             await refreshSource(app.mainWindow, portalName, { confirm: true });
+            await openSources(app.mainWindow);
             await waitForSourceRowIdle(app.mainWindow, portalName);
             await sourceRowByTitle(app.mainWindow, portalName).first().click();
             await waitForXtreamWorkspaceReady(app.mainWindow);
diff --git a/apps/electron-backend-e2e/src/electron-test-fixtures.ts b/apps/electron-backend-e2e/src/electron-test-fixtures.ts
index f1ce9df92..20cd4ae23 100644
--- a/apps/electron-backend-e2e/src/electron-test-fixtures.ts
+++ b/apps/electron-backend-e2e/src/electron-test-fixtures.ts
@@ -675,9 +675,7 @@ export async function getVisibleSourceTitles(page: Page): Promise<string[]> {
     return page.locator('app-playlist-item').evaluateAll((elements) =>
         elements
             .map((element) => {
-                const titleElement = element.querySelector(
-                    '[matlistitemtitle], [matListItemTitle], .mdc-list-item__primary-text'
-                );
+                const titleElement = element.querySelector('.playlist-title');
                 return titleElement?.textContent?.trim() ?? '';
             })
             .filter((title) => title.length > 0)
diff --git a/apps/electron-backend-e2e/src/recent.e2e.ts b/apps/electron-backend-e2e/src/recent.e2e.ts
index dbe264c7b..77127fbb4 100644
--- a/apps/electron-backend-e2e/src/recent.e2e.ts
+++ b/apps/electron-backend-e2e/src/recent.e2e.ts
@@ -186,10 +186,10 @@ test.describe('Electron Recently Viewed', () => {
 
             await switchUnifiedCollectionContent(app.mainWindow, 'Live TV');
             await clearRecentItems(app.mainWindow);
+            // After clearing all items, the content toggle disappears.
+            // All content types are cleared simultaneously, so no toggle switch needed.
             await expect(channelItemByTitle(app.mainWindow, liveTitle)).toHaveCount(0);
-            await switchUnifiedCollectionContent(app.mainWindow, 'Movies');
             await expect(contentCardByTitle(app.mainWindow, movieTitle)).toHaveCount(0);
-            await switchUnifiedCollectionContent(app.mainWindow, 'Series');
             await expect(contentCardByTitle(app.mainWindow, seriesTitle)).toHaveCount(0);
         } finally {
             await closeElectronApp(app);
diff --git a/apps/stalker-mock-server/src/app/data-generator.ts b/apps/stalker-mock-server/src/app/data-generator.ts
index 2cdfeea21..842e7ae24 100644
--- a/apps/stalker-mock-server/src/app/data-generator.ts
+++ b/apps/stalker-mock-server/src/app/data-generator.ts
@@ -365,7 +365,7 @@ export function generateSeasons(
     return Array.from({ length: seasonCount }, (_, s) => {
         const seasonId = `${series.id}-s${s + 1}`;
         const episodes = Array.from({ length: episodesPerSeason }, (_, e) =>
-            `${series.id}-s${s + 1}-e${e + 1}`
+            String(e + 1)
         );
         return {
             id: seasonId,