diff --git a/app/assets/javascripts/components/autocomplete.js b/app/assets/javascripts/components/autocomplete.js
index 82cc4be6206..d08d95d000d 100644
--- a/app/assets/javascripts/components/autocomplete.js
+++ b/app/assets/javascripts/components/autocomplete.js
@@ -14,22 +14,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}
       selectElement: $select,
       minLength: 3,
       showAllValues: $select.multiple,
-      showNoOptionsFound: true,
-      onConfirm: function (query) {
-        let matchingOption
-        if (query) {
-          matchingOption = [].filter.call($select.options, function (option) {
-            return (option.textContent || option.innerText) === query
-          })[0]
-        } else {
-          matchingOption = [].filter.call($select.options, function (option) {
-            return option.value === ''
-          })[0]
-        }
-        if (matchingOption) {
-          matchingOption.selected = true
-        }
-      }
+      showNoOptionsFound: true
     }
 
     const assignedOptions = JSON.parse(
diff --git a/app/helpers/admin/taggable_content_helper.rb b/app/helpers/admin/taggable_content_helper.rb
index 35ae9847eb5..f68e68afee1 100644
--- a/app/helpers/admin/taggable_content_helper.rb
+++ b/app/helpers/admin/taggable_content_helper.rb
@@ -1,40 +1,34 @@
 # A bunch of helpers for efficiently generating select options for taggable
 # content, e.g. topics, organisations, etc.
 module Admin::TaggableContentHelper
-  # Returns an Array that represents the current set of taggable topical
-  # events. Each element of the array consists of two values: the name and ID
-  # of the topical event.
-  def taggable_topical_events_container
-    Rails.cache.fetch(taggable_topical_events_cache_digest, expires_in: 1.day) do
-      TopicalEvent.order(:name).map { |te| [te.name, te.id] }
+  def taggable_organisations_container(selected_ids = [])
+    cached_taggable_organisations.map do |o|
+      {
+        text: o.select_name,
+        value: o.id,
+        selected: selected_ids.include?(o.id),
+      }
     end
   end
 
-  # Returns an Array that represents the current set of taggable organisations.
-  # Each element of the array consists of two values: the select_name and the
-  # ID of the organisation
-  def taggable_organisations_container
-    Rails.cache.fetch(taggable_organisations_cache_digest, expires_in: 1.day) do
-      Organisation.with_translations.order("organisation_translations.name").map { |o| [o.select_name, o.id] }
+  def taggable_ministerial_role_appointments_container(selected_ids = [])
+    cached_taggable_ministerial_role_appointments.map do |appointment|
+      {
+        text: role_appointment_label(appointment),
+        value: appointment.id,
+        selected: selected_ids.include?(appointment.id),
+      }
     end
   end
 
-  # Returns an Array that represents the current set of taggable ministerial
-  # role appointments (both past and present). Each element of the array
-  # consists of two values: a selectable label (consisting of the person, the
-  # role, the date the role was held if it's in the past, and the organisations
-  # the person belongs to) and the ID of the role appointment.
-  def taggable_ministerial_role_appointments_container
-    Rails.cache.fetch(taggable_ministerial_role_appointments_cache_digest, expires_in: 1.day) do
-      role_appointments_container_for(RoleAppointment.for_ministerial_roles)
-    end
-  end
-
-  def taggable_needs_container
-    Rails.cache.fetch("need.linkables", expires_in: 1.minute) do
-      Services.publishing_api.get_linkables(document_type: "need").to_a.map do |need|
-        need.values_at("title", "content_id")
-      end
+  def taggable_needs_container(selected_ids)
+    Services.publishing_api.get_linkables(document_type: "need").to_a.map do |need|
+      title, content_id = need.values_at("title", "content_id")
+      {
+        text: title,
+        value: content_id,
+        selected: selected_ids.include?(content_id),
+      }
     end
   rescue GdsApi::TimedOutException, GdsApi::HTTPServerError
     stale_data = Rails.cache.fetch("need.linkables")
@@ -43,92 +37,79 @@ def taggable_needs_container
     raise
   end
 
-  # Returns an Array that represents the current set of taggable roles (both
-  # past and present). Each element of the array consists of two values: a
-  # selectable label (consisting of the person, the role, the date the role was
-  # held if it's in the past, and the organisations the person belongs to) and
-  # the ID of the role appointment.
-  def taggable_role_appointments_container
-    Rails.cache.fetch(taggable_role_appointments_cache_digest, expires_in: 1.day) do
-      role_appointments_container_for(RoleAppointment)
+  def taggable_role_appointments_container(selected_ids = [])
+    cached_taggable_role_appointments.map do |appointment|
+      {
+        text: role_appointment_label(appointment),
+        value: appointment.id,
+        selected: selected_ids.include?(appointment.id),
+      }
     end
   end
 
-  # Returns an Array that represents the taggable ministerial roles. Each
-  # element of the array consists of two values: the name of the ministerial
-  # role with the organisation and current holder and its ID.
-  def taggable_ministerial_roles_container
-    Rails.cache.fetch(taggable_ministerial_roles_cache_digest, expires_in: 1.day) do
-      MinisterialRole.with_translations.with_translations_for(:organisations).alphabetical_by_person.map do |role|
-        ["#{role.name}, #{role.organisations.map(&:name).to_sentence} (#{role.current_person_name})", role.id]
-      end
+  def taggable_detailed_guides_container(selected_ids = [])
+    cached_taggable_detailed_guides.map do |d|
+      {
+        text: d.title,
+        value: d.id,
+        selected: selected_ids.include?(d.id),
+      }
     end
   end
 
-  # Returns an Array that represents the current set of taggable detauled
-  # guides. Each element of the array consists of two values: the guide title
-  # and its ID.
-  def taggable_detailed_guides_container
-    Rails.cache.fetch(taggable_detailed_guides_cache_digest, expires_in: 1.day) do
-      DetailedGuide.alphabetical.latest_edition.active.map { |d| [d.title, d.id] }
+  def taggable_statistical_data_sets_container(selected_ids = [])
+    cached_taggable_statistical_data_sets.map do |data_set|
+      {
+        text: data_set.title,
+        value: data_set.document_id,
+        selected: selected_ids.include?(data_set.document_id),
+      }
     end
   end
 
-  # Returns an Array that represents the current set of taggable statistical
-  # data sets. Each elements of the array consists of two values: the data
-  # set title and its ID.
-  def taggable_statistical_data_sets_container
-    Rails.cache.fetch(taggable_statistical_data_sets_cache_digest, expires_in: 1.day) do
-      StatisticalDataSet.with_translations.latest_edition.map do |data_set|
-        [data_set.title, data_set.document_id]
-      end
+  def taggable_world_locations_container(selected_ids = [])
+    cached_taggable_world_locations.map do |w|
+      {
+        text: w.name,
+        value: w.id,
+        selected: selected_ids.include?(w.id),
+      }
     end
   end
 
-  # Returns an Array that represents the taggable world locations. Each element
-  # of the array consists of two values: the location name and its ID
-  def taggable_world_locations_container
-    Rails.cache.fetch(taggable_world_locations_cache_digest, expires_in: 1.day) do
-      WorldLocation.ordered_by_name.where(active: true).map { |w| [w.name, w.id] }
+  def taggable_roles_container(selected_ids = [])
+    cached_taggable_roles.map do |w|
+      {
+        text: w.name,
+        value: w.id,
+        selected: selected_ids.include?(w.id),
+      }
     end
   end
 
-  # Returns an Array that represents the taggable roles. Each element of the
-  # array consists of two values: the role name and its ID
-  def taggable_roles_container
-    Rails.cache.fetch(taggable_roles_cache_digest, expires_in: 1.day) do
-      Role.order(:name).map { |w| [w.name, w.id] }
+  def taggable_alternative_format_providers_container(selected_ids = [])
+    cached_taggable_alternative_format_providers.map do |o|
+      {
+        text: "#{o.name} (#{o.alternative_format_contact_email.presence || '-'})",
+        value: o.id,
+        selected: selected_ids.include?(o.id),
+      }
     end
   end
 
-  # Returns an Array that represents the taggable alternative format providers.
-  # Each element of the array consists of two values: the label (organisation
-  # and the email address if avaiable) and the ID of the organisation.
-  def taggable_alternative_format_providers_container
-    Rails.cache.fetch(taggable_alternative_format_providers_cache_digest, expires_in: 1.day) do
-      Organisation.alphabetical.map do |o|
-        ["#{o.name} (#{o.alternative_format_contact_email.presence || '-'})", o.id]
-      end
+  def taggable_worldwide_organisations_container(selected_ids = [])
+    cached_taggable_worldwide_organisations.map do |wo|
+      {
+        text: wo.title,
+        value: wo.document.id,
+        selected: selected_ids.include?(wo.document.id),
+      }
     end
   end
 
-  # Returns an Array representing the taggable document collections and their
-  # groups. Each element of the array consists of two values: the
-  # collection/group name and the ID of the group.
-  def taggable_document_collection_groups_container
-    Rails.cache.fetch(taggable_document_collection_groups_cache_digest, expires_in: 1.day) do
-      DocumentCollection.latest_edition.alphabetical.includes(:groups).flat_map do |collection|
-        collection.groups.map { |group| ["#{collection.title} (#{group.heading})", group.id] }
-      end
-    end
-  end
-
-  # Returns an Array that represents the taggable worldwide organisations.
-  # Each element of the array consists of two values: the name of the worldwide
-  # organisation and its ID.
-  def taggable_worldwide_organisations_container
-    Rails.cache.fetch(taggable_worldwide_organisations_cache_digest, expires_in: 1.day) do
-      WorldwideOrganisation.with_translations.latest_edition.map { |wo| [wo.title, wo.document.id] }
+  def cached_taggable_organisations
+    Rails.cache.fetch(taggable_organisations_cache_digest, expires_in: 1.day) do
+      Organisation.with_translations.order("organisation_translations.name")
     end
   end
 
@@ -146,6 +127,12 @@ def taggable_organisations_cache_digest
     @taggable_organisations_cache_digest ||= calculate_digest(Organisation.order(:id), "organisations")
   end
 
+  def cached_taggable_ministerial_role_appointments
+    Rails.cache.fetch(taggable_ministerial_role_appointments_cache_digest, expires_in: 1.day) do
+      role_appointments_container_for(RoleAppointment.for_ministerial_roles)
+    end
+  end
+
   # Returns an MD5 digest representing the current set of taggable ministerial
   # role appointments. This will change if any role appointments are added or
   # changed, and also if an occupied MinisterialRole is updated.
@@ -159,6 +146,12 @@ def taggable_ministerial_role_appointments_cache_digest
     )
   end
 
+  def cached_taggable_role_appointments
+    Rails.cache.fetch(taggable_role_appointments_cache_digest, expires_in: 1.day) do
+      role_appointments_container_for(RoleAppointment)
+    end
+  end
+
   # Returns an MD5 digest representing the current set of taggable ministerial
   # role appointments. This will change if any role appointments are added or
   # changed, and also if an occupied Role is updated.
@@ -166,11 +159,10 @@ def taggable_role_appointments_cache_digest
     @taggable_role_appointments_cache_digest ||= calculate_digest(RoleAppointment.order(:id), "role-appointments")
   end
 
-  # Returns an MD5 digest representing the current set of taggable ministerial
-  # rile appointments. THis will change if any ministerial role is added or
-  # updated.
-  def taggable_ministerial_roles_cache_digest
-    @taggable_ministerial_roles_cache_digest ||= calculate_digest(MinisterialRole.order(:id), "ministerial-roles")
+  def cached_taggable_detailed_guides
+    Rails.cache.fetch(taggable_detailed_guides_cache_digest, expires_in: 1.day) do
+      DetailedGuide.alphabetical.latest_edition.active
+    end
   end
 
   # Returns an MD5 digest representing all the detailed guides. This wil change
@@ -179,24 +171,48 @@ def taggable_detailed_guides_cache_digest
     @taggable_detailed_guides_cache_digest ||= calculate_digest(Document.where(document_type: "DetailedGuide").order(:id), "detailed-guides")
   end
 
+  def cached_taggable_statistical_data_sets
+    Rails.cache.fetch(taggable_statistical_data_sets_cache_digest, expires_in: 1.day) do
+      StatisticalDataSet.with_translations.latest_edition
+    end
+  end
+
   # Returns an MD5 digest representing the taggable statistical data sets. This
   # will change if any statistical data set is added or updated.
   def taggable_statistical_data_sets_cache_digest
     @taggable_statistical_data_sets_cache_digest ||= calculate_digest(Document.where(document_type: "StatisticalDataSet").order(:id), "statistical-data-sets")
   end
 
+  def cached_taggable_world_locations
+    Rails.cache.fetch(taggable_world_locations_cache_digest, expires_in: 1.day) do
+      WorldLocation.ordered_by_name.where(active: true)
+    end
+  end
+
   # Returns an MD5 digest representing the taggable world locations. This will
   # change if any world locations are added or updated.
   def taggable_world_locations_cache_digest
     @taggable_world_locations_cache_digest ||= calculate_digest(WorldLocation.order(:id), "world-locations")
   end
 
+  def cached_taggable_roles
+    Rails.cache.fetch(taggable_roles_cache_digest, expires_in: 1.day) do
+      Role.order(:name)
+    end
+  end
+
   # Returns an MD5 digest representing the taggable roles. This will
   # change if any world locations are added or updated.
   def taggable_roles_cache_digest
     @taggable_roles_cache_digest ||= calculate_digest(Role.order(:id), "roles")
   end
 
+  def cached_taggable_alternative_format_providers
+    Rails.cache.fetch(taggable_alternative_format_providers_cache_digest, expires_in: 1.day) do
+      Organisation.alphabetical
+    end
+  end
+
   # Returns an MD5 digest representing the taggable alternative format
   # providers. This will change if any alternative format providers are
   # changed.
@@ -204,11 +220,10 @@ def taggable_alternative_format_providers_cache_digest
     @taggable_alternative_format_providers_cache_digest ||= calculate_digest(Organisation.order(:id), "alternative-format-providers")
   end
 
-  # Returns an MD5 digest representing the taggable document collection
-  # groups. This will change if any document collection or group within
-  # the collection is changed or any new ones are added.
-  def taggable_document_collection_groups_cache_digest
-    @taggable_document_collection_groups_cache_digest ||= calculate_digest(Document.where(document_type: "DocumentCollection").order(:id), "document-collection-groups")
+  def cached_taggable_worldwide_organisations
+    Rails.cache.fetch(taggable_worldwide_organisations_cache_digest, expires_in: 1.day) do
+      WorldwideOrganisation.with_translations.latest_edition
+    end
   end
 
   # Returns an MD5 digest representing the taggable worldwide organisations. This
@@ -229,7 +244,7 @@ def role_appointments_container_for(scope)
       .includes(:person)
       .with_translations_for(:organisations)
       .with_translations_for(:role)
-      .ascending_start_date.map { |appointment| [role_appointment_label(appointment), appointment.id] }
+      .ascending_start_date
   end
 
   def role_appointment_label(appointment)
diff --git a/app/views/admin/corporate_information_pages/_standard_fields.html.erb b/app/views/admin/corporate_information_pages/_standard_fields.html.erb
index 7dc4567818c..355422842f1 100644
--- a/app/views/admin/corporate_information_pages/_standard_fields.html.erb
+++ b/app/views/admin/corporate_information_pages/_standard_fields.html.erb
@@ -8,7 +8,7 @@
       name: "edition[corporate_information_page_type_id]",
       label: "Type",
       heading_size: "l",
-      error_message: errors_for_input(edition.errors, :corporate_information_page_type_id),
+      error_items: errors_for(edition.errors, :corporate_information_page_type_id),
       include_blank: true,
       options: corporate_information_page_types(@organisation).map do |type, value|
         {
diff --git a/app/views/admin/detailed_guides/_form.html.erb b/app/views/admin/detailed_guides/_form.html.erb
index 8f7a5ba0ce4..5e6f952d45f 100644
--- a/app/views/admin/detailed_guides/_form.html.erb
+++ b/app/views/admin/detailed_guides/_form.html.erb
@@ -19,14 +19,12 @@
           id: "edition_related_detailed_guide_ids",
           name: "edition[related_detailed_guide_ids][]",
           error_items: errors_for(edition.errors, :related_detailed_guide_ids),
-          label: {
-            text: "Related guides",
-            heading_size: "m",
-          },
+          include_blank: true,
+          label: "Related guides",
+          heading_size: "m",
+          options: taggable_detailed_guides_container(edition.related_detailed_guide_ids),
           select: {
-            options: [""] + taggable_detailed_guides_container,
             multiple: true,
-            selected: edition.related_detailed_guide_ids,
           },
         } %>
       <% end %>
diff --git a/app/views/admin/editionable_social_media_accounts/_form.html.erb b/app/views/admin/editionable_social_media_accounts/_form.html.erb
index d20e8909e08..4fb87f71338 100644
--- a/app/views/admin/editionable_social_media_accounts/_form.html.erb
+++ b/app/views/admin/editionable_social_media_accounts/_form.html.erb
@@ -7,7 +7,7 @@
         name: "social_media_account[social_media_service_id]",
         heading_size: "l",
         include_blank: true,
-        error_message: errors_for_input(social_media_account.errors, :social_media_service_id),
+        error_items: errors_for(social_media_account.errors, :social_media_service_id),
         options: SocialMediaService.all.map do |service|
           {
             text: service.name,
diff --git a/app/views/admin/editions/_accessible_attachment_field.html.erb b/app/views/admin/editions/_accessible_attachment_field.html.erb
index 1b1ae33c8d2..3d4e9f98091 100644
--- a/app/views/admin/editions/_accessible_attachment_field.html.erb
+++ b/app/views/admin/editions/_accessible_attachment_field.html.erb
@@ -11,7 +11,11 @@
 
       <select name="edition[alternative_format_provider_id]" id="edition_alternative_format_provider_id" class="govuk-select" aria-describedby="alternative-format-provider-hint">
         <option></option>
-        <% taggable_alternative_format_providers_container.each do |name, id| %>
+        <%
+          taggable_alternative_format_providers_container.each do |hash|
+            name = hash[:text]
+            id = hash[:value]
+        %>
           <option
             value="<%= id %>"
             <%= "disabled='disabled'" if name.end_with?("(-)") %>
diff --git a/app/views/admin/editions/_appointment_fields.html.erb b/app/views/admin/editions/_appointment_fields.html.erb
index a0092681406..e4ecf77e9b0 100644
--- a/app/views/admin/editions/_appointment_fields.html.erb
+++ b/app/views/admin/editions/_appointment_fields.html.erb
@@ -2,14 +2,12 @@
   <%= render "components/autocomplete", {
     id: "edition_role_appointment_ids",
     name: "edition[role_appointment_ids][]",
-    label: {
-      text: "Ministers",
-      heading_size: "m",
-    },
+    include_blank: true,
+    label: "Ministers",
+    heading_size: "m",
+    options: taggable_ministerial_role_appointments_container(edition.role_appointment_ids),
     select: {
-      options: [""] + taggable_ministerial_role_appointments_container,
       multiple: true,
-      selected: edition.role_appointment_ids,
     },
   } %>
 <% end %>
diff --git a/app/views/admin/editions/_operational_field_fields.html.erb b/app/views/admin/editions/_operational_field_fields.html.erb
index 6e2cf7c925d..3f62ae84ea8 100644
--- a/app/views/admin/editions/_operational_field_fields.html.erb
+++ b/app/views/admin/editions/_operational_field_fields.html.erb
@@ -3,7 +3,7 @@
   label: "Field of operation (required)",
   name: "edition[operational_field_id]",
   heading_size: "l",
-  error_message: errors_for_input(edition.errors, :operational_field_id),
+  error_items: errors_for(edition.errors, :operational_field_id),
   include_blank: true,
   options: OperationalField.all.map do |operation|
     {
diff --git a/app/views/admin/editions/_organisation_fields.html.erb b/app/views/admin/editions/_organisation_fields.html.erb
index 9479994c4c3..dbf8d3156d2 100644
--- a/app/views/admin/editions/_organisation_fields.html.erb
+++ b/app/views/admin/editions/_organisation_fields.html.erb
@@ -16,13 +16,7 @@
               label: "Lead organisation #{index + 1}",
               heading_size: "s",
               include_blank: true,
-              options: taggable_organisations_container.map do |name, id|
-              {
-                text: name,
-                value: id,
-                selected: id == lead_organisation_id,
-              }
-             end,
+              options: taggable_organisations_container([lead_organisation_id]),
           } %>
         <% end %>
       <% end %>
@@ -32,14 +26,12 @@
       <%= render "components/autocomplete", {
         id: "edition_supporting_organisation_ids",
         name: "edition[supporting_organisation_ids][]",
-        label: {
-          text: "Supporting organisations",
-          heading_size: "m",
-        },
+        include_blank: true,
+        label: "Supporting organisations",
+        heading_size: "m",
+        options: taggable_organisations_container(edition.edition_organisations.reject(&:lead?).map(&:organisation_id)),
         select: {
           multiple: true,
-          selected: edition.edition_organisations.reject(&:lead?).map(&:organisation_id),
-          options: [""] + taggable_organisations_container,
         },
       } %>
     <% end %>
diff --git a/app/views/admin/editions/_role_fields.html.erb b/app/views/admin/editions/_role_fields.html.erb
index 9ad4b96ca2b..526e7b6dfc4 100644
--- a/app/views/admin/editions/_role_fields.html.erb
+++ b/app/views/admin/editions/_role_fields.html.erb
@@ -5,14 +5,11 @@
     id: "edition_roles",
     name: "edition[role_ids][]",
     error_items: errors_for(edition.errors, :roles),
-    label: {
-      text: "Roles" + "#{' (required)' if required}",
-      heading_size: "m",
-    },
+    label: "Roles" + "#{' (required)' if required}",
+    heading_size: "m",
+    options: taggable_roles_container(edition.role_ids),
     select: {
-      options: taggable_roles_container,
       multiple: true,
-      selected: edition.role_ids,
     },
   } %>
 <% end %>
diff --git a/app/views/admin/editions/_statistical_data_set_fields.html.erb b/app/views/admin/editions/_statistical_data_set_fields.html.erb
index 005c515efe7..d7ed8548f35 100644
--- a/app/views/admin/editions/_statistical_data_set_fields.html.erb
+++ b/app/views/admin/editions/_statistical_data_set_fields.html.erb
@@ -2,14 +2,12 @@
   <%= render "components/autocomplete", {
     id: "edition_statistical_data_set_document_ids",
     name: "edition[statistical_data_set_document_ids][]",
-    label: {
-      text: "Statistical data sets",
-      heading_size: "m",
-    },
+    include_blank: true,
+    label: "Statistical data sets",
+    heading_size: "m",
+    options: taggable_statistical_data_sets_container(edition.statistical_data_set_document_ids),
     select: {
-      options: [""] + taggable_statistical_data_sets_container,
       multiple: true,
-      selected: edition.statistical_data_set_document_ids,
     },
   } %>
 <% end %>
diff --git a/app/views/admin/editions/_topical_event_fields.html.erb b/app/views/admin/editions/_topical_event_fields.html.erb
index 5c8715e6287..dda24277b82 100644
--- a/app/views/admin/editions/_topical_event_fields.html.erb
+++ b/app/views/admin/editions/_topical_event_fields.html.erb
@@ -2,14 +2,18 @@
   <%= render "components/autocomplete", {
     id: "edition_topical_event_ids",
     name: "edition[topical_event_ids][]",
-    label: {
-      text: "Topical events",
-      heading_size: "m",
-    },
+    include_blank: true,
+    label: "Topical events",
+    heading_size: "m",
+    options: TopicalEvent.order(:name).map do |topical_event|
+      {
+        text: topical_event.name,
+        value: topical_event.id,
+        selected: edition.topical_event_ids.include?(topical_event.id),
+      }
+    end,
     select: {
-      options: [""] + TopicalEvent.order(:name).map { |topical_event| [topical_event.name, topical_event.id]},
       multiple: true,
-      selected: edition.topical_event_ids,
     },
   } %>
 <% end %>
diff --git a/app/views/admin/editions/_world_location_fields.html.erb b/app/views/admin/editions/_world_location_fields.html.erb
index 5028deab10e..99c65083df9 100644
--- a/app/views/admin/editions/_world_location_fields.html.erb
+++ b/app/views/admin/editions/_world_location_fields.html.erb
@@ -5,14 +5,11 @@
     id: "edition_world_locations",
     name: "edition[world_location_ids][]",
     error_items: errors_for(edition.errors, :world_locations),
-    label: {
-      text: "World locations" + "#{' (required)' if required}",
-      heading_size: "m",
-    },
+    label: "World locations" + "#{' (required)' if required}",
+    heading_size: "m",
+    options: taggable_world_locations_container(edition.world_location_ids),
     select: {
-      options: taggable_world_locations_container,
       multiple: true,
-      selected: edition.world_location_ids,
     },
   } %>
 <% end %>
diff --git a/app/views/admin/editions/_worldwide_organisation_fields.html.erb b/app/views/admin/editions/_worldwide_organisation_fields.html.erb
index abc282edc76..1e47fcb3baf 100644
--- a/app/views/admin/editions/_worldwide_organisation_fields.html.erb
+++ b/app/views/admin/editions/_worldwide_organisation_fields.html.erb
@@ -5,14 +5,12 @@
     id: "edition_worldwide_organisation_document_ids",
     name: "edition[worldwide_organisation_document_ids][]",
     error_items: errors_for(edition.errors, :worldwide_organisations),
-    label: {
-      text:  "Worldwide organisations" + "#{' (required)' if required}",
-      heading_size: "m",
-    },
+    include_blank: true,
+    label: "Worldwide organisations" + "#{' (required)' if required}",
+    heading_size: "m",
+    options: taggable_worldwide_organisations_container(edition.worldwide_organisation_document_ids),
     select: {
-      options: [""] + taggable_worldwide_organisations_container,
       multiple: true,
-      selected: edition.worldwide_organisation_document_ids,
     },
   } %>
 <% end %>
diff --git a/app/views/admin/historical_accounts/_form.html.erb b/app/views/admin/historical_accounts/_form.html.erb
index 79166abc9f0..d8de23ea5b6 100644
--- a/app/views/admin/historical_accounts/_form.html.erb
+++ b/app/views/admin/historical_accounts/_form.html.erb
@@ -20,19 +20,17 @@
         id: "historical_account_political_parties",
         name: "historical_account[political_party_ids][]",
         error_items: errors_for(historical_account.errors, :political_parties),
-        label: {
-          text: "Political parties (required)",
-          heading_size: "l",
-        },
+        label: "Political parties (required)",
+        heading_size: "l",
+        options: PoliticalParty.all.map do |party|
+          {
+            text: party.name,
+            value: party.id,
+            selected: historical_account.political_party_ids.include?(party.id),
+          }
+        end,
         select: {
-          options: PoliticalParty.all.map do |party|
-            [
-              party.name,
-              party.id,
-            ]
-          end,
           multiple: true,
-          selected: historical_account.political_party_ids,
         },
       } %>
 
diff --git a/app/views/admin/needs/edit.html.erb b/app/views/admin/needs/edit.html.erb
index e8927bc2ad2..652de78bce4 100644
--- a/app/views/admin/needs/edit.html.erb
+++ b/app/views/admin/needs/edit.html.erb
@@ -8,16 +8,12 @@
       <%= render "components/autocomplete", {
           id: "need_ids",
           name: "need_ids[]",
-          label: {
-            text: "Select associated user needs",
-            bold: true,
-            required: true,
-          },
+          include_blank: true,
+          label: "Select associated user needs",
           heading_size: "l",
+          options: taggable_needs_container(@document.need_ids),
           select: {
-            options: [""] + taggable_needs_container,
             multiple: true,
-            selected: @document.need_ids,
           },
       } %>
 
diff --git a/app/views/admin/news_articles/_news_article_type_fields.html.erb b/app/views/admin/news_articles/_news_article_type_fields.html.erb
index e9aaf73fce0..eece63b7e85 100644
--- a/app/views/admin/news_articles/_news_article_type_fields.html.erb
+++ b/app/views/admin/news_articles/_news_article_type_fields.html.erb
@@ -5,7 +5,7 @@
     label: "News article type (required)",
     heading_size: "l",
     value: edition.news_article_type_id,
-    error_message: errors_for_input(edition.errors, :news_article_type_id),
+    error_items: errors_for(edition.errors, :news_article_type_id),
     include_blank: true,
     options: NewsArticleType.all.map do |type|
       {
diff --git a/app/views/admin/organisations/_closed_fields.html.erb b/app/views/admin/organisations/_closed_fields.html.erb
index 6b70dd52b1d..c0d44aab37c 100644
--- a/app/views/admin/organisations/_closed_fields.html.erb
+++ b/app/views/admin/organisations/_closed_fields.html.erb
@@ -3,7 +3,7 @@
   name: "organisation[govuk_closed_status]",
   id: "organisation_govuk_closed_status",
   heading_size: "m",
-  error_message: errors_for_input(organisation.errors, :govuk_closed_status),
+  error_items: errors_for(organisation.errors, :govuk_closed_status),
   include_blank: true,
   options: [
     {
@@ -47,20 +47,18 @@
 <%= render "components/autocomplete", {
   id: "organisation_superseding_organisation_ids",
   name: "organisation[superseding_organisation_ids][]",
-  label: {
-    text: "Superseding organisations",
-    heading_size: "m",
-  },
+  include_blank: true,
+  label: "Superseding organisations",
+  heading_size: "m",
+  options: (Organisation.with_translations(:en) - [organisation]).map do |org|
+              {
+                text: org.name,
+                value: org.id,
+                selected: organisation.superseding_organisation_ids.include?(org.id),
+              }
+            end,
   select: {
-    options: [""] +
-      (Organisation.with_translations(:en) - [organisation]).map do |org|
-        [
-          org.name,
-          org.id,
-        ]
-      end,
     multiple: true,
-    selected: organisation.superseding_organisation_ids,
   },
 } %>
 
diff --git a/app/views/admin/organisations/_form.html.erb b/app/views/admin/organisations/_form.html.erb
index c1676e692e3..7cf2e94aaaf 100644
--- a/app/views/admin/organisations/_form.html.erb
+++ b/app/views/admin/organisations/_form.html.erb
@@ -42,7 +42,7 @@
     name: "organisation[organisation_logo_type_id]",
     id: "organisation_organisation_logo_type_id",
     heading_size: "l",
-    error_message: errors_for_input(organisation.errors, :organisation_logo_type_id),
+    error_items: errors_for(organisation.errors, :organisation_logo_type_id),
     include_blank: true,
     options: OrganisationLogoType.all.map do |logo_type|
       {
@@ -77,7 +77,7 @@
     name: "organisation[organisation_brand_colour_id]",
     id: "organisation_organisation_brand_colour_id",
     heading_size: "l",
-    error_message: errors_for_input(organisation.errors, :organisation_brand_colour_id),
+    error_items: errors_for(organisation.errors, :organisation_brand_colour_id),
     include_blank: true,
     options: OrganisationBrandColour.all.map do |brand_colour|
       {
@@ -122,7 +122,7 @@
     name: "organisation[organisation_type_key]",
     id: "organisation_organisation_type_key",
     heading_size: "l",
-    error_message: errors_for_input(organisation.errors, :organisation_type_key),
+    error_items: errors_for(organisation.errors, :organisation_type_key),
     include_blank: true,
     options: OrganisationType.in_listing_order.map do |type|
       {
@@ -241,20 +241,17 @@
     <%= render "components/autocomplete", {
       id: "organisation_parent_organisation_ids",
       name: "organisation[parent_organisation_ids][]",
-      label: {
-        text: "Sponsoring organisations",
-        heading_size: "m",
-      },
+      label: "Sponsoring organisations",
+      heading_size: "m",
+      options: (Organisation.with_translations(:en) - [organisation]).map do |org|
+                  {
+                    text: org.name,
+                    value: org.id,
+                    selected: organisation.parent_organisation_ids.include?(org.id),
+                  }
+                end,
       select: {
-        options: [""] +
-          (Organisation.with_translations(:en) - [organisation]).map do |org|
-            [
-              org.name,
-              org.id,
-            ]
-          end,
         multiple: true,
-        selected: organisation.parent_organisation_ids,
       },
     } %>
 
diff --git a/app/views/admin/publications/_publication_type_fields.html.erb b/app/views/admin/publications/_publication_type_fields.html.erb
index f8da8ed1684..31d15ebb207 100644
--- a/app/views/admin/publications/_publication_type_fields.html.erb
+++ b/app/views/admin/publications/_publication_type_fields.html.erb
@@ -5,7 +5,7 @@
     label: "Publication type (required)",
     heading_size: "l",
     value: edition.publication_type_id,
-    error_message: errors_for_input(edition.errors, :publication_type_id),
+    error_items: errors_for(edition.errors, :publication_type_id),
     include_blank: true,
     grouped_options: [
       [
diff --git a/app/views/admin/role_appointments/_form.html.erb b/app/views/admin/role_appointments/_form.html.erb
index 51b31d385e3..32319da887a 100644
--- a/app/views/admin/role_appointments/_form.html.erb
+++ b/app/views/admin/role_appointments/_form.html.erb
@@ -14,7 +14,7 @@
       form.object.new_record? || option[:selected]
     end,
   include_blank: form.object.new_record?,
-  error_message: errors_for_input(form.object.errors, :person_id),
+  error_items: errors_for(form.object.errors, :person_id),
 } %>
 
 <% if form.object.new_record? %>
diff --git a/app/views/admin/roles/_form.html.erb b/app/views/admin/roles/_form.html.erb
index 1add094a7f3..d77a00bee8b 100644
--- a/app/views/admin/roles/_form.html.erb
+++ b/app/views/admin/roles/_form.html.erb
@@ -31,13 +31,17 @@
 
   <%= render "components/autocomplete", {
     id: "role_organisation_ids",
-    label: {
-      text: "Organisations",
-      heading_size: "l",
-    },
+    label: "Organisations",
+    heading_size: "l",
     name: "role[organisation_ids][]",
+    options: Organisation.with_translations(:en).map do |org|
+      {
+        text: org.select_name,
+        value: org.id,
+        selected: role.organisation_ids.include?(org.id),
+      }
+    end,
     select: {
-      options:  options_from_collection_for_select(Organisation.with_translations(:en), "id", "select_name", role.organisation_ids),
       multiple: true,
     },
   } %>
diff --git a/app/views/admin/social_media_accounts/_form.html.erb b/app/views/admin/social_media_accounts/_form.html.erb
index 47c59c7d502..290820cccaf 100644
--- a/app/views/admin/social_media_accounts/_form.html.erb
+++ b/app/views/admin/social_media_accounts/_form.html.erb
@@ -8,7 +8,7 @@
           name: "social_media_account[social_media_service_id]",
           heading_size: "l",
           include_blank: true,
-          error_message: errors_for_input(social_media_account.errors, :social_media_service_id),
+          error_items: errors_for(social_media_account.errors, :social_media_service_id),
           options: SocialMediaService.all.map do |service|
             {
               text: service.name,
diff --git a/app/views/admin/speeches/_speaker_select_field.html.erb b/app/views/admin/speeches/_speaker_select_field.html.erb
index 446abfc4ecb..f8e94aa9b9d 100644
--- a/app/views/admin/speeches/_speaker_select_field.html.erb
+++ b/app/views/admin/speeches/_speaker_select_field.html.erb
@@ -3,14 +3,8 @@
     id: "edition_role_appointment_id",
     name: "edition[role_appointment_id]",
     label: "",
-    error_message: errors_for_input(edition.errors, :role_appointment_id),
+    error_items: errors_for(edition.errors, :role_appointment_id),
     include_blank: true,
-    options: taggable_role_appointments_container.map do |speaker, value|
-      {
-        text: speaker,
-        value: value,
-        selected: value == edition.role_appointment_id,
-      }
-    end,
+    options: taggable_role_appointments_container([edition.role_appointment_id]),
   } %>
 <% end %>
diff --git a/app/views/admin/speeches/_speech_type_fields.html.erb b/app/views/admin/speeches/_speech_type_fields.html.erb
index 460ed59bdb0..05ffea0b040 100644
--- a/app/views/admin/speeches/_speech_type_fields.html.erb
+++ b/app/views/admin/speeches/_speech_type_fields.html.erb
@@ -5,7 +5,7 @@
     label: "Speech type",
     heading_size: "l",
     value: edition.speech_type_id,
-    error_message: errors_for_input(edition.errors, :speech_type_id),
+    error_items: errors_for(edition.errors, :speech_type_id),
     include_blank: true,
     options: SpeechType.primary.map do |type|
       {
diff --git a/app/views/admin/statistics_announcements/_form.html.erb b/app/views/admin/statistics_announcements/_form.html.erb
index 031dc992a45..572d9c63e35 100644
--- a/app/views/admin/statistics_announcements/_form.html.erb
+++ b/app/views/admin/statistics_announcements/_form.html.erb
@@ -53,13 +53,17 @@
 
   <%= render "components/autocomplete", {
     id: "statistics_announcement_organisations",
-    label: {
-      text: "Organisations (required)",
-      heading_size: "l",
-    },
+    label: "Organisations (required)",
+    heading_size: "l",
     name: "statistics_announcement[organisation_ids][]",
+    options: Organisation.with_translations.order("organisation_translations.name").map do |org|
+      {
+        text: org.select_name,
+        value: org.id,
+        selected: statistics_announcement.organisation_ids.include?(org.id),
+      }
+    end,
     select: {
-      options:  options_from_collection_for_select(Organisation.with_translations.order("organisation_translations.name"), "id", "name", statistics_announcement.organisation_ids),
       multiple: true,
     },
     error_items: errors_for(statistics_announcement.errors, :organisations),
diff --git a/app/views/admin/users/edit.html.erb b/app/views/admin/users/edit.html.erb
index e3d0648466d..0546d59ba8c 100644
--- a/app/views/admin/users/edit.html.erb
+++ b/app/views/admin/users/edit.html.erb
@@ -8,14 +8,18 @@
       <%= render "components/autocomplete", {
         id: "user_world_location_ids",
         name: "user[world_location_ids][]",
-        label: {
-          text: "Locations",
-          heading_size: "l",
-        },
+        include_blank: true,
+        label: "Locations",
+        heading_size: "l",
+        options: WorldLocation.all.map do |l|
+          {
+            text: l.name,
+            value: l.id,
+            selected: form.object.world_location_ids.include?(l.id),
+          }
+        end,
         select: {
           multiple: true,
-          selected: form.object.world_location_ids,
-          options: [""] + WorldLocation.all.map { |l| [l.name, l.id] },
         },
       } %>
       <div class="govuk-button-group">
diff --git a/app/views/admin/worldwide_organisation_pages/_form.html.erb b/app/views/admin/worldwide_organisation_pages/_form.html.erb
index c190607f733..7869a250d5b 100644
--- a/app/views/admin/worldwide_organisation_pages/_form.html.erb
+++ b/app/views/admin/worldwide_organisation_pages/_form.html.erb
@@ -9,7 +9,7 @@
       name: "worldwide_organisation_page[corporate_information_page_type_id]",
       label: "Type",
       heading_size: "l",
-      error_message: errors_for_input(worldwide_organisation_page.errors, :corporate_information_page_type_id),
+      error_items: errors_for(worldwide_organisation_page.errors, :corporate_information_page_type_id),
       include_blank: true,
       options: corporate_information_page_types(@worldwide_organisation).map do |type, value|
         {
diff --git a/app/views/components/_autocomplete.html.erb b/app/views/components/_autocomplete.html.erb
index d8a2efd125b..f627b22443a 100644
--- a/app/views/components/_autocomplete.html.erb
+++ b/app/views/components/_autocomplete.html.erb
@@ -1,10 +1,14 @@
 <%
   id ||= "autocomplete-#{SecureRandom.hex(4)}"
+  name ||= id
   error_id = "error-#{SecureRandom.hex(4)}"
   error_items ||= []
   aria = error_id if error_items.any?
   select ||= {}
-  autocomplete_configuration_options ||= {}
+  heading_size ||= nil
+  autocomplete_configuration_options ||= {
+    showAllValues: true,
+  }
 
   data_attributes ||= {}
   data_attributes[:module] ||= ""
@@ -12,6 +16,9 @@
   data_attributes[:module].strip!
   data_attributes.merge!(autocomplete_configuration_options:)
 
+  select_helper = GovukPublishingComponents::Presenters::SelectWithSearchHelper.new(local_assigns)
+  aria_describedby = { describedby: select_helper.describedby }
+
   root_classes = %w(app-c-autocomplete govuk-form-group)
   root_classes << "govuk-form-group--error" if error_items.any?
 %>
@@ -19,7 +26,16 @@
 <%= tag.div class: root_classes, data: data_attributes do %>
   <%= render "govuk_publishing_components/components/label", {
     html_for: id,
-  }.merge(label.symbolize_keys) %>
+    text: label,
+    heading_size:,
+  } %>
+
+  <% if select_helper.hint %>
+    <%= render "govuk_publishing_components/components/hint", {
+      id: select_helper.hint_id,
+      text: hint,
+    } %>
+  <% end %>
 
   <% if error_items.any? %>
     <%= render "govuk_publishing_components/components/error_message", {
@@ -35,10 +51,12 @@
                  class: "govuk-hint app-c-autocomplete__multiselect-instructions" %>
   <% end %>
 
-  <%= select_tag name,
-    options_for_select(select[:options], select[:selected]),
+  <%= select_tag(
+    name,
+    select_helper.options_html,
     id: id,
-    class: "govuk-select",
-    size: select[:size],
-    multiple: select[:multiple] %>
+    class: select_helper.select_classes,
+    aria: aria_describedby,
+    multiple: select[:multiple],
+  ) %>
 <% end %>
diff --git a/app/views/components/_select_with_search.html.erb b/app/views/components/_select_with_search.html.erb
index cd522555961..a8f9e59e14b 100644
--- a/app/views/components/_select_with_search.html.erb
+++ b/app/views/components/_select_with_search.html.erb
@@ -2,21 +2,14 @@
   id ||= false
   label ||= false
   name ||= id
-  is_page_heading ||= false
 
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
   heading_size = false unless shared_helper.valid_heading_size?(heading_size)
   select_helper = GovukPublishingComponents::Presenters::SelectWithSearchHelper.new(local_assigns)
-
-  aria_describedby = { describedby: select_helper.describedby }
 %>
 
 <%= content_tag :div, class: select_helper.css_classes, data: select_helper.data_attributes do %>
-  <% if is_page_heading %>
-    <%= tag.h1 label_tag(id, label, class: select_helper.label_classes, id: "#{id}_label"), class: "govuk-heading-xl" %>
-  <% else %>
-    <%= label_tag(id, label, class: select_helper.label_classes, id: "#{id}_label") %>
-  <% end %>
+  <%= label_tag(id, label, class: select_helper.label_classes, id: "#{id}_label") %>
 
   <% if select_helper.hint %>
     <%= render "govuk_publishing_components/components/hint", {
@@ -25,12 +18,12 @@
     } %>
   <% end %>
 
-  <% if select_helper.error_message %>
+  <% if select_helper.error_items.any? %>
     <%= render "govuk_publishing_components/components/error_message", {
       id: select_helper.error_id,
-      text: select_helper.error_message,
+      items: select_helper.error_items,
     } %>
   <% end %>
 
-  <%= select_tag name, select_helper.options_html, id: id, class: select_helper.select_classes, aria: aria_describedby %>
+  <%= select_tag name, select_helper.options_html, id: id, class: select_helper.select_classes, aria: select_helper.aria %>
 <% end %>
diff --git a/app/views/components/docs/autocomplete.yml b/app/views/components/docs/autocomplete.yml
index c8bc159db00..498257f7f2f 100644
--- a/app/views/components/docs/autocomplete.yml
+++ b/app/views/components/docs/autocomplete.yml
@@ -12,59 +12,95 @@ examples:
     data:
       id: autocomplete
       name: autocomplete
-      label:
-        text: Select your country
-      select:
-        options:
-          -
-            -
-          -
-            - France
-            - fr
-          -
-            - Germany
-            - de
-          -
-            - United Kingdom
-            - uk
+      label: Select your country
+      options:
+        - text: France
+          value: fr
+        - text: Germany
+          value: de
+        - text: United Kingdom
+          value: uk
+
+  with_blank_option:
+    data:
+      id: autocomplete
+      name: autocomplete
+      include_blank: true
+      label: Select your country
+      options:
+        - text: France
+          value: fr
+        - text: Germany
+          value: de
+        - text: United Kingdom
+          value: uk
+
+  with_missing_name:
+    description: If no name is provided, name defaults to the (required) value of id.
+    data:
+      id: dropdown-with-different-id-and-name
+      label: My Dropdown
+      options:
+      - text: Option one
+        value: option1
+      - text: Option two
+        value: option2
+
+  with_custom_heading_size:
+    data:
+      id: autocomplete
+      name: autocomplete
+      include_blank: true
+      label: Select your country
+      heading_size: xl
+      options:
+        - text: France
+          value: fr
+        - text: Germany
+          value: de
+        - text: United Kingdom
+          value: uk
 
   with_selected_value:
     data:
       id: autocomplete-selected
       name: autocomplete-selected
-      label:
-        text: Select your country
-        bold: true
+      label: Select your country
       hint: Only a few countries are available
-      select:
-        options:
-          -
-            - France
-            - fr
-          -
-            - Germany
-            - de
-          -
-            - United Kingdom
-            - uk
-        selected: de
+      options:
+        - text: France
+          value: fr
+        - text: Germany
+          value: de
+          selected: true
+        - text: United Kingdom
+          value: uk
+
+  with_hint:
+    description: When a hint is included the `aria-describedby` attribute of the select is included to point to the hint. When an error and a hint are present, that attribute includes the IDs of both the hint and the error.
+    data:
+      id: dropdown-with-hint
+      name: dropdown-with-hint
+      label: Choose your preferred thing
+      hint: You might need some more information here
+      hint_id: optional-hint-id
+      options:
+      - text: Something
+        value: option1
+      - text: Something else
+        value: option2
 
   with_error:
     data:
       name: autocomplete-with-error
-      label:
-        text: Autocomplete with error
-      select:
-        options:
-          -
-            - France
-            - fr
-          -
-            - Germany
-            - de
-          -
-            - United Kingdom
-            - uk
+      label: Autocomplete with error
+      options:
+        - text: France
+          value: fr
+        - text: Germany
+          value: de
+        - text: United Kingdom
+          value: uk
       error_items:
         - text: There is a problem with this input
 
@@ -72,23 +108,18 @@ examples:
     data:
       id: autocomplete-multiselect
       name: autocomplete-multiselect
-      label:
-        text: Select your country
+      label: Select your country
       select:
         multiple: true
-        options:
-          -
-            - France
-            - fr
-          -
-            - Germany
-            - de
-          -
-            - United Kingdom
-            - uk
-        selected:
-            - fr
-            - de
+      options:
+        - text: France
+          value: fr
+          selected: true
+        - text: Germany
+          value: de
+          selected: true
+        - text: United Kingdom
+          value: uk
 
   with_data_attributes:
     data:
@@ -97,39 +128,28 @@ examples:
       data_attributes:
         module: not-a-module
         loose: moose
-      label:
-        text: Select your country
-      select:
-        options:
-          -
-            -
-          -
-            - France
-            - fr
-          -
-            - Germany
-            - de
-          -
-            - United Kingdom
-            - uk
+      label: Select your country
+      options:
+        - text: France
+          value: fr
+        - text: Germany
+          value: de
+        - text: United Kingdom
+          value: uk
 
   autocomplete_with_configuration_options:
     data:
       id: autocomplete-configuration-options
       name: autocomplete-configuration-options
-      label:
-        text: Status
+      label: Status
       select:
         multiple: true
-        options:
-          -
-            - France
-            - fr
-          -
-            - Germany
-            - de
-          -
-            - United Kingdom
-            - uk
+      options:
+        - text: France
+          value: fr
+        - text: Germany
+          value: de
+        - text: United Kingdom
+          value: uk
       autocomplete_configuration_options:
         showAllValues: false
diff --git a/app/views/components/docs/select_with_search.yml b/app/views/components/docs/select_with_search.yml
index bd9f6feed93..3c5ef2b1ab1 100644
--- a/app/views/components/docs/select_with_search.yml
+++ b/app/views/components/docs/select_with_search.yml
@@ -120,6 +120,20 @@ examples:
         value: option1
       - text: Option two
         value: option2
+  with_data_attributes:
+    data:
+      id: dropdown-with-data-attributes
+      data_attributes:
+        module: not-a-module
+        loose: moose
+      label: Select your country
+      options:
+        - text: France
+          value: fr
+        - text: Germany
+          value: de
+        - text: United Kingdom
+          value: uk
   with_preselect:
     data:
       id: dropdown-with-preselect
@@ -145,12 +159,12 @@ examples:
       - text: Something else
         value: option2
   with_error:
-    description: If the user has to select an option, it is recommended that a radio button is used instead of a select, but this is not always possible. Note that `error_id` is optional, if it is not passed one will be generated automatically.
+    description: An arbitrary number of separate error items can be passed to the component.
     data:
       id: dropdown-with-error
       label: How will you be travelling to the conference?
-      error_message: Please choose an option
-      error_id: error_id
+      error_items:
+        - text: Please choose an option
       include_blank: true
       options:
       - text: Public transport
@@ -170,15 +184,3 @@ examples:
         value: option2
       - text: Option three
         value: option3
-  with_page_heading:
-    description: This adds a `h1` element with a label element inside containing the text supplied.
-    data:
-      id: select-with-page-heading
-      label: This is a page heading
-      heading_size: xl
-      is_page_heading: true
-      options:
-      - text: Option one
-        value: option1
-      - text: Option two
-        value: option2
diff --git a/lib/engines/content_block_manager/app/components/content_block_manager/content_block/document/index/filter_options_component.html.erb b/lib/engines/content_block_manager/app/components/content_block_manager/content_block/document/index/filter_options_component.html.erb
index 3f48dc5de97..d08a6a453f5 100644
--- a/lib/engines/content_block_manager/app/components/content_block_manager/content_block/document/index/filter_options_component.html.erb
+++ b/lib/engines/content_block_manager/app/components/content_block_manager/content_block/document/index/filter_options_component.html.erb
@@ -50,7 +50,7 @@
               id: "lead_organisation",
               name: "lead_organisation",
               include_blank: false,
-              options: options_for_lead_organisation,
+              options: options_for_lead_organisation([@filters[:lead_organisation]]),
             }
           ),
         },
diff --git a/lib/engines/content_block_manager/app/components/content_block_manager/content_block/document/index/filter_options_component.rb b/lib/engines/content_block_manager/app/components/content_block_manager/content_block/document/index/filter_options_component.rb
index 898d748161b..8131a37860e 100644
--- a/lib/engines/content_block_manager/app/components/content_block_manager/content_block/document/index/filter_options_component.rb
+++ b/lib/engines/content_block_manager/app/components/content_block_manager/content_block/document/index/filter_options_component.rb
@@ -17,25 +17,19 @@ def items_for_block_type
     end
   end
 
-  def all_organisations_option
+  def all_organisations_option(selected_orgs)
     {
       text: "All organisations",
       value: "",
-      selected: @filters.none? || @filters[:lead_organisation]&.empty?,
+      selected: selected_orgs.compact.empty?,
     }
   end
 
-  def taggable_organisations_options
-    helpers.taggable_organisations_container.map do |name, id|
-      {
-        text: name,
-        value: id,
-        selected: @filters.any? && @filters[:lead_organisation] == id.to_s,
-      }
-    end
+  def taggable_organisations_options(selected_orgs)
+    helpers.taggable_organisations_container(selected_orgs)
   end
 
-  def options_for_lead_organisation
-    [all_organisations_option, taggable_organisations_options].flatten
+  def options_for_lead_organisation(selected_orgs = [])
+    [all_organisations_option(selected_orgs), taggable_organisations_options(selected_orgs)].flatten
   end
 end
diff --git a/lib/engines/content_block_manager/app/views/content_block_manager/content_block/shared/_form.html.erb b/lib/engines/content_block_manager/app/views/content_block_manager/content_block/shared/_form.html.erb
index 1a090040abd..d452db3e378 100644
--- a/lib/engines/content_block_manager/app/views/content_block_manager/content_block/shared/_form.html.erb
+++ b/lib/engines/content_block_manager/app/views/content_block_manager/content_block/shared/_form.html.erb
@@ -30,16 +30,11 @@
     id: "#{parent_class}_lead_organisation",
     name: "content_block/edition[organisation_id]",
     error_items: errors_for(@form.content_block_edition.errors, "lead_organisation".to_sym),
-    label: {
-      text: "Lead organisation",
-    },
+    include_blank: true,
+    label: "Lead organisation",
+    options: taggable_organisations_container([@form.content_block_edition.edition_organisation&.organisation_id]),
     select: {
       multiple: false,
-      options: [""] + taggable_organisations_container,
-      selected: @form.content_block_edition.edition_organisation&.organisation_id,
-    },
-    autocomplete_configuration_options: {
-      showAllValues: true,
     },
   } %>
 
diff --git a/lib/engines/content_block_manager/test/components/content_block/document/index/filter_options_component_test.rb b/lib/engines/content_block_manager/test/components/content_block/document/index/filter_options_component_test.rb
index f2c35631304..7e5ece81145 100644
--- a/lib/engines/content_block_manager/test/components/content_block/document/index/filter_options_component_test.rb
+++ b/lib/engines/content_block_manager/test/components/content_block/document/index/filter_options_component_test.rb
@@ -11,9 +11,10 @@ class ContentBlockManager::ContentBlock::Document::Index::FilterOptionsComponent
     helper_mock.stubs(:content_block_manager_content_block_documents_path).returns("path")
     helper_mock.stubs(:content_block_manager_root_path).returns("path")
 
-    helper_mock.stubs(:taggable_organisations_container).returns(
-      [["Department of Placeholder", 1], ["Ministry of Example", 2]],
-    )
+    helper_mock.stubs(:taggable_organisations_container).returns([
+      { text: "Department of Placeholder", value: 1 },
+      { text: "Ministry of Example", value: 2 },
+    ])
 
     ContentBlockManager::ContentBlock::Schema.stubs(:valid_schemas).returns(%w[email_address postal_address])
   end
@@ -70,6 +71,10 @@ class ContentBlockManager::ContentBlock::Document::Index::FilterOptionsComponent
   end
 
   it "selects organisation if selected in filters" do
+    helper_mock.stubs(:taggable_organisations_container).returns([
+      { text: "Department of Placeholder", value: 1 },
+      { text: "Ministry of Example", value: 2, selected: true },
+    ])
     render_inline(
       ContentBlockManager::ContentBlock::Document::Index::FilterOptionsComponent.new(
         filters: { lead_organisation: "2" },
diff --git a/lib/govuk_publishing_components/presenters/select_with_search_helper.rb b/lib/govuk_publishing_components/presenters/select_with_search_helper.rb
index 7a939fdfed4..61fadd6e027 100644
--- a/lib/govuk_publishing_components/presenters/select_with_search_helper.rb
+++ b/lib/govuk_publishing_components/presenters/select_with_search_helper.rb
@@ -7,11 +7,9 @@ module Presenters
     class SelectWithSearchHelper
       include ActionView::Helpers::FormOptionsHelper
 
-      attr_reader :options, :selected_option
+      attr_reader :options, :selected_options, :error_id, :error_items, :aria
 
       delegate :describedby,
-               :error_id,
-               :error_message,
                :hint_id,
                :hint,
                :label_classes,
@@ -20,15 +18,19 @@ class SelectWithSearchHelper
 
       def initialize(local_assigns)
         @select_helper = SelectHelper.new(local_assigns.except(:options, :grouped_options))
+        @error_id = "error-#{SecureRandom.hex(4)}"
+        @error_items = local_assigns[:error_items] || []
+        @aria = @error_items.any? ? { describedby: @error_id } : @describedby
         @options = local_assigns[:options]
         @grouped_options = local_assigns[:grouped_options]
         @include_blank = local_assigns[:include_blank]
+        @selected_options = []
         @local_assigns = local_assigns
       end
 
       def css_classes
         classes = %w[app-c-select-with-search govuk-form-group]
-        classes << "govuk-form-group--error" if error_message
+        classes << "govuk-form-group--error" if error_items.any?
         classes
       end
 
@@ -40,15 +42,17 @@ def options_html
           blank_option_if_include_blank +
             options_for_select(
               transform_options(@options),
-              selected_option,
+              selected_options,
             )
         end
       end
 
       def data_attributes
-        {
-          "module": "select-with-search",
-        }.compact
+        data_attributes = @local_assigns[:data_attributes] || {}
+        data_attributes[:module] ||= ""
+        data_attributes[:module] << " select-with-search"
+        data_attributes[:module].strip!
+        data_attributes
       end
 
       def grouped_and_ungrouped_options_for_select(unsorted_options)
@@ -65,15 +69,15 @@ def grouped_and_ungrouped_options_for_select(unsorted_options)
         end
         single_options.flatten!
 
-        options_for_select(transform_options(single_options), selected_option) +
-          grouped_options_for_select(transform_grouped_options(grouped_options), selected_option)
+        options_for_select(transform_options(single_options), selected_options) +
+          grouped_options_for_select(transform_grouped_options(grouped_options), selected_options)
       end
 
     private
 
       def transform_options(options)
         options.map do |option|
-          @selected_option = option[:value] if option[:selected]
+          @selected_options << option[:value] if option[:selected]
           [
             option[:text],
             option[:value],
diff --git a/package.json b/package.json
index bf90ea49a09..94b7adb0f8c 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "lint:js": "eslint --cache --cache-location .cache/eslint --color --ignore-path .gitignore -- \"**/*.js\"",
     "lint:scss": "stylelint app/assets/stylesheets/",
     "lint:prettier": "prettier --cache --cache-location .cache/prettier --cache-strategy content --check -- \"**/*.{js,scss}\"",
+    "lint:prettier:fix": "prettier --write \"**/*.{js,scss}\"",
     "jasmine:prepare": "RAILS_ENV=test bundle exec rails assets:clobber assets:precompile",
     "jasmine:ci": "yarn run jasmine:prepare && yarn run jasmine-browser-runner runSpecs",
     "jasmine:browser": "yarn run jasmine:prepare && yarn run jasmine-browser-runner"
diff --git a/test/components/autocomplete_test.rb b/test/components/autocomplete_test.rb
index 2b7fe717e1c..a029a773753 100644
--- a/test/components/autocomplete_test.rb
+++ b/test/components/autocomplete_test.rb
@@ -9,17 +9,12 @@ def component_data
     {
       id: "id",
       name: "name",
-      label: {
-        text: "text",
-      },
-      select: {
-        options: [
-          [""],
-          ["France", "fr"],
-          ["Germany", "de"],
-          ["United Kingdom", "uk"],
-        ],
-      },
+      label: "text",
+      options: [
+        { text: "France", value: "fr" },
+        { text: "Germany", value: "de" },
+        { text: "United Kingdom", value: "uk" },
+      ],
     }
   end
 
@@ -29,6 +24,15 @@ def component_data
     end
   end
 
+  test "defaults the 'name' to be the same as 'id'" do
+    data_without_name = component_data.dup
+    data_without_name.delete(:name)
+    render_component(data_without_name)
+    assert_select ".app-c-autocomplete"
+    assert_select ".govuk-select[id='id'][name='id']"
+    assert_select ".govuk-label", text: "text"
+  end
+
   test "renders the basic component" do
     render_component(component_data)
     assert_select ".app-c-autocomplete"
@@ -38,9 +42,23 @@ def component_data
 
   test "renders with a selected option" do
     data = component_data
-    data[:select][:selected] = "de"
+    data[:options].first[:selected] = true
     render_component(data)
-    assert_select ".app-c-autocomplete .govuk-select option[value='de'][selected='selected']"
+    assert_select ".app-c-autocomplete .govuk-select option[value='fr'][selected='selected']"
+  end
+
+  test "renders with a blank option" do
+    data = component_data
+    data[:include_blank] = true
+    render_component(data)
+    assert_select ".app-c-autocomplete .govuk-select option[value='']"
+  end
+
+  test "passes heading size to label component" do
+    data = component_data
+    data[:heading_size] = "xl"
+    render_component(data)
+    assert_select ".govuk-label.govuk-label--xl"
   end
 
   test "renders with an error" do
@@ -56,16 +74,25 @@ def component_data
 
   test "renders in multiple mode" do
     data = component_data
+    data[:select] = {}
     data[:select][:multiple] = true
-    data[:select][:selected] = %w[fr de]
+    data[:options].first[:selected] = true
+    data[:options].last[:selected] = true
     render_component(data)
     assert_select ".app-c-autocomplete .govuk-select[multiple='multiple']"
     assert_select ".app-c-autocomplete .govuk-select option[value='fr'][selected='selected']"
-    assert_select ".app-c-autocomplete .govuk-select option[value='de'][selected='selected']"
-    assert_select ".app-c-autocomplete .govuk-select option[value='uk'][selected='selected']", false
+    assert_select ".app-c-autocomplete .govuk-select option[value='de'][selected='selected']", false
+    assert_select ".app-c-autocomplete .govuk-select option[value='uk'][selected='selected']"
+  end
+
+  test "accepts a hint" do
+    data = component_data
+    data[:hint] = "hint"
+    render_component(data)
+    assert_select ".govuk-hint", text: "hint"
   end
 
-  test "accepts data attribures" do
+  test "accepts data attributes" do
     data = component_data
     data[:data_attributes] = {
       module: "not-a-module",
diff --git a/test/integration/components/select_with_search_test.rb b/test/integration/components/select_with_search_test.rb
index c06f2b89223..78429417666 100644
--- a/test/integration/components/select_with_search_test.rb
+++ b/test/integration/components/select_with_search_test.rb
@@ -44,4 +44,20 @@ def rendered_options
       assert_equal rendered_options, %w[Cardiff Swansea]
     end
   end
+
+  test "it renders custom data attributes" do
+    load_example "with_data_attributes"
+    assert_selector ".app-c-select-with-search" do |node|
+      assert node[:'data-module'] == "not-a-module select-with-search"
+      assert node[:'data-loose'] == "moose"
+    end
+  end
+
+  test "it renders error messages" do
+    load_example "with_error"
+    assert_selector ".govuk-form-group--error"
+    assert_selector "select[name='dropdown-with-error']" do |node|
+      assert node[:'aria-describedby'] =~ /error-(.+)/
+    end
+  end
 end
diff --git a/test/unit/app/helpers/admin/taggable_content_helper_test.rb b/test/unit/app/helpers/admin/taggable_content_helper_test.rb
index 0b568e87c7e..bb5515bc059 100644
--- a/test/unit/app/helpers/admin/taggable_content_helper_test.rb
+++ b/test/unit/app/helpers/admin/taggable_content_helper_test.rb
@@ -1,28 +1,15 @@
 require "test_helper"
 
 class Admin::TaggableContentHelperTest < ActionView::TestCase
-  test "#taggable_topical_events_container returns an array of name/ID pairs for all TopicalEvents" do
-    event_a = create(:topical_event, name: "Event A")
-    event_c = create(:topical_event, name: "Event C")
-    event_b = create(:topical_event, name: "Event B")
-
-    assert_equal [
-      ["Event A", event_a.id],
-      ["Event B", event_b.id],
-      ["Event C", event_c.id],
-    ],
-                 taggable_topical_events_container
-  end
-
   test "#taggable_organisations_container returns an array of select_name/ID pairs for all Organisations" do
     organisation_c = create(:organisation, name: "Organisation C", acronym: "OC")
     organisation_b = create(:organisation, name: "Organisation B", acronym: "OB")
     organisation_a = create(:organisation, name: "Organisation A", acronym: "OA")
 
     assert_equal [
-      ["Organisation A (OA)", organisation_a.id],
-      ["Organisation B (OB)", organisation_b.id],
-      ["Organisation C (OC)", organisation_c.id],
+      { text: "Organisation A (OA)", value: organisation_a.id, selected: false },
+      { text: "Organisation B (OB)", value: organisation_b.id, selected: false },
+      { text: "Organisation C (OC)", value: organisation_c.id, selected: false },
     ],
                  taggable_organisations_container
   end
@@ -47,9 +34,9 @@ class Admin::TaggableContentHelperTest < ActionView::TestCase
     )
 
     assert_equal [
-      ["Fred Flintstone, Leader, Ministry for Rocks and Bones", current_leader_appointment.id],
-      ["Joe Rockhead, Deputy Leader, Ministry for Rocks and Bones", deputy_leader_appointment.id],
-      ["Mr. Slate, Leader (12 May 1960 to 14 May 1972), Ministry for Rocks and Bones", old_leader_appointment.id],
+      { text: "Fred Flintstone, Leader, Ministry for Rocks and Bones", value: current_leader_appointment.id, selected: false },
+      { text: "Joe Rockhead, Deputy Leader, Ministry for Rocks and Bones", value: deputy_leader_appointment.id, selected: false },
+      { text: "Mr. Slate, Leader (12 May 1960 to 14 May 1972), Ministry for Rocks and Bones", value: old_leader_appointment.id, selected: false },
     ],
                  taggable_ministerial_role_appointments_container
   end
@@ -80,9 +67,9 @@ class Admin::TaggableContentHelperTest < ActionView::TestCase
     current_leader_appointment = create(:role_appointment, role: leader, person: slate)
 
     assert_equal [
-      ["Mr. Slate, Leader, Ministry for Rocks and Bones", current_leader_appointment.id],
-      ["Joe Rockhead, Leader (12 May 2006 to 11 May 2011), Ministry for Rocks and Bones", old_leader_appointment.id],
-      ["Karen Granite, Leader (12 May 2003 to 11 May 2006), Ministry for Rocks and Bones", older_leader_appointment.id],
+      { text: "Mr. Slate, Leader, Ministry for Rocks and Bones", value: current_leader_appointment.id, selected: false },
+      { text: "Joe Rockhead, Leader (12 May 2006 to 11 May 2011), Ministry for Rocks and Bones", value: old_leader_appointment.id, selected: false },
+      { text: "Karen Granite, Leader (12 May 2003 to 11 May 2006), Ministry for Rocks and Bones", value: older_leader_appointment.id, selected: false },
     ],
                  taggable_ministerial_role_appointments_container
   end
@@ -107,30 +94,13 @@ class Admin::TaggableContentHelperTest < ActionView::TestCase
     )
 
     assert_equal [
-      ["James Brown, Minister of Funk, Ministry for Funk", minister_appointment.id],
-      ["George Clinton, Board Member, Ministry for Funk", board_member_appointment.id],
-      ["Little Richard, Minister of Funk (05 December 1932 to 14 May 1972), Ministry for Funk", old_minister_appointment.id],
+      { text: "James Brown, Minister of Funk, Ministry for Funk", value: minister_appointment.id, selected: false },
+      { text: "George Clinton, Board Member, Ministry for Funk", value: board_member_appointment.id, selected: false },
+      { text: "Little Richard, Minister of Funk (05 December 1932 to 14 May 1972), Ministry for Funk", value: old_minister_appointment.id, selected: false },
     ],
                  taggable_role_appointments_container
   end
 
-  test "#taggable_ministerial_roles_container returns an array of label/ID pairs for all the ministerial roles" do
-    create(:board_member_role)
-    minister_b = create(:ministerial_role, name: "Minister B", organisations: [create(:organisation, name: "Jazz Ministry")])
-    minister_a = create(:ministerial_role, name: "Minister A", organisations: minister_b.organisations)
-    minister_c = create(:ministerial_role, name: "Minister C", organisations: [create(:organisation, name: "Ministry of Outer Space")])
-
-    create(:role_appointment, role: minister_a, person: create(:person, forename: "Sun", surname: "Ra"))
-    create(:role_appointment, role: minister_c, person: create(:person, forename: "George", surname: "Clinton"))
-
-    assert_equal [
-      ["Minister B, Jazz Ministry (Minister B)", minister_b.id],
-      ["Minister C, Ministry of Outer Space (George Clinton)", minister_c.id],
-      ["Minister A, Jazz Ministry (Sun Ra)", minister_a.id],
-    ],
-                 taggable_ministerial_roles_container
-  end
-
   test "#taggable_detailed_guides_container returns an array of label/ID pairs for all active detailed guides" do
     guide_b = create(:published_detailed_guide, title: "Guide B")
     guide_a = create(:draft_detailed_guide, title: "Guide A")
@@ -138,9 +108,9 @@ class Admin::TaggableContentHelperTest < ActionView::TestCase
     guide_c = create(:submitted_detailed_guide, title: "Guide C")
 
     assert_equal [
-      [guide_a.title, guide_a.id],
-      [guide_b.title, guide_b.id],
-      [guide_c.title, guide_c.id],
+      { text: guide_a.title, value: guide_a.id, selected: false },
+      { text: guide_b.title, value: guide_b.id, selected: false },
+      { text: guide_c.title, value: guide_c.id, selected: false },
     ],
                  taggable_detailed_guides_container
   end
@@ -151,9 +121,9 @@ class Admin::TaggableContentHelperTest < ActionView::TestCase
     data_set3 = create(:submitted_statistical_data_set)
 
     assert_equal [
-      [data_set1.title, data_set1.document_id],
-      [data_set2.title, data_set2.document_id],
-      [data_set3.title, data_set3.document_id],
+      { text: data_set1.title, value: data_set1.document_id, selected: false },
+      { text: data_set2.title, value: data_set2.document_id, selected: false },
+      { text: data_set3.title, value: data_set3.document_id, selected: false },
     ],
                  taggable_statistical_data_sets_container
   end
@@ -165,9 +135,9 @@ class Admin::TaggableContentHelperTest < ActionView::TestCase
     create(:world_location, name: "United Kingdom", active: false)
 
     assert_equal [
-      ["Andorra", location_a.id],
-      ["Brazil", location_b.id],
-      ["Croatia", location_c.id],
+      { text: "Andorra", value: location_a.id, selected: false },
+      { text: "Brazil", value: location_b.id, selected: false },
+      { text: "Croatia", value: location_c.id, selected: false },
     ],
                  taggable_world_locations_container
   end
@@ -178,28 +148,13 @@ class Admin::TaggableContentHelperTest < ActionView::TestCase
     organisation_t = create(:organisation, alternative_format_contact_email: "lee.perry@melodica.uk", name: "Department for the Preseveration of Melodicas")
 
     assert_equal [
-      ["Department for Hair and Makeup (-)", organisation_h.id],
-      ["Department for the Preseveration of Melodicas (lee.perry@melodica.uk)", organisation_t.id],
-      ["Ministry of Strange Fruit (barry@strange-fruit.uk)", organisation_m.id],
+      { text: "Department for Hair and Makeup (-)", value: organisation_h.id, selected: false },
+      { text: "Department for the Preseveration of Melodicas (lee.perry@melodica.uk)", value: organisation_t.id, selected: false },
+      { text: "Ministry of Strange Fruit (barry@strange-fruit.uk)", value: organisation_m.id, selected: false },
     ],
                  taggable_alternative_format_providers_container
   end
 
-  test "#taggable_document_collection_groups_container returns an array of label/ID pairs for document collection groups" do
-    group1 = create(:document_collection_group, heading: "Group 1")
-    group2 = create(:document_collection_group, heading: "Group 2")
-    group3 = create(:document_collection_group, heading: "Group 3")
-    create(:document_collection, title: "Collection 1", groups: [group1])
-    create(:document_collection, title: "Collection 2", groups: [group2, group3])
-
-    assert_equal [
-      ["Collection 1 (Group 1)", group1.id],
-      ["Collection 2 (Group 2)", group2.id],
-      ["Collection 2 (Group 3)", group3.id],
-    ],
-                 taggable_document_collection_groups_container
-  end
-
   test "#taggable_ministerial_role_appointments_cache_digest changes when a role appointment is updated" do
     role_appointment = Timecop.travel 1.year.ago do
       create(:ministerial_role_appointment, started_at: 1.day.ago)