diff --git a/internal/nyaa/client.go b/internal/nyaa/client.go
index b763d94..6e85626 100644
--- a/internal/nyaa/client.go
+++ b/internal/nyaa/client.go
@@ -197,35 +197,97 @@ func (c *Client) SearchEpisode(animeTitle string, episode int) ([]Torrent, error
 		return nil, err
 	}
 
-	// Filter to torrents that match the episode number
+	// Strict filter: only return torrents that exactly match the episode
 	var filtered []Torrent
 	for _, t := range torrents {
-		if t.Episode == episode || t.Episode == 0 {
-			// Episode 0 means we couldn't parse it, include anyway
+		parsedEp := t.Episode
+		if parsedEp == 0 {
+			// Re-parse to be sure
+			parsedEp = parseEpisodeNumber(t.Title)
+		}
+		if parsedEp == episode {
 			filtered = append(filtered, t)
 		}
 	}
 
-	// If no filtered results, return all (search might be specific enough)
+	// If strict filtering returns nothing, try a more specific search
 	if len(filtered) == 0 {
-		return torrents, nil
+		// Try with episode marker formats
+		altQueries := []string{
+			fmt.Sprintf("%s E%02d", animeTitle, episode),
+			fmt.Sprintf("%s - %02d", animeTitle, episode),
+			fmt.Sprintf("%s Episode %d", animeTitle, episode),
+		}
+
+		for _, altQuery := range altQueries {
+			altTorrents, err := c.SearchAnime(altQuery)
+			if err != nil {
+				continue
+			}
+			for _, t := range altTorrents {
+				parsedEp := parseEpisodeNumber(t.Title)
+				if parsedEp == episode {
+					filtered = append(filtered, t)
+				}
+			}
+			if len(filtered) > 0 {
+				break
+			}
+		}
 	}
-	return filtered, nil
+
+	// Deduplicate by magnet link
+	seen := make(map[string]bool)
+	var deduped []Torrent
+	for _, t := range filtered {
+		if t.Magnet != "" && !seen[t.Magnet] {
+			seen[t.Magnet] = true
+			deduped = append(deduped, t)
+		} else if t.Magnet == "" && !seen[t.ViewURL] {
+			seen[t.ViewURL] = true
+			deduped = append(deduped, t)
+		}
+	}
+
+	return deduped, nil
 }
 
 // parseEpisodeNumber tries to extract episode number from torrent title
 func parseEpisodeNumber(title string) int {
+	// First, check if this is a batch/complete series (should return 0)
+	batchPatterns := []string{
+		`(?i)\b(batch|complete|全話|全\d+話)\b`,
+		`(?i)\b(\d{1,4})\s*[-~]\s*(\d{1,4})\b`, // Range like 01-12 or 01~24
+	}
+	for _, p := range batchPatterns {
+		if regexp.MustCompile(p).MatchString(title) {
+			return 0
+		}
+	}
+
+	// Patterns ordered by specificity (most specific first)
 	patterns := []*regexp.Regexp{
-		regexp.MustCompile(`(?i)[-–]\s*(\d{1,4})(?:v\d)?(?:\s|\[|$)`),    // - 01 or - 01v2
-		regexp.MustCompile(`(?i)\bE(\d{1,4})(?:v\d)?(?:\s|\[|$)`),        // E01
-		regexp.MustCompile(`(?i)S\d{1,2}E(\d{1,4})(?:v\d)?(?:\s|\[|$)`),  // S01E01
-		regexp.MustCompile(`(?i)Episode\s*(\d{1,4})(?:v\d)?(?:\s|\[|$)`), // Episode 01
-		regexp.MustCompile(`(?i)\s(\d{2,4})(?:v\d)?\s*[\[\(]`),           // 01 [quality]
+		// S01E01 format (most specific)
+		regexp.MustCompile(`(?i)S\d{1,2}E(\d{1,4})(?:v\d)?(?:\s|\[|\]|$)`),
+		// Episode 01 format
+		regexp.MustCompile(`(?i)Episode\s*(\d{1,4})(?:v\d)?(?:\s|\[|\]|$)`),
+		// - 01 format (common in fansubs like [SubGroup] Anime - 01)
+		regexp.MustCompile(`[-–]\s*(\d{1,4})(?:v\d)?(?:\s|\[|\]|$)`),
+		// E01 format (standalone)
+		regexp.MustCompile(`(?i)\bE(\d{1,4})(?:v\d)?(?:\s|\[|\]|$)`),
+		// #01 format
+		regexp.MustCompile(`#(\d{1,4})(?:v\d)?(?:\s|\[|\]|$)`),
 	}
 
 	for _, re := range patterns {
 		if matches := re.FindStringSubmatch(title); len(matches) > 1 {
-			if ep, err := strconv.Atoi(matches[1]); err == nil {
+			ep, err := strconv.Atoi(matches[1])
+			if err != nil {
+				continue
+			}
+			// Sanity check: episode numbers are typically < 2000
+			// This filters out years (2024) and resolutions (1920)
+			if ep > 0 && ep < 2000 {
 				return ep
 			}
 		}
diff --git a/internal/nyaa/client_test.go b/internal/nyaa/client_test.go
new file mode 100644
index 0000000..5f88f92
--- /dev/null
+++ b/internal/nyaa/client_test.go
@@ -0,0 +1,52 @@
+package nyaa
+
+import "testing"
+
+func TestParseEpisodeNumber(t *testing.T) {
+	tests := []struct {
+		title    string
+		expected int
+	}{
+		// Standard fansub formats
+		{"[SubsPlease] Naruto - 01 (1080p) [ABC123].mkv", 1},
+		{"[SubsPlease] Naruto - 220 (1080p) [ABC123].mkv", 220},
+		{"[Erai-raws] One Piece - 1100 [1080p][Multiple Subtitle].mkv", 1100},
+
+		// S01E01 format
+		{"Naruto S01E01 1080p WEB-DL", 1},
+		{"Attack on Titan S04E28 Final", 28},
+
+		// Episode keyword
+		{"Naruto Episode 1 [1080p]", 1},
+		{"One Piece Episode 1089", 1089},
+
+		// E01 format
+		{"Naruto E01 [1080p]", 1},
+		{"Bleach E366 Final", 366},
+
+		// Hash/number format
+		{"Anime Title #42 [720p]", 42},
+
+		// Should NOT match these (batches/complete)
+		{"[SubsPlease] Naruto (01-220) [Batch]", 0},
+		{"Naruto Complete Series 1-220", 0},
+		{"Naruto Batch 01~220", 0},
+
+		// Should NOT match resolutions/years as episodes
+		{"Naruto The Movie 2024 [1080p]", 0},
+		{"[1920x1080] Naruto Remastered", 0},
+
+		// Version numbers should be stripped
+		{"[SubsPlease] Naruto - 05v2 (1080p)", 5},
+		{"Bleach - 100v3 [720p]", 100},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.title, func(t *testing.T) {
+			got := parseEpisodeNumber(tt.title)
+			if got != tt.expected {
+				t.Errorf("parseEpisodeNumber(%q) = %d, want %d", tt.title, got, tt.expected)
+			}
+		})
+	}
+}
diff --git a/internal/streaming/handler.go b/internal/streaming/handler.go
index f9a9305..aca4392 100644
--- a/internal/streaming/handler.go
+++ b/internal/streaming/handler.go
@@ -67,11 +67,26 @@ func (h *Handler) HandleWatchPage(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Search for torrents for this episode
-	torrents, err := h.svc.SearchEpisode(anime.Title, episode)
-	if err != nil {
-		log.Printf("torrent search error: %v", err)
-		torrents = nil
+	// Build list of title variations to try
+	// Fansubs typically use English titles or romaji
+	var titles []string
+	if anime.TitleEnglish != "" {
+		titles = append(titles, anime.TitleEnglish)
+	}
+	titles = append(titles, anime.Title) // Usually romaji
+	titles = append(titles, anime.TitleSynonyms...)
+
+	// Search using title variations until we find results
+	var torrents []nyaa.Torrent
+	for _, title := range titles {
+		torrents, err = h.svc.SearchEpisode(title, episode)
+		if err != nil {
+			log.Printf("torrent search error for %q: %v", title, err)
+			continue
+		}
+		if len(torrents) > 0 {
+			break
+		}
 	}
 
 	// Filter to 1080p by default, fallback to all