diff --git a/.rubocop.yml b/.rubocop.yml
index 3a36fea1..67f93d36 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,8 +1,16 @@
 require:
   - rubocop-factory_bot
+  - rubocop-rspec_rails
+
+plugins:
   - rubocop-rails
   - rubocop-rspec
-  - rubocop-rspec_rails
+
+AllCops:
+  Exclude:
+    - 'bin/*'
+    - 'db/schema.rb'
+    - 'vendor/**/*'
 
 Metrics/AbcSize:
   Enabled: false
@@ -16,13 +24,15 @@ Metrics/PerceivedComplexity:
   Enabled: false
 Rails/BulkChangeTable:
   Enabled: false
+Rails/FilePath:
+  Enabled: false
 Rails/HasManyOrHasOneDependent:
   Enabled: false
 RSpec/ExampleLength:
   Enabled: false
 RSpec/ExampleWording:
   Enabled: false
-RSpec/FilePath:
-  Enabled: false
 RSpec/MultipleExpectations:
   Enabled: false
+RSpec/NoExpectationExample:
+  Enabled: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 4a5695ee..f8b01718 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -177,6 +177,7 @@ GEM
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
     logger (1.6.6)
     loofah (2.24.0)
       crass (~> 1.0.2)
@@ -414,7 +415,7 @@ GEM
       opentelemetry-api (~> 1.0)
     ostruct (0.6.1)
     parallel (1.26.3)
-    parser (3.3.6.0)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -507,34 +508,33 @@ GEM
       activesupport (>= 3.0.0)
       mustache (~> 1.0, >= 0.99.4)
       rspec (~> 3.0)
-    rubocop (1.69.1)
+    rubocop (1.72.1)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.36.2)
+    rubocop-ast (1.38.0)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.21.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
-    rubocop-rails (2.24.1)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-rails (2.30.0)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.29.2)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
+      rubocop (>= 1.72.1, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rspec (3.5.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.30.0)
+      rubocop (~> 1.61)
+      rubocop-rspec (~> 3, >= 3.0.1)
     ruby-progressbar (1.13.0)
     scenic (1.8.0)
       activerecord (>= 4.0.0)
diff --git a/lib/search_query_builder.rb b/lib/search_query_builder.rb
index 162e4612..1831a252 100644
--- a/lib/search_query_builder.rb
+++ b/lib/search_query_builder.rb
@@ -209,9 +209,7 @@ def self.search_filter_docs
   class << self
     attr_reader :fields
   end
-  def fields
-    self.class.fields
-  end
+  delegate :fields, to: :class
 
   # Maps operators as accepted by the parser to their SQL counterparts
   @@operators = { # rubocop:disable Style/ClassVars
diff --git a/spec/resources/card_cycle/reads_spec.rb b/spec/resources/card_cycle_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/card_cycle/reads_spec.rb
rename to spec/resources/card_cycle_resource_reads_spec.rb
diff --git a/spec/resources/card_pool/reads_spec.rb b/spec/resources/card_pool_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/card_pool/reads_spec.rb
rename to spec/resources/card_pool_resource_reads_spec.rb
diff --git a/spec/resources/card/reads_spec.rb b/spec/resources/card_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/card/reads_spec.rb
rename to spec/resources/card_resource_reads_spec.rb
diff --git a/spec/resources/card_set/reads_spec.rb b/spec/resources/card_set_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/card_set/reads_spec.rb
rename to spec/resources/card_set_resource_reads_spec.rb
diff --git a/spec/resources/card_set_type/reads_spec.rb b/spec/resources/card_set_type_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/card_set_type/reads_spec.rb
rename to spec/resources/card_set_type_resource_reads_spec.rb
diff --git a/spec/resources/card_subtype/reads_spec.rb b/spec/resources/card_subtype_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/card_subtype/reads_spec.rb
rename to spec/resources/card_subtype_resource_reads_spec.rb
diff --git a/spec/resources/card_type/reads_spec.rb b/spec/resources/card_type_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/card_type/reads_spec.rb
rename to spec/resources/card_type_resource_reads_spec.rb
diff --git a/spec/resources/decklist/reads_spec.rb b/spec/resources/decklist_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/decklist/reads_spec.rb
rename to spec/resources/decklist_resource_reads_spec.rb
diff --git a/spec/resources/faction/reads_spec.rb b/spec/resources/faction_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/faction/reads_spec.rb
rename to spec/resources/faction_resource_reads_spec.rb
diff --git a/spec/resources/format/reads_spec.rb b/spec/resources/format_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/format/reads_spec.rb
rename to spec/resources/format_resource_reads_spec.rb
diff --git a/spec/resources/illustrator/reads_spec.rb b/spec/resources/illustrator_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/illustrator/reads_spec.rb
rename to spec/resources/illustrator_resource_reads_spec.rb
diff --git a/spec/resources/printing/reads_spec.rb b/spec/resources/printing_resource_reads_spec.rb
similarity index 99%
rename from spec/resources/printing/reads_spec.rb
rename to spec/resources/printing_resource_reads_spec.rb
index a01aca7c..ddd0ace0 100644
--- a/spec/resources/printing/reads_spec.rb
+++ b/spec/resources/printing_resource_reads_spec.rb
@@ -65,7 +65,7 @@
       expect(data.pronouns).to eq(printing.pronouns)
       expect(data.pronunciation_approximation).to eq(printing.pronunciation_approximation)
       expect(data.pronunciation_ipa).to eq(printing.pronunciation_ipa)
-      expect(data.images).not_to be(nil)
+      expect(data.images).not_to be_nil
       expect(data.card_abilities).to eq(printing.card_abilities.stringify_keys)
       expect(data.latest_printing_id).to eq(printing.latest_printing_id)
       expect(data.restrictions).to eq(printing.restrictions.stringify_keys)
diff --git a/spec/resources/restriction/reads_spec.rb b/spec/resources/restriction_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/restriction/reads_spec.rb
rename to spec/resources/restriction_resource_reads_spec.rb
diff --git a/spec/resources/review/reads_spec.rb b/spec/resources/review_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/review/reads_spec.rb
rename to spec/resources/review_resource_reads_spec.rb
diff --git a/spec/resources/ruling/reads_spec.rb b/spec/resources/ruling_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/ruling/reads_spec.rb
rename to spec/resources/ruling_resource_reads_spec.rb
diff --git a/spec/resources/side/reads_spec.rb b/spec/resources/side_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/side/reads_spec.rb
rename to spec/resources/side_resource_reads_spec.rb
diff --git a/spec/resources/snapshot/reads_spec.rb b/spec/resources/snapshot_resource_reads_spec.rb
similarity index 100%
rename from spec/resources/snapshot/reads_spec.rb
rename to spec/resources/snapshot_resource_reads_spec.rb