diff --git a/app/models/comment.rb b/app/models/comment.rb
index 493dbeb1c..73bd0b732 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -22,7 +22,7 @@ class Comment < ActiveRecord::Base
 
   scope :sort_for_moderation, -> { order(flags_count: :desc, updated_at: :desc) }
   scope :pending_flag_review, -> { where(ignored_flag_at: nil, hidden_at: nil) }
-  scope :with_ignored_flag, -> { where("ignored_flag_at IS NOT NULL AND hidden_at IS NULL") }
+  scope :with_ignored_flag, -> { where(hidden_at: nil).where.not(ignored_flag_at: nil) }
   scope :flagged, -> { where("flags_count > 0") }
 
   scope :for_render, -> { with_hidden.includes(user: :organization) }
diff --git a/app/models/debate.rb b/app/models/debate.rb
index fdf9cb6b9..0347f0edd 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -27,7 +27,7 @@ class Debate < ActiveRecord::Base
 
   scope :sort_for_moderation, -> { order(flags_count: :desc, updated_at: :desc) }
   scope :pending_flag_review, -> { where(ignored_flag_at: nil, hidden_at: nil) }
-  scope :with_ignored_flag, -> { where("ignored_flag_at IS NOT NULL AND hidden_at IS NULL") }
+  scope :with_ignored_flag, -> { where.not(ignored_flag_at: nil).where(hidden_at: nil) }
   scope :flagged, -> { where("flags_count > 0") }
   scope :for_render, -> { includes(:tags) }
   scope :sort_by_hot_score , -> { order(hot_score: :desc) }
diff --git a/app/models/organization.rb b/app/models/organization.rb
index dc340b08c..fc9b8cec1 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -7,9 +7,9 @@ class Organization < ActiveRecord::Base
 
   delegate :email, :phone_number, to: :user
 
-  scope :pending, -> { where('organizations.verified_at is null and rejected_at is null') }
-  scope :verified, -> { where("organizations.verified_at is not null and (rejected_at is null or rejected_at < organizations.verified_at)") }
-  scope :rejected, -> { where("rejected_at is not null and (organizations.verified_at is null or organizations.verified_at < rejected_at)") }
+  scope :pending, -> { where(verified_at: nil, rejected_at: nil) }
+  scope :verified, -> { where.not(verified_at: nil).where("(rejected_at IS NULL or rejected_at < organizations.verified_at)") }
+  scope :rejected, -> { where.not(rejected_at: nil).where("(organizations.verified_at IS NULL or organizations.verified_at < rejected_at)") }
 
   def verify
     update(verified_at: Time.now)
diff --git a/lib/acts_as_paranoid_aliases.rb b/lib/acts_as_paranoid_aliases.rb
index e8abab530..6fd875ef6 100644
--- a/lib/acts_as_paranoid_aliases.rb
+++ b/lib/acts_as_paranoid_aliases.rb
@@ -31,11 +31,11 @@ module ActsAsParanoidAliases
 
   module ClassMethods
     def with_confirmed_hide
-      where("confirmed_hide_at IS NOT NULL")
+      where.not(confirmed_hide_at: nil)
     end
 
     def without_confirmed_hide
-      where("confirmed_hide_at IS NULL")
+      where(confirmed_hide_at: nil)
     end
 
     def with_hidden
@@ -57,4 +57,3 @@ module ActsAsParanoidAliases
     end
   end
 end
-