diff --git a/app/controllers/v3/tafsirs_controller.rb b/app/controllers/v3/tafsirs_controller.rb
index d1ac3765..80f04422 100644
--- a/app/controllers/v3/tafsirs_controller.rb
+++ b/app/controllers/v3/tafsirs_controller.rb
@@ -1,6 +1,7 @@
 class V3::TafsirsController < ApplicationController
   before_action :set_verse
   
+  # GET /chapter_id/verses/verse_number/tafsirs
   def index
     tafsirs = @verse.tafsirs
     
@@ -18,14 +19,14 @@ def chapter
   end
 
   def set_verse
-    @verse = chapter.verses.find_by_id_or_key(params[:verse_id])
+    @verse = chapter.verses.find_by_verse_number(params[:verse_id])
   end
   
   def tafirs_filter
     return nil unless params[:tafsirs].present?
 
     ResourceContent.where(id: params[:tafsirs])
-                   .or(ResourceContent.where(slug: tafsirs))
+                   .or(ResourceContent.where(slug: params[:tafsirs]))
                    .pluck(:id)
   end
 end
diff --git a/app/models/verse.rb b/app/models/verse.rb
index a87f69bb..9155ad7e 100644
--- a/app/models/verse.rb
+++ b/app/models/verse.rb
@@ -46,6 +46,6 @@ class Verse < ApplicationRecord
   default_scope { order 'verse_number asc' }
 
   def self.find_by_id_or_key(id)
-    where(id: id).or(verse_key: id).first
+    where(id: id).or(where(verse_key: id)).first
   end
 end