diff --git a/lib/addic7ed_downloader/search.rb b/lib/addic7ed_downloader/search.rb
index <HASH>..<HASH> 100644
--- a/lib/addic7ed_downloader/search.rb
+++ b/lib/addic7ed_downloader/search.rb
@@ -47,10 +47,9 @@ module Addic7edDownloader
       return if results.empty?
 
       # We can refine the search with tags
-      # Only version match
       unless @tags.empty?
         results.each do |subtitle|
-          return subtitle if @tags.include?(subtitle.version) && subtitle.completed?
+          return subtitle if @tags.any? { |tag| subtitle.works_with?(tag) }
         end
       end
 
diff --git a/lib/addic7ed_downloader/subtitle.rb b/lib/addic7ed_downloader/subtitle.rb
index <HASH>..<HASH> 100644
--- a/lib/addic7ed_downloader/subtitle.rb
+++ b/lib/addic7ed_downloader/subtitle.rb
@@ -34,7 +34,7 @@ module Addic7edDownloader
     end
 
     def works_with?(tag)
-      @notes[/works? with \"?([^\"\s]+)/i, 1].downcase.include? tag.downcase
+      @version.include?(tag) || @notes[/works? with \"?([^\"\s]+)/i, 1]&.include?(tag)
     end
 
     private
We now search by version and notes for the best one