diff --git a/app/controllers/api/v1/weapon_keys_controller.rb b/app/controllers/api/v1/weapon_keys_controller.rb
index cb4a641..b51ae6d 100644
--- a/app/controllers/api/v1/weapon_keys_controller.rb
+++ b/app/controllers/api/v1/weapon_keys_controller.rb
@@ -1,6 +1,11 @@
 class Api::V1::WeaponKeysController < Api::V1::ApiController
     def all
-        @raids = WeaponKeys.all()
+        conditions = {}
+        conditions[:series] = request.params['series']
+        conditions[:slot] = request.params['slot']
+        conditions[:group] = request.params['group'] unless request.params['group'].blank?
+
+        @keys = WeaponKey.where(conditions)
         render :all, status: :ok
     end
 end
\ No newline at end of file