diff --git a/app/commands/v2/discard_draft.rb b/app/commands/v2/discard_draft.rb
index deb0cd7c09..fc975b1bac 100644
--- a/app/commands/v2/discard_draft.rb
+++ b/app/commands/v2/discard_draft.rb
@@ -64,16 +64,14 @@ def increment_live_lock_version
 
       def draft
         @draft ||= ContentItem.joins(:document).find_by(
-          'documents.content_id': content_id,
-          'documents.locale': locale,
+          documents: { content_id: content_id, locale: locale },
           state: "draft",
         )
       end
 
       def live
         @live ||= ContentItem.joins(:document).find_by(
-          'documents.content_id': content_id,
-          'documents.locale': locale,
+          documents: { content_id: content_id, locale: locale },
           state: %w(published unpublished),
         )
       end
diff --git a/app/commands/v2/patch_link_set.rb b/app/commands/v2/patch_link_set.rb
index f2745e500c..c0b299d36f 100644
--- a/app/commands/v2/patch_link_set.rb
+++ b/app/commands/v2/patch_link_set.rb
@@ -136,7 +136,7 @@ def schema_validator
 
       def schema_name
         @schema_name ||= Queries::GetLatest.(
-          ContentItem.where('documents.content_id': payload[:content_id])
+          ContentItem.where(documents: { content_id: content_id })
         ).pluck(:schema_name).first
       end
     end
diff --git a/app/commands/v2/post_action.rb b/app/commands/v2/post_action.rb
index d965ce2ad9..c52dd7c074 100644
--- a/app/commands/v2/post_action.rb
+++ b/app/commands/v2/post_action.rb
@@ -43,8 +43,7 @@ def action_type
 
       def find_content_item
         content_item = ContentItem.joins(:document).find_by(
-          'documents.content_id': content_id,
-          'documents.locale': locale,
+          documents: { content_id: content_id, locale: locale },
           state: draft? ? %w(draft) : %w(published unpublished),
         )
 
diff --git a/app/commands/v2/publish.rb b/app/commands/v2/publish.rb
index 2ffcdd6ee3..778be9e339 100644
--- a/app/commands/v2/publish.rb
+++ b/app/commands/v2/publish.rb
@@ -92,8 +92,8 @@ def find_draft_content_item
 
       def already_published?
         ContentItem.joins(:document)
-          .exists?("documents.content_id": content_id,
-                   "documents.locale": locale, state: "published")
+          .exists?(documents: { content_id: content_id, locale: locale },
+                   state: "published")
       end
 
       def pessimistic_document_scope
diff --git a/app/commands/v2/put_content.rb b/app/commands/v2/put_content.rb
index eaa3548ed2..c8ed0e291d 100644
--- a/app/commands/v2/put_content.rb
+++ b/app/commands/v2/put_content.rb
@@ -174,9 +174,8 @@ def pessimistic_document_scope
       def previously_published_item
         @previously_published_item ||=
           ContentItem.joins(:document).find_by(
-            "documents.content_id": content_id,
+            documents: { content_id: content_id, locale: locale },
             state: %w(published unpublished),
-            "documents.locale": locale,
           ) || ITEM_NOT_FOUND
       end
 
diff --git a/app/commands/v2/unpublish.rb b/app/commands/v2/unpublish.rb
index 39bc256734..511d9211f1 100644
--- a/app/commands/v2/unpublish.rb
+++ b/app/commands/v2/unpublish.rb
@@ -125,8 +125,7 @@ def find_unpublishable_content_item
         end
 
         content_item = ContentItem.joins(:document).where(
-          'documents.content_id': content_id,
-          'documents.locale': locale,
+          documents: { content_id: content_id, locale: locale },
           state: allowed_states
         ).lock.first
 
@@ -140,16 +139,14 @@ def previous_item
 
       def previous_items
         @previous_items ||= ContentItem.joins(:document).where(
-          'documents.content_id': content_id,
-          'documents.locale': locale,
+          documents: { content_id: content_id, locale: locale },
           state: %w(published unpublished),
         )
       end
 
       def draft_exists?
         ContentItem.joins(:document).where(
-          'documents.content_id': content_id,
-          'documents.locale': locale,
+          documents: { content_id: content_id, locale: locale },
           state: "draft",
         ).exists?
       end
diff --git a/app/presenters/change_history_presenter.rb b/app/presenters/change_history_presenter.rb
index 7d88adb07e..30d6fde80a 100644
--- a/app/presenters/change_history_presenter.rb
+++ b/app/presenters/change_history_presenter.rb
@@ -29,9 +29,9 @@ def change_notes_for_content_item
 
     def content_item_ids
       ContentItem.joins(:document)
-                 .where('documents.content_id': content_item.content_id)
-                 .where("user_facing_version <= ?", version_number)
-                 .pluck(:id)
+        .where("documents.content_id": content_item.content_id)
+        .where("user_facing_version <= ?", version_number)
+        .pluck(:id)
     end
 
     def version_number