diff --git a/app/models/card/closeable.rb b/app/models/card/closeable.rb
index 51852c9a5..e4cea509f 100644
--- a/app/models/card/closeable.rb
+++ b/app/models/card/closeable.rb
@@ -7,9 +7,9 @@ module Card::Closeable
     scope :closed, -> { joins(:closure) }
     scope :open, -> { where.missing(:closure) }
 
-    scope :recently_closed_first, -> { closed.order("closures.created_at": :desc) }
-    scope :closed_at_window, ->(window) { closed.where("closures.created_at": window) }
-    scope :closed_by, ->(users) { closed.where("closures.user_id": Array(users)) }
+    scope :recently_closed_first, -> { closed.order(closures: { created_at: :desc }) }
+    scope :closed_at_window, ->(window) { closed.where(closures: { created_at: window }) }
+    scope :closed_by, ->(users) { closed.where(closures: { user_id: Array(users) }) }
   end
 
   def closed?
diff --git a/app/models/card/stallable.rb b/app/models/card/stallable.rb
index 545cc87ee..03348dfde 100644
--- a/app/models/card/stallable.rb
+++ b/app/models/card/stallable.rb
@@ -7,7 +7,7 @@ module Card::Stallable
     has_one :activity_spike, class_name: "Card::ActivitySpike", dependent: :destroy
 
     scope :with_activity_spikes, -> { joins(:activity_spike) }
-    scope :stalled, -> { open.active.with_activity_spikes.where("card_activity_spikes.updated_at": ..STALLED_AFTER_LAST_SPIKE_PERIOD.ago, updated_at: ..STALLED_AFTER_LAST_SPIKE_PERIOD.ago) }
+    scope :stalled, -> { open.active.with_activity_spikes.where(card_activity_spikes: { updated_at: ..STALLED_AFTER_LAST_SPIKE_PERIOD.ago }, updated_at: ..STALLED_AFTER_LAST_SPIKE_PERIOD.ago) }
 
     before_update :remember_to_detect_activity_spikes
     after_update_commit :detect_activity_spikes_later, if: :should_detect_activity_spikes?
diff --git a/app/models/comment.rb b/app/models/comment.rb
index a396a904f..d0315eea8 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -10,8 +10,8 @@ class Comment < ApplicationRecord
 
   scope :chronologically, -> { order created_at: :asc, id: :desc }
   scope :preloaded, -> { with_rich_text_body.includes(reactions: :reacter) }
-  scope :by_system, -> { joins(:creator).where(creator: { role: "system" }) }
-  scope :by_user, -> { joins(:creator).where.not(creator: { role: "system" }) }
+  scope :by_system, -> { joins(:creator).where(creator: { role: :system }) }
+  scope :by_user, -> { joins(:creator).where.not(creator: { role: :system }) }
 
   after_create_commit :watch_card_by_creator
 
diff --git a/app/models/filter.rb b/app/models/filter.rb
index 9dac977bd..9bfefe176 100644
--- a/app/models/filter.rb
+++ b/app/models/filter.rb
@@ -29,7 +29,7 @@ class Filter < ApplicationRecord
       result = result.where(creator_id: creators.ids) if creators.present?
       result = result.where(board: boards.ids) if boards.present?
       result = result.tagged_with(tags.ids) if tags.present?
-      result = result.where("cards.created_at": creation_window) if creation_window
+      result = result.where(cards: { created_at: creation_window }) if creation_window
       result = result.closed_at_window(closure_window) if closure_window
       result = result.closed_by(closers) if closers.present?
       result = terms.reduce(result) do |result, term|