diff --git a/composer.json b/composer.json
index ecfe9475a1..21c6121bf8 100644
--- a/composer.json
+++ b/composer.json
@@ -32,6 +32,7 @@
         "drupal/entity_legal": "^3.0.0-beta2",
         "drupal/error_page": "^1.0",
         "drupal/facets": "1.6.0",
+        "drupal/facets_form": "1.x-dev@dev",
         "drupal/field_delimiter": "^1.1",
         "drupal/field_group": "^3.1",
         "drupal/field_permissions": "^1.1",
@@ -283,6 +284,9 @@
                 "Facet Summary for Facet Items with a set dependency. @see https://www.drupal.org/node/2873480": "resources/patch/facet_summary_for_facet-2873480-18.patch",
                 "SA-CONTRIB-2021-008. @see https://www.drupal.org/sa-contrib-2021-008": "https://www.drupal.org/files/issues/2021-05-17/3213582-facets-1.6-1.7.patch"
             },
+            "drupal/facets_form": {
+                "Implement calculate dependencies. @see https://www.drupal.org/project/facets_form/issues/3230468": "https://git.drupalcode.org/project/facets_form/-/merge_requests/15.diff"
+            },
             "drupal/honeypot": {
                 "Behat integration. @see https://www.drupal.org/project/honeypot/issues/3059040": "https://www.drupal.org/files/issues/2020-09-09/3059040-31.patch",
                 "Provide ways to clean up old honeypot_time_restriction values @see https://www.drupal.org/project/honeypot/issues/2997609": "https://git.drupalcode.org/project/honeypot/-/merge_requests/2.diff"
diff --git a/composer.lock b/composer.lock
index afe9640863..9cbddd041e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "38c68c57b179dcfdc69537687193698d",
+    "content-hash": "0adbae751418bdc73f6ddc0a2df028c2",
     "packages": [
         {
             "name": "SEMICeu/adms-ap_validator",
@@ -3832,7 +3832,8 @@
                 },
                 "patches_applied": {
                     "Facet Summary for Facet Items with a set dependency. @see https://www.drupal.org/node/2873480": "resources/patch/facet_summary_for_facet-2873480-18.patch",
-                    "SA-CONTRIB-2021-008. @see https://www.drupal.org/sa-contrib-2021-008": "https://www.drupal.org/files/issues/2021-05-17/3213582-facets-1.6-1.7.patch"
+                    "SA-CONTRIB-2021-008. @see https://www.drupal.org/sa-contrib-2021-008": "https://www.drupal.org/files/issues/2021-05-17/3213582-facets-1.6-1.7.patch",
+                    "https://www.drupal.org/project/facets/issues/3223956": "https://git.drupalcode.org/project/facets/-/merge_requests/25.diff"
                 }
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
@@ -3869,6 +3870,63 @@
                 "irc": "irc://irc.freenode.org/drupal-search-api"
             }
         },
+        {
+            "name": "drupal/facets_form",
+            "version": "dev-1.x",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/facets_form.git",
+                "reference": "85965678f7d051c929be267cd1fd15453d556559"
+            },
+            "require": {
+                "cweagans/composer-patches": "^1.7",
+                "drupal/core": "^8.9 || ^9.1",
+                "drupal/facets": "^1.6"
+            },
+            "require-dev": {
+                "drupal/search_api": "^1.13"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "1.x-dev",
+                    "datestamp": "1629847996",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Dev releases are not covered by Drupal security advisories."
+                    }
+                },
+                "enable-patching": true,
+                "patches": {
+                    "drupal/facets": {
+                        "https://www.drupal.org/project/facets/issues/3223956": "https://git.drupalcode.org/project/facets/-/merge_requests/25.diff"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Claudiu Cristea",
+                    "homepage": "https://www.drupal.org/u/claudiucristea"
+                },
+                {
+                    "name": "Andras Szilagyi",
+                    "homepage": "https://www.drupal.org/u/andras_szilagyi"
+                }
+            ],
+            "description": "Place the facets of a given facets source in a form",
+            "homepage": "https://www.drupal.org/project/facets_form",
+            "support": {
+                "source": "https://git.drupalcode.org/project/facets_form",
+                "issues": "https://www.drupal.org/project/issues/facets_form"
+            }
+        },
         {
             "name": "drupal/field_delimiter",
             "version": "1.1.0",
@@ -19583,6 +19641,7 @@
         "dkarv/mdl-chip-input": 20,
         "drupal/cas_attributes": 20,
         "drupal/config_ignore": 20,
+        "drupal/facets_form": 20,
         "drupal/menu_link_destination": 20,
         "drupal/og": 20,
         "drupal/site_verify": 20,
diff --git a/config/sync/block.block.entity_bundle_facet.yml b/config/sync/block.block.entity_bundle_facet.yml
deleted file mode 100644
index e143fead9f..0000000000
--- a/config/sync/block.block.entity_bundle_facet.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 5d10248b-fb61-4515-b58a-97d58639df37
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.type
-  module:
-    - facets
-    - joinup_core
-  theme:
-    - joinup_theme
-id: entity_bundle_facet
-theme: joinup_theme
-region: sidebar_left
-weight: -18
-provider: null
-plugin: 'facet_block:type'
-settings:
-  id: 'facet_block:type'
-  label: 'Content types'
-  provider: facets
-  label_display: '1'
-visibility:
-  request_route:
-    id: request_route
-    routes:
-      - view.search.page_1
-    negate: false
-    context_mapping: {  }
diff --git a/config/sync/block.block.facetformviewsearchdisplaypage.yml b/config/sync/block.block.facetformviewsearchdisplaypage.yml
new file mode 100644
index 0000000000..c09b923e35
--- /dev/null
+++ b/config/sync/block.block.facetformviewsearchdisplaypage.yml
@@ -0,0 +1,37 @@
+uuid: 33e5f26c-41da-4f9b-85a8-144a7b0bfe07
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.creation_date
+    - facets.facet.group
+    - facets.facet.spatial_coverage
+    - facets.facet.topic
+    - facets.facet.type
+  module:
+    - facets_form
+    - system
+  theme:
+    - joinup_theme
+id: facetformviewsearchdisplaypage
+theme: joinup_theme
+region: sidebar_left
+weight: 0
+provider: null
+plugin: 'facets_form:search_api:views_page__search__page_1'
+settings:
+  id: 'facets_form:search_api:views_page__search__page_1'
+  label: 'Facet form: View Search, display Page'
+  provider: facets_form
+  label_display: '0'
+  button:
+    label:
+      submit: Search
+      reset: 'Clear filters'
+  facets: {  }
+visibility:
+  request_path:
+    id: request_path
+    pages: "/search\r\n/search/*"
+    negate: false
+    context_mapping: {  }
diff --git a/config/sync/block.block.group_facet.yml b/config/sync/block.block.group_facet.yml
deleted file mode 100644
index d383dd0cc3..0000000000
--- a/config/sync/block.block.group_facet.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: cf94fd0f-8d17-4fbf-9f2f-388da1a3db5b
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.group
-  module:
-    - facets
-    - joinup_core
-  theme:
-    - joinup_theme
-id: group_facet
-theme: joinup_theme
-region: sidebar_left
-weight: -17
-provider: null
-plugin: 'facet_block:group'
-settings:
-  id: 'facet_block:group'
-  label: 'Search page - Group facet'
-  provider: facets
-  label_display: '0'
-visibility:
-  request_route:
-    id: request_route
-    routes:
-      - view.search.page_1
-    negate: false
-    context_mapping: {  }
diff --git a/config/sync/block.block.spatial_coverage_facet.yml b/config/sync/block.block.spatial_coverage_facet.yml
deleted file mode 100644
index 9c056bba23..0000000000
--- a/config/sync/block.block.spatial_coverage_facet.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 1da70601-9a66-4756-9564-d4b2f3e5e81d
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.spatial_coverage
-  module:
-    - facets
-    - joinup_core
-  theme:
-    - joinup_theme
-id: spatial_coverage_facet
-theme: joinup_theme
-region: sidebar_left
-weight: -15
-provider: null
-plugin: 'facet_block:spatial_coverage'
-settings:
-  id: 'facet_block:spatial_coverage'
-  label: 'Search page - Geographical coverage facet'
-  provider: facets
-  label_display: '0'
-visibility:
-  request_route:
-    id: request_route
-    routes:
-      - view.search.page_1
-    negate: false
-    context_mapping: {  }
diff --git a/config/sync/block.block.three_dots_menu.yml b/config/sync/block.block.three_dots_menu.yml
index 0392828e5f..07ccb91c0d 100644
--- a/config/sync/block.block.three_dots_menu.yml
+++ b/config/sync/block.block.three_dots_menu.yml
@@ -2,6 +2,8 @@ uuid: 998c6074-0e67-43ac-b241-615239dee76a
 langcode: en
 status: true
 dependencies:
+  module:
+    - joinup_core
   theme:
     - joinup_theme
 id: three_dots_menu
diff --git a/config/sync/block.block.topic_facet.yml b/config/sync/block.block.topic_facet.yml
deleted file mode 100644
index 8d28878d23..0000000000
--- a/config/sync/block.block.topic_facet.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 976857e9-05a8-4454-8ec8-8974fd527045
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.topic
-  module:
-    - facets
-    - joinup_core
-  theme:
-    - joinup_theme
-id: topic_facet
-theme: joinup_theme
-region: sidebar_left
-weight: -16
-provider: null
-plugin: 'facet_block:topic'
-settings:
-  id: 'facet_block:topic'
-  label: 'Search page - Topic facet'
-  provider: facets
-  label_display: '0'
-visibility:
-  request_route:
-    id: request_route
-    routes:
-      - view.search.page_1
-    negate: false
-    context_mapping: {  }
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
index 516e8743d3..ffacc0fef9 100644
--- a/config/sync/core.extension.yml
+++ b/config/sync/core.extension.yml
@@ -43,6 +43,8 @@ module:
   eu_sic: 0
   eupl: 0
   facets: 0
+  facets_form: 0
+  facets_form_date_range: 0
   facets_summary: 0
   field: 0
   field_delimiter: 0
diff --git a/config/sync/facets.facet.creation_date.yml b/config/sync/facets.facet.creation_date.yml
new file mode 100644
index 0000000000..18d2af5bea
--- /dev/null
+++ b/config/sync/facets.facet.creation_date.yml
@@ -0,0 +1,63 @@
+uuid: d23291d8-c77d-4c38-a3ae-d6c6d900d0c3
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.published
+    - views.view.search
+  module:
+    - search_api
+id: creation_date
+name: 'Creation Date'
+url_alias: creation_date
+weight: 0
+min_count: 1
+show_only_one_result: true
+field_identifier: rdf_created
+facet_source_id: 'search_api:views_page__search__page_1'
+widget:
+  type: facets_form_date_range
+  config:
+    date_type: date
+    label:
+      from: 'Date from'
+      to: 'Date to'
+    date_format:
+      type: date_only
+      custom: ''
+    show_numbers: false
+query_operator: or
+use_hierarchy: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: true
+processor_configs:
+  active_widget_order:
+    processor_id: active_widget_order
+    weights:
+      sort: -10
+    settings:
+      sort: DESC
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: -10
+    settings:
+      sort: DESC
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: -10
+    settings:
+      sort: ASC
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: -10
+    settings: {  }
+empty_behavior:
+  behavior: none
+show_title: true
diff --git a/config/sync/facets.facet.group.yml b/config/sync/facets.facet.group.yml
index 92794194b4..5ddc191e5e 100644
--- a/config/sync/facets.facet.group.yml
+++ b/config/sync/facets.facet.group.yml
@@ -16,11 +16,12 @@ show_only_one_result: true
 field_identifier: entity_groups
 facet_source_id: 'search_api:views_page__search__page_1'
 widget:
-  type: dropdown
+  type: facets_form_dropdown
   config:
-    show_numbers: true
     default_option_label: 'Any Collection or Solution'
-    arbitrary_facet_plugin: _none
+    child_items_prefix: '-'
+    disabled_on_empty: false
+    show_numbers: true
 query_operator: or
 use_hierarchy: false
 expand_hierarchy: false
@@ -34,7 +35,7 @@ processor_configs:
     weights:
       sort: -2
     settings:
-      sort: DESC
+      sort: ASC
   aggregated_entity_reference_label:
     processor_id: aggregated_entity_reference_label
     weights:
@@ -52,7 +53,7 @@ processor_configs:
     weights:
       sort: -1
     settings:
-      sort: DESC
+      sort: ASC
   display_value_widget_order:
     processor_id: display_value_widget_order
     weights:
diff --git a/config/sync/facets.facet.spatial_coverage.yml b/config/sync/facets.facet.spatial_coverage.yml
index 054557114b..7f1e943a2d 100644
--- a/config/sync/facets.facet.spatial_coverage.yml
+++ b/config/sync/facets.facet.spatial_coverage.yml
@@ -10,17 +10,18 @@ dependencies:
 id: spatial_coverage
 name: 'Geographic coverage'
 url_alias: spatial_coverage
-weight: 0
+weight: -1
 min_count: 1
 show_only_one_result: true
 field_identifier: spatial_coverage
 facet_source_id: 'search_api:views_page__search__page_1'
 widget:
-  type: dropdown
+  type: facets_form_dropdown
   config:
-    show_numbers: true
     default_option_label: 'Any location'
-    arbitrary_facet_plugin: _none
+    child_items_prefix: '-'
+    disabled_on_empty: false
+    show_numbers: true
 query_operator: or
 use_hierarchy: false
 expand_hierarchy: false
@@ -34,36 +35,36 @@ processor_configs:
     weights:
       sort: -8
     settings:
-      sort: DESC
+      sort: ASC
   aggregated_entity_reference_label:
     processor_id: aggregated_entity_reference_label
     weights:
-      build: 0
+      build: -10
     settings: {  }
   count_limit:
     processor_id: count_limit
     weights:
-      build: -2
+      build: 5
     settings:
       minimum_items: 1
       maximum_items: null
   count_widget_order:
     processor_id: count_widget_order
     weights:
-      sort: -9
+      sort: -10
     settings:
-      sort: DESC
+      sort: ASC
   display_value_widget_order:
     processor_id: display_value_widget_order
     weights:
-      sort: -10
+      sort: -8
     settings:
       sort: ASC
   url_processor_handler:
     processor_id: url_processor_handler
     weights:
       pre_query: -10
-      build: -1
+      build: 5
     settings: {  }
 empty_behavior:
   behavior: none
diff --git a/config/sync/facets.facet.topic.yml b/config/sync/facets.facet.topic.yml
index d725759bb2..92400d080b 100644
--- a/config/sync/facets.facet.topic.yml
+++ b/config/sync/facets.facet.topic.yml
@@ -8,22 +8,23 @@ dependencies:
   module:
     - search_api
 id: topic
-name: Topic
+name: Topics
 url_alias: topic
-weight: 0
+weight: -3
 min_count: 1
 show_only_one_result: true
 field_identifier: topic
 facet_source_id: 'search_api:views_page__search__page_1'
 widget:
-  type: dropdown
+  type: facets_form_dropdown
   config:
-    show_numbers: true
     default_option_label: 'Any topic'
-    arbitrary_facet_plugin: _none
+    child_items_prefix: '-'
+    disabled_on_empty: false
+    show_numbers: false
 query_operator: or
-use_hierarchy: false
-expand_hierarchy: false
+use_hierarchy: true
+expand_hierarchy: true
 enable_parent_when_child_gets_disabled: false
 hard_limit: 0
 exclude: false
@@ -32,38 +33,38 @@ processor_configs:
   active_widget_order:
     processor_id: active_widget_order
     weights:
-      sort: -2
+      sort: -8
     settings:
-      sort: DESC
+      sort: ASC
   aggregated_entity_reference_label:
     processor_id: aggregated_entity_reference_label
     weights:
-      build: -1
+      build: 5
     settings: {  }
   count_limit:
     processor_id: count_limit
     weights:
-      build: 0
+      build: -10
     settings:
       minimum_items: 1
       maximum_items: null
   count_widget_order:
     processor_id: count_widget_order
     weights:
-      sort: -1
+      sort: -10
     settings:
-      sort: DESC
+      sort: ASC
   display_value_widget_order:
     processor_id: display_value_widget_order
     weights:
-      sort: 0
+      sort: -8
     settings:
       sort: ASC
   url_processor_handler:
     processor_id: url_processor_handler
     weights:
       pre_query: -10
-      build: -2
+      build: 5
     settings: {  }
 empty_behavior:
   behavior: none
diff --git a/config/sync/facets.facet.type.yml b/config/sync/facets.facet.type.yml
index b3f228235f..763987f5d6 100644
--- a/config/sync/facets.facet.type.yml
+++ b/config/sync/facets.facet.type.yml
@@ -8,25 +8,20 @@ dependencies:
   module:
     - search_api
 id: type
-name: Type
+name: 'Content types'
 url_alias: type
-weight: 0
+weight: -2
 min_count: 1
 show_only_one_result: false
 field_identifier: entity_bundle
 facet_source_id: 'search_api:views_page__search__page_1'
 widget:
-  type: checkbox
+  type: facets_form_dropdown
   config:
+    default_option_label: Choose
+    child_items_prefix: '-'
+    disabled_on_empty: false
     show_numbers: true
-    soft_limit: 0
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-    show_reset_link: false
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: false
-    arbitrary_facet_plugin: _none
 query_operator: or
 use_hierarchy: false
 expand_hierarchy: false
@@ -38,7 +33,7 @@ processor_configs:
   aggregated_entity_bundle_label:
     processor_id: aggregated_entity_bundle_label
     weights:
-      build: -10
+      build: 5
     settings:
       plural_count_label:
         enabled: true
@@ -46,10 +41,16 @@ processor_configs:
   count_limit:
     processor_id: count_limit
     weights:
-      build: 0
+      build: -10
     settings:
       minimum_items: 1
       maximum_items: null
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
   joinup_search_content_type_fixed_order:
     processor_id: joinup_search_content_type_fixed_order
     weights:
@@ -64,4 +65,4 @@ processor_configs:
     settings: {  }
 empty_behavior:
   behavior: none
-show_title: false
+show_title: true
diff --git a/config/sync/facets_summary.facets_summary.search_facets_summary.yml b/config/sync/facets_summary.facets_summary.search_facets_summary.yml
index e06737b2db..0675885066 100644
--- a/config/sync/facets_summary.facets_summary.search_facets_summary.yml
+++ b/config/sync/facets_summary.facets_summary.search_facets_summary.yml
@@ -10,12 +10,6 @@ dependencies:
 id: search_facets_summary
 name: 'Search facets summary'
 facets:
-  group:
-    checked: true
-    label: Collection/Solution
-    separator: ', '
-    weight: 0
-    show_count: false
   spatial_coverage:
     checked: true
     label: 'Geographic coverage'
diff --git a/config/sync/filter.format.essential_html.yml b/config/sync/filter.format.essential_html.yml
index 9bd332877e..efb030f24e 100644
--- a/config/sync/filter.format.essential_html.yml
+++ b/config/sync/filter.format.essential_html.yml
@@ -1,140 +1,58 @@
-uuid: 66d0b8e4-98a3-45d1-8091-b96a313046cb
+uuid: 5e41fc3f-ac9f-4211-89b9-b4052f4eda6e
 langcode: en
 status: true
 dependencies:
-  config:
-    - image.style.wysiwyg_full_width
-    - image.style.wysiwyg_half_width
-    - image.style.wysiwyg_one_third_width
   module:
-    - collection
-    - editor
-    - embed_block
-    - image
     - joinup_video
-    - linkit
     - media
-    - video_embed_wysiwyg
-name: 'Simple HTML'
-format: simple_html
-weight: 3
+_core:
+  default_config_hash: _EOmoFGHhTjV4rORLrzpQZv9C6rnPb8LVLDoNMqBz7Us
+name: 'Essential HTML'
+format: essential_html
+weight: 0
 filters:
   filter_url:
     id: filter_url
     provider: filter
     status: true
-    weight: -50
+    weight: -49
     settings:
       filter_url_length: 72
   filter_html:
     id: filter_html
     provider: filter
     status: true
-    weight: -49
+    weight: -48
     settings:
-      allowed_html: '<a href hreflang> <em> <i> <strong> <b> <br> <p> <ul> <li> <ol> <blockquote> <q> <img src alt data-entity-type data-entity-uuid data-image-style>'
+      allowed_html: '<a href hreflang> <em> <i> <strong> <b> <br> <p>'
       filter_html_help: false
       filter_html_nofollow: true
   filter_htmlcorrector:
     id: filter_htmlcorrector
     provider: filter
     status: true
-    weight: -48
-    settings: {  }
-  collection_glossary:
-    id: collection_glossary
-    provider: collection
-    status: false
-    weight: -43
-    settings: {  }
-  editor_file_reference:
-    id: editor_file_reference
-    provider: editor
-    status: true
-    weight: -46
-    settings: {  }
-  embed_block:
-    id: embed_block
-    provider: embed_block
-    status: false
-    weight: -42
-    settings: {  }
-  filter_html_image_secure:
-    id: filter_html_image_secure
-    provider: filter
-    status: true
-    weight: -47
-    settings: {  }
-  filter_html_escape:
-    id: filter_html_escape
-    provider: filter
-    status: false
-    weight: -44
-    settings: {  }
-  filter_caption:
-    id: filter_caption
-    provider: filter
-    status: false
-    weight: -39
-    settings: {  }
-  filter_align:
-    id: filter_align
-    provider: filter
-    status: false
     weight: -41
     settings: {  }
-  filter_autop:
-    id: filter_autop
-    provider: filter
-    status: false
-    weight: -40
-    settings: {  }
-  filter_image_style:
-    id: filter_image_style
-    provider: image
-    status: true
-    weight: -45
-    settings:
-      allowed_styles:
-        - wysiwyg_full_width
-        - wysiwyg_half_width
-        - wysiwyg_one_third_width
   joinup_video:
     id: joinup_video
     provider: joinup_video
     status: false
-    weight: -38
+    weight: 0
     settings:
       allowed_providers:
-        internal_path: 0
-        slideshare: 0
-        prezi: 0
         joinup_ec_video: 0
+        internal_path: 0
         google_docs: 0
-        youtube_playlist: 0
-        youtube: 0
+        prezi: 0
+        slideshare: 0
         vimeo: 0
+        youtube: 0
+        youtube_playlist: 0
       autoplay: false
       responsive: true
-  linkit:
-    id: linkit
-    provider: linkit
-    status: false
-    weight: -37
-    settings:
-      title: true
-  media_embed:
-    id: media_embed
-    provider: media
-    status: false
-    weight: -35
-    settings:
-      default_view_mode: default
-      allowed_media_types: {  }
-      allowed_view_modes: {  }
-  video_embed_wysiwyg:
-    id: video_embed_wysiwyg
-    provider: video_embed_wysiwyg
-    status: false
-    weight: -36
+  collection_glossary:
+    id: collection_glossary
+    provider: collection
+    status: true
+    weight: 0
     settings: {  }
diff --git a/tests/features/joinup_search/group_search.feature b/tests/features/joinup_search/group_search.feature
index bc7f25116c..250ae1b81b 100644
--- a/tests/features/joinup_search/group_search.feature
+++ b/tests/features/joinup_search/group_search.feature
@@ -71,7 +71,7 @@ Feature: Search inside groups
     # as a chip in the search field the search results should be filtered and
     # only show the content of the collection.
     When I submit the search by pressing enter
-    Then the option with text "Chalet construction   (6)" from select facet "collection/solution" is selected
+    Then the option with text "Chalet construction (6)" from select facet form "collection/solution" is selected
     And the page should show the tiles "Room sizes, Ground plan, Opening of the winter season, Natural materials, Resources, Inclined foundations"
 
     # Check that other types of pages in the collection also show the collection
@@ -117,7 +117,7 @@ Feature: Search inside groups
     # as a chip in the search field the search results should be filtered and
     # only show the content of the solution.
     When I submit the search by pressing enter
-    Then the option with text "Inclined foundations   (6)" from select facet "collection/solution" is selected
+    Then the option with text "Inclined foundations (6)" from select facet form "collection/solution" is selected
     Then the page should show the tiles "Pre-alpha, Presenting DrillMaster X88, Rock types, Still frozen, Geography, Terrace?"
 
     # Do a search with a keyword. The chip for the solution should be present
@@ -127,7 +127,7 @@ Feature: Search inside groups
     Then the page should show the following chip:
       | Inclined foundations |
     When I enter "ground" in the search bar and press enter
-    Then the option with text "Inclined foundations   (2)" from select facet "collection/solution" is selected
+    Then the option with text "Inclined foundations (2)" from select facet form "collection/solution" is selected
     And the page should show the tiles "Pre-alpha, Presenting DrillMaster X88"
 
     # Do a search with a keyword after removing the chip for the solution. The
@@ -136,7 +136,6 @@ Feature: Search inside groups
     When I open the search bar by clicking on the search icon
     And I press the remove button on the chip "Inclined foundations"
     And I enter "ground" in the search bar and press enter
-    Then the option with text "Any Collection or Solution" from select facet "collection/solution" is selected
     Then the page should show the tiles "Ground plan, Pre-alpha, Natural materials, Presenting DrillMaster X88"
 
     # Do a search with a keyword and removing the chip for the solution after
@@ -219,7 +218,7 @@ Feature: Search inside groups
     Then the page should show the following chip:
       | Chalet construction |
     When I enter "ground" in the search bar and press enter
-    Then the option with text "Chalet construction   (2)" from select facet "collection/solution" is selected
+    Then the option with text "Chalet construction (2)" from select facet form "collection/solution" is selected
     And the page should show the tiles "Ground plan, Natural materials"
     And the page should show the following chip in the "Search bar":
       | Chalet construction |
@@ -231,14 +230,14 @@ Feature: Search inside groups
   @javascript
   Scenario: Group filter chips appear in search bar after selecting them in facets
     When I visit the search page
-    Then the option with text "Any Collection or Solution" from select facet "collection/solution" is selected
     And I should see 12 tiles
 
     When I open the search bar by clicking on the search icon
     Then the page should not contain any chips
 
-    When I select "Inclined foundations" from the "collection/solution" select facet
-    Then the option with text "Inclined foundations   (6)" from select facet "collection/solution" is selected
+    When I select "Inclined foundations" from the "collection/solution" select facet form
+    And I click Search in facets form
+    Then the option with text "Inclined foundations (6)" from select facet form "collection/solution" is selected
     And I should see 6 tiles
 
     When I open the search bar by clicking on the search icon
@@ -247,7 +246,7 @@ Feature: Search inside groups
 
     # The filter chip should remain active when doing another search.
     When I enter "ground" in the search bar and press enter
-    Then the option with text "Inclined foundations   (2)" from select facet "collection/solution" is selected
+    Then the option with text "Inclined foundations (2)" from select facet form "collection/solution" is selected
     And I should see 2 tiles
     When I open the search bar by clicking on the search icon
     Then the page should show the following chip in the "Search bar":
diff --git a/tests/features/joinup_search/search.feature b/tests/features/joinup_search/search.feature
index c0ba640aa0..16b5d8b3ee 100644
--- a/tests/features/joinup_search/search.feature
+++ b/tests/features/joinup_search/search.feature
@@ -23,6 +23,10 @@ Feature: Global search
     And news content:
       | title                 | body             | collection                   | topic                   | spatial coverage | state     |
       | El Celler de Can Roca | The best in town | Molecular cooking collection | Statistics and Analysis | Luxembourg       | validated |
+      | Dummy news 1          | Dummy body       | Molecular cooking collection | E-inclusion             | Luxembourg       | validated |
+      | Dummy news 2          | Dummy body       | Molecular cooking collection | E-inclusion             | Luxembourg       | validated |
+      | Dummy news 3          | Dummy body       | Molecular cooking collection | E-inclusion             | Luxembourg       | validated |
+      | Dummy news 4          | Dummy body       | Molecular cooking collection | E-inclusion             | Luxembourg       | validated |
 
     Given I am logged in as a user with the "authenticated" role
     # @todo The search page cache should be cleared when new content is added.
@@ -34,51 +38,66 @@ Feature: Global search
     And I should see the "El Celler de Can Roca" tile
     And I should see the "Spherification" tile
     And I should see the "Foam" tile
-    # Facets should be in place.
-    And the option with text "Any topic" from select facet "topic" is selected
-    And the "topic" select facet should contain the following options:
-      | Any topic                     |
-      | Demography   (2)              |
-      | Statistics and Analysis   (1) |
-    And the option with text "Any location" from select facet "spatial coverage" is selected
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location         |
-      | Belgium   (1)        |
-      | European Union   (1) |
-      | Luxembourg   (1)     |
+    # Terms are sorted alphabetically
+    And the "topic" select facet form should contain the following options:
+      | Any topic               |
+      | Statistics and Analysis |
+      | Demography              |
+      | E-inclusion             |
+    And the "spatial coverage" select facet form should contain the following options:
+      | Any location       |
+      | Belgium (1)        |
+      | European Union (1) |
+      | Luxembourg (5)     |
     # Check that only one search field is available. In an earlier version of
     # Joinup there were two search fields, but this was confusing users.
     And there should be exactly 1 "search field" on the page
 
-    # Test the topic facet.
-    When I select "Demography" from the "topic" select facet
-    Then the option with text "Demography   (2)" from select facet "topic" is selected
+    When I select "E-inclusion" from the "topic" select facet form
+    And I click Search in facets form
+    Then the option with text "E-inclusion" from select facet form "topic" is selected
+    And the "topic" select facet form should contain the following options:
+      | Any topic               |
+      | Statistics and Analysis |
+      | Demography              |
+      | E-inclusion             |
+    # The tiles appear because the parent term is selected even though they do not have a direct reference there.
+    And I should see the "Dummy news 1" tile
+    And I should see the "Dummy news 2" tile
+    And I should see the "Dummy news 3" tile
+    And I should see the "Dummy news 4" tile
+
+    # Test the topic facet. The space prefixing "Demography" is due to the hierarchy.
+    When I select "Demography" from the "topic" select facet form
+    And I click Search in facets form
+    Then the option with text "Demography" from select facet form "topic" is selected
     # The selected option moves to the last position by default.
-    And the "topic" select facet should contain the following options:
-      | Any topic                     |
-      | Statistics and Analysis   (1) |
-      | Demography   (2)              |
-    Then the option with text "Any location" from select facet "spatial coverage" is selected
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location         |
-      | Belgium   (1)        |
-      | European Union   (1) |
+    And the "topic" select facet form should contain the following options:
+      | Any topic               |
+      | Statistics and Analysis |
+      | Demography              |
+      | E-inclusion             |
+    And the "spatial coverage" select facet form should contain the following options:
+      | Any location       |
+      | Belgium (1)        |
+      | European Union (1) |
     And I should see the "Molecular cooking collection" tile
     And I should see the "Spherification" tile
     But I should not see the "El Celler de Can Roca" tile
     And I should not see the "Foam" tile
 
     # Test the spatial coverage facet.
-    When I select "Belgium" from the "spatial coverage" select facet
-    Then the option with text "Belgium   (1)" from select facet "spatial coverage" is selected
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location         |
-      | Belgium   (1)        |
-      | European Union   (1) |
-    Then the option with text "Demography   (1)" from select facet "topic" is selected
-    And the "topic" select facet should contain the following options:
-      | Any topic        |
-      | Demography   (1) |
+    When I select "Belgium" from the "spatial coverage" select facet form
+    And I click Search in facets form
+    Then the option with text "Belgium (1)" from select facet form "spatial coverage" is selected
+    And the "spatial coverage" select facet form should contain the following options:
+      | Any location       |
+      | Belgium (1)        |
+      | European Union (1) |
+    Then the option with text "Demography" from select facet form "topic" is selected
+    And the "topic" select facet form should contain the following options:
+      | Any topic               |
+      | Demography              |
     And I should see the "Molecular cooking collection" tile
     But I should not see the "El Celler de Can Roca" tile
     And I should not see the "Spherification" tile
@@ -89,22 +108,30 @@ Feature: Global search
     Then I should see the text "Content types" in the "Left sidebar" region
 
     # Select link in the 'type' facet.
-    When I check the "News (1)" checkbox from the "Content types" facet
-    Then the "News" content checkbox item should be selected
-    And the "Content types" checkbox facet should allow selecting the following values "Collection (1), Solutions (2), News (1)"
-
-    When I check the "Solutions (2)" checkbox from the "Content types" facet
-    Then the "Solutions" content checkbox item should be selected
-    And the "News" content checkbox item should be selected
-    Then the "Content types" checkbox facet should allow selecting the following values "Collection (1), Solutions (2), News (1)"
-    And the "topic" select facet should contain the following options:
-      | Any topic                     |
-      | Demography   (1)              |
-      | Statistics and Analysis   (1) |
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location         |
-      | European Union   (1) |
-      | Luxembourg   (1)     |
+    When I check the "News (5)" checkbox from the "Content types" facet form
+    And I click Search in facets form
+    Then the option with text "News (5)" from select facet form "Content types" is selected
+    And the "Content types" select facet form should contain the following options:
+      | Collection (1)  |
+      | News (5)        |
+      | Solutions (2)   |
+
+    When I check the "Solutions (2)" checkbox from the "Content types" facet form
+    And I click Search in facets form
+    And I should see the following facet summary "News, Solutions"
+    And the "Content types" select facet form should contain the following options:
+      | Collection (1)  |
+      | News (5)        |
+      | Solutions (2)   |
+    And the "topic" select facet form should contain the following options:
+      | Any topic               |
+      | Demography              |
+      | Statistics and Analysis |
+      | E-inclusion             |
+    And the "spatial coverage" select facet form should contain the following options:
+      | Any location       |
+      | European Union (1) |
+      | Luxembourg (5)     |
     And I should not see the "Molecular cooking collection" tile
     And I should see the "El Celler de Can Roca" tile
     But I should see the "Spherification" tile
@@ -139,18 +166,19 @@ Feature: Global search
       | Document omega | Document      | Document short delta | A document consists of epsilon strings. | Luxembourg       | Alphabet | Collection alpha | validated |
 
     When I visit the search page
-    And the "spatial coverage" select facet should contain the following options:
+    And the "spatial coverage" select facet form should contain the following options:
       | Any location     |
-      | Greece   (1)     |
-      | Luxembourg   (2) |
-    When I select "Luxembourg" from the "spatial coverage" select facet
-    Then the option with text "Luxembourg   (2)" from select facet "spatial coverage" is selected
+      | Greece (1)       |
+      | Luxembourg (2)   |
+    When I select "Luxembourg" from the "spatial coverage" select facet form
+    And I click Search in facets form
+    Then the option with text "Luxembourg (2)" from select facet form "spatial coverage" is selected
     And I should see the text "Search Results (2)"
     # The countries are still sorted alphabetically even though the Luxembourg value is selected and has more results.
-    And the "spatial coverage" select facet should contain the following options:
+    And the "spatial coverage" select facet form should contain the following options:
       | Any location     |
-      | Greece   (1)     |
-      | Luxembourg   (2) |
+      | Greece (1)       |
+      | Luxembourg (2)   |
 
   Scenario: Content can be found with a full-text search.
     Given the following owner:
@@ -200,7 +228,17 @@ Feature: Global search
       | ulyssesfrees | ulysses.freeman@example.com | Ulysses    | Freeman     | Omero snc    |
 
     When I visit the search page
-    Then the "Content types" checkbox facet should allow selecting the following values "Collections (2), Solution (1), News (1), Events (2), Document (1), Discussion (1), Release (1), Custom page (1), Licence (1), Video (1)"
+    And the "Content types" select facet form should contain the following options:
+      | Collections (2)	|
+      | Custom page (1)	|
+      | Discussion (1)	|
+      | Document (1)		|
+      | Events (2)		  |
+      | Licence (1)		  |
+      | News (1)			  |
+      | Release (1)		  |
+      | Solution (1)		|
+      | Video (1)			  |
 
     # "Alpha" is used in all the rdf entities titles.
     When I enter "Alpha" in the search bar and press enter
@@ -265,8 +303,7 @@ Feature: Global search
     Then the page should show the tiles "Ulysses Freeman"
 
   Scenario: Advanced search
-    # An advanced search link is shown in the header, except on the home page
-    # and the search page.
+    # An advanced search link is shown in the header, except on the search page.
     Given I am on the homepage
     Then I should not see the link "Advanced search"
     Given I visit the collection overview
@@ -309,8 +346,8 @@ Feature: Global search
       | Ornithology: the study of birds   |
       | Bird outposts in the wild         |
       | Disturbed birds                   |
-      | Chickens are small birds          |
       | Bird spotting                     |
+      | Chickens are small birds          |
       | Best place to find an exotic bird |
       | Bird Birdman                      |
 
@@ -571,15 +608,21 @@ Feature: Global search
 
     Given I am logged in as a user with the "authenticated" role
     When I visit the search page
-    And I check the "Solutions (2)" checkbox from the "Content types" facet
-    Then I check the "News (5)" checkbox from the "Content types" facet
-    And I should see the following facet summary "Solutions, News"
-
-    Then I check the "Solutions (2)" checkbox from the "Content types" facet
+    And I select "Solutions (2)" from the "Content types" select facet form
+    And I select "News (5)" option in the "Content types" select facet form
+    And I click Search in facets form
+    And I should see the following facet summary "News, Solutions"
+
+    Then I click "Clear filters"
+    And I select "News (5)" from the "Content types" select facet form
+    And I click Search in facets form
     And I should see the following facet summary "News"
 
     # Check if facet summary was remove correctly.
-    Then I check the "Collection (1)" checkbox from the "Content types" facet
+    Then I click "Clear filters"
+    And I select "News (5)" from the "Content types" select facet form
+    And I select "Collection (1)" option in the "Content types" select facet form
+    And I click Search in facets form
     And I should see the following facet summary "Collection, News"
     Then I should remove the following facet summary "News"
     And the page should show only the tiles "Radio cooking collection"
diff --git a/tests/features/joinup_search/search.feature.orig b/tests/features/joinup_search/search.feature.orig
deleted file mode 100644
index c0cfe36d63..0000000000
--- a/tests/features/joinup_search/search.feature.orig
+++ /dev/null
@@ -1,543 +0,0 @@
-@api @terms @group-b
-Feature: Global search
-  As a user of the site I can find content through the global search.
-
-  # Todo: This test runs with javascript enabled because in a non-javascript
-  # environment, the dropdown facet is simply a list of links. Remove the
-  # `@javascript` tag when the upstream issue in the Facets module is fixed.
-  # Ref. https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-5739
-  # Ref. https://www.drupal.org/project/facets/issues/2937191
-  @javascript
-  Scenario: Anonymous user can find items
-    Given the following collection:
-      | title            | Molecular cooking collection |
-      | logo             | logo.png                     |
-      | moderation       | no                           |
-      | topic            | Demography                   |
-      | spatial coverage | Belgium                      |
-      | state            | validated                    |
-    And the following solutions:
-      | title          | collection                   | description                                                                                                                          | topic      | spatial coverage | state     |
-      | Spherification | Molecular cooking collection | Spherification is the culinary process of shaping a liquid into spheres                                                              | Demography | European Union   | validated |
-      | Foam           | Molecular cooking collection | "The use of foam in cuisine has been used in many forms in the history of cooking:whipped cream, meringue, and mousse are all foams" |            |                  | validated |
-    And news content:
-      | title                 | body             | collection                   | topic                   | spatial coverage | state     |
-      | El Celler de Can Roca | The best in town | Molecular cooking collection | Statistics and Analysis | Luxembourg       | validated |
-
-    Given I am logged in as a user with the "authenticated" role
-    # @todo The search page cache should be cleared when new content is added.
-    # @see https://citnet.tech.ec.europa.eu/CITnet/jira/browse/ISAICP-3428
-    And the cache has been cleared
-    When I visit the search page
-    # All content is visible.
-    Then I should see the "Molecular cooking collection" tile
-    And I should see the "El Celler de Can Roca" tile
-    And I should see the "Spherification" tile
-    And I should see the "Foam" tile
-    # Facets should be in place.
-    And the option with text "Any topic" from select facet "topic" is selected
-    And the "topic" select facet should contain the following options:
-      | Any topic                     |
-      | Demography   (2)              |
-      | Statistics and Analysis   (1) |
-    And the option with text "Any location" from select facet "spatial coverage" is selected
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location         |
-      | Belgium   (1)        |
-      | European Union   (1) |
-      | Luxembourg   (1)     |
-    # Check that only one search field is available. In an earlier version of
-    # Joinup there were two search fields, but this was confusing users.
-    And there should be exactly 1 "search field" on the page
-
-    # Test the topic facet.
-    When I select "Demography" from the "topic" select facet
-    Then the option with text "Demography   (2)" from select facet "topic" is selected
-    # The selected option moves to the last position by default.
-    And the "topic" select facet should contain the following options:
-      | Any topic                     |
-      | Statistics and Analysis   (1) |
-      | Demography   (2)              |
-    Then the option with text "Any location" from select facet "spatial coverage" is selected
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location         |
-      | Belgium   (1)        |
-      | European Union   (1) |
-    And I should see the "Molecular cooking collection" tile
-    And I should see the "Spherification" tile
-    But I should not see the "El Celler de Can Roca" tile
-    And I should not see the "Foam" tile
-
-    # Test the spatial coverage facet.
-    When I select "Belgium" from the "spatial coverage" select facet
-    Then the option with text "Belgium   (1)" from select facet "spatial coverage" is selected
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location         |
-      | Belgium   (1)        |
-      | European Union   (1) |
-    Then the option with text "Demography   (1)" from select facet "topic" is selected
-    And the "topic" select facet should contain the following options:
-      | Any topic        |
-      | Demography   (1) |
-    And I should see the "Molecular cooking collection" tile
-    But I should not see the "El Celler de Can Roca" tile
-    And I should not see the "Spherification" tile
-    And I should not see the "Foam" tile
-
-    # Reset the search by visiting again the search page.
-    Given I am on the search page
-    Then I should see the text "Content types" in the "Left sidebar" region
-
-    # Select link in the 'type' facet.
-    When I check the "News (1)" checkbox from the "Content types" facet
-    Then the "News" content checkbox item should be selected
-    And the "Content types" checkbox facet should allow selecting the following values "Collection (1), Solutions (2), News (1)"
-
-    When I check the "Solutions (2)" checkbox from the "Content types" facet
-    Then the "Solutions" content checkbox item should be selected
-    And the "News" content checkbox item should be selected
-    Then the "Content types" checkbox facet should allow selecting the following values "Collection (1), Solutions (2), News (1)"
-    And the "topic" select facet should contain the following options:
-      | Any topic                     |
-      | Demography   (1)              |
-      | Statistics and Analysis   (1) |
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location         |
-      | European Union   (1) |
-      | Luxembourg   (1)     |
-    And I should not see the "Molecular cooking collection" tile
-    And I should see the "El Celler de Can Roca" tile
-    But I should see the "Spherification" tile
-    And I should see the "Foam" tile
-
-    # Launch a text search.
-    When I open the search bar by clicking on the search icon
-    And I enter "Cooking" in the search bar and press enter
-    Then I should see the "Molecular cooking collection" tile
-    And I should see the "Foam" tile
-    But I should not see the "Spherification" tile
-    And I should not see the "El Celler de Can Roca" tile
-
-  @javascript
-  Scenario: Alphabetical order for the spatial coverage in the search page.
-    Given the following owner:
-      | name              | type    |
-      | Responsible owner | Company |
-    And the following contact:
-      | name  | Go-to contact     |
-      | email | go-to@example.com |
-    And the following collections:
-      | title            | description                                          | abstract                       | state     |
-      | Collection alpha | <p>collection <strong>beta</strong> description.</p> | The collection gamma abstract. | validated |
-      | Col for Sol      | <p>collection for the solution.</p>                  | The col for sol abstract.      | validated |
-    And event content:
-      | title             | short title       | body                                | spatial coverage | agenda         | location       | organisation        | scope         | keywords | collection       | state     |
-      | Event Omega       | Event short delta | The epsilon event content.          | Greece           | Event agenda.  | Some place     | European Commission | International | Alphabet | Collection alpha | validated |
-      | Alternative event | Alt event         | This event stays in the background. | Luxembourg       | To be planned. | Event location | Event organisation  |               |          | Collection alpha | validated |
-    And document content:
-      | title          | document type | short title          | body                                    | spatial coverage | keywords | collection       | state     |
-      | Document omega | Document      | Document short delta | A document consists of epsilon strings. | Luxembourg       | Alphabet | Collection alpha | validated |
-
-    When I visit the search page
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location     |
-      | Greece   (1)     |
-      | Luxembourg   (2) |
-    When I select "Luxembourg" from the "spatial coverage" select facet
-    Then the option with text "Luxembourg   (2)" from select facet "spatial coverage" is selected
-    # The countries are still sorted alphabetically even though the Luxembourg value is selected and has more results.
-    And the "spatial coverage" select facet should contain the following options:
-      | Any location     |
-      | Greece   (1)     |
-      | Luxembourg   (2) |
-
-  Scenario: Content can be found with a full-text search.
-    Given the following owner:
-      | name              | type    |
-      | Responsible owner | Company |
-    And the following contact:
-      | name  | Go-to contact     |
-      | email | go-to@example.com |
-    And the following collections:
-      | title            | description                                          | abstract                       | state     |
-      | Collection alpha | <p>collection <strong>beta</strong> description.</p> | The collection gamma abstract. | validated |
-      | Col for Sol      | <p>collection for the solution.</p>                  | The col for sol abstract.      | validated |
-    And the following solutions:
-      | title          | description                                                | keywords | owner             | contact information | collection  | state     |
-      | Solution alpha | <p>This is the solution <strong>beta</strong> description. | Alphabet | Responsible owner | Go-to contact       | Col for Sol | validated |
-    And the following releases:
-      | title         | release number | release notes                               | keywords | is version of  | owner             | contact information | state     |
-      | Release Alpha | 1              | <p>Release notes for <em>beta</em> changes. | Alphabet | Solution alpha | Responsible owner | Go-to contact       | validated |
-    And the following distributions:
-      | title              | description                                    | parent        | access url |
-      | Distribution alpha | <p>A simple beta distribution description.</p> | Release Alpha | test.zip   |
-    And the following licences:
-      | title         | description                         |
-      | Licence Alpha | A beta description for the licence. |
-    And news content:
-      | title      | headline            | body                      | keywords | collection       | state     |
-      | News omega | News headline delta | The epsilon news content. | Alphabet | Collection alpha | validated |
-    And event content:
-      | title             | short title       | body                                | agenda         | location       | organisation        | scope         | keywords | collection       | solution       | state     |
-      | Event Omega       | Event short delta | The epsilon event content.          | Event agenda.  | Some place     | European Commission | International | Alphabet |                  | Solution alpha | validated |
-      | Alternative event | Alt event         | This event stays in the background. | To be planned. | Event location | Event organisation  |               |          | Collection alpha |                | validated |
-    And document content:
-      | title          | document type | short title          | body                                    | keywords | collection       | state     |
-      | Document omega | Document      | Document short delta | A document consists of epsilon strings. | Alphabet | Collection alpha | validated |
-    And discussion content:
-      | title            | body                                                              | solution       | state     |
-      | Discussion omega | <p>Does anybody has idea why this <em>epsilon</em> is everywhere? | Solution alpha | validated |
-    And custom_page content:
-      | title      | body                                     | collection       |
-      | Page omega | This is just an epsilon but should work. | Collection alpha |
-    And video content:
-      | title       | body          | field_video                                 | collection       |
-      | Video alpha | Slap like now | https://www.youtube.com/watch?v=JhGf8ZY0tN8 | Collection alpha |
-    And users:
-      | Username     | E-mail                      | First name | Family name | Organisation |
-      | jenlyle      | jenessa.carlyle@example.com | Jenessa    | Carlyle     | Clyffco      |
-      | ulyssesfrees | ulysses.freeman@example.com | Ulysses    | Freeman     | Omero snc    |
-
-    When I visit the search page
-    Then the "Content types" checkbox facet should allow selecting the following values "Collections (2), Solution (1), News (1), Events (2), Document (1), Discussion (1), Release (1), Custom page (1), Licence (1), Video (1)"
-
-    # "Alpha" is used in all the rdf entities titles.
-    When I enter "Alpha" in the search bar and press enter
-    Then the page should show the tiles "Collection alpha, Solution alpha, Release Alpha, Licence Alpha, Video alpha"
-
-    # "Omega" is used in all the node entities titles. Since the content of
-    # custom pages is added to their collection, we also match the collection.
-    When I enter "omega" in the search bar and press enter
-    Then the page should show the tiles "Collection alpha, News omega, Event Omega, Document omega, Discussion omega, Page omega"
-
-    # "Beta" is used in all the rdf entities body fields.
-    When I enter "beta" in the search bar and press enter
-    Then the page should show the tiles "Collection alpha, Solution alpha, Release Alpha, Licence Alpha"
-
-    # "Epsilon" is used in all the node entities body fields.
-    When I enter "epsilon" in the search bar and press enter
-    Then the page should show the tiles "Collection alpha, News omega, Event Omega, Document omega, Discussion omega, Page omega"
-
-    # "Alphabet" is used in all the keywords fields.
-    When I enter "Alphabet" in the search bar and press enter
-    Then the page should show the tiles "Solution alpha, Release Alpha, News omega, Event Omega, Document omega"
-
-    # "Gamma" is used in the collection abstract.
-    When I enter "gamma" in the search bar and press enter
-    Then the page should show the tiles "Collection alpha"
-
-    # "Delta" is used in headline and short titles.
-    When I enter "delta" in the search bar and press enter
-    Then the page should show the tiles "News omega, Event Omega, Document omega"
-
-    # Search for the event fields: agenda, location, address, organisation, scope.
-    When I enter "agenda" in the search bar and press enter
-    Then the page should show the tiles "Event Omega"
-    When I enter "location" in the search bar and press enter
-    Then the page should show the tiles "Alternative event"
-    When I enter "place" in the search bar and press enter
-    Then the page should show the tiles "Event Omega"
-    When I enter "organisation" in the search bar and press enter
-    Then the page should show the tiles "Alternative event"
-    When I enter "international" in the search bar and press enter
-    Then the page should show the tiles "Event Omega"
-
-    # The owner and contact information names should be indexed inside the solutions/releases they are linked to.
-    When I enter "responsible" in the search bar and press enter
-    Then the page should show the tiles "Solution alpha, Release Alpha"
-    # Visit the homepage to be sure that the test fetches the correct updated page.
-    When I go to the homepage
-    And I enter "contact" in the search bar and press enter
-    Then the page should show the tiles "Solution alpha, Release Alpha"
-
-    # Users should be found by first name, family name and organisation.
-    When I enter "Jenessa" in the search bar and press enter
-    Then the page should show the tiles "Jenessa Carlyle"
-    When I enter "freeman" in the search bar and press enter
-    Then the page should show the tiles "Ulysses Freeman"
-    When I enter "clyffco" in the search bar and press enter
-    Then the page should show the tiles "Jenessa Carlyle"
-    When I enter "Omero+snc" in the search bar and press enter
-    Then the page should show the tiles "Ulysses Freeman"
-
-  Scenario: Advanced search
-    # An advanced search link is shown in the header, except on the home page
-    # and the search page.
-    Given I am on the homepage
-    Then I should not see the link "Advanced search"
-    Given I visit the collection overview
-    Then I should see the link "Advanced search"
-    When I click "Advanced search"
-    Then I should be on the advanced search page
-    But I should not see the link "Advanced search"
-
-  Scenario: Collections and solutions are shown first in search results with the same relevance.
-    Given collections:
-      | title                           | description                         | state     |
-      | Ornithology: the study of birds | Ornithology is a branch of zoology. | validated |
-      | Husky Flying Xylophone          | A strange instrument.               | validated |
-    And the following solution:
-      | title       | Bird outposts in the wild            |
-      | collection  | Ornithology: the study of birds      |
-      | description | Exotic wings and where to find them. |
-      | state       | validated                            |
-    And custom_page content:
-      | title           | body                                  | collection                      |
-      | Disturbed birds | Flocks of trained pigeons flying off. | Ornithology: the study of birds |
-    And news content:
-      | title                               | body                            | collection                      | state     |
-      | Chickens are small birds            | Birds domesticated in India.    | Ornithology: the study of birds | validated |
-      | Found a xylophone from 1600 in Asia | Oldest instrument of this type. | Husky Flying Xylophone          | validated |
-    And event content:
-      | title         | body                   | collection                      | state     |
-      | Bird spotting | Roosters crow at dawn. | Ornithology: the study of birds | validated |
-    And discussion content:
-      | title                             | body                    | collection                      | state     |
-      | Best place to find an exotic bird | Somewhere exotic maybe? | Ornithology: the study of birds | validated |
-    And user:
-      | Username    | Bird watcher |
-      | First name  | Bird         |
-      | Family name | Birdman      |
-
-    # The bird is the word... to search.
-    When I enter "Bird" in the search bar and press enter
-    Then I should see the following tiles in the correct order:
-      | Ornithology: the study of birds   |
-      | Bird outposts in the wild         |
-      | Disturbed birds                   |
-      | Chickens are small birds          |
-      | Bird spotting                     |
-      | Best place to find an exotic bird |
-      | Bird Birdman                      |
-
-  @clearStaticCache
-  Scenario: Solutions and/or releases are found by their distribution keyword.
-    Given the following licences:
-      | title      |
-      | Apache-2.0 |
-      | LGPL       |
-    And the following solution:
-      | title | Zzolution |
-      | state | validated |
-
-    When I enter "ZzoluDistro" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-    # Add distribution, child of solution.
-    Given the following distribution:
-      | title                    | ZzoluDistro                     |
-      | parent                   | Zzolution                       |
-      | description              | Übermensch foot size            |
-      | access url               | http://example.com/zzolu-distro |
-      | licence                  | Apache-2.0                      |
-      | format                   | HTML                            |
-      | representation technique | Datalog                         |
-
-    When I enter "zzoludistro" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "ubermensch" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "zzolu-distro" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "apache" in the search bar and press enter
-    # Also the licence itself is retrieved.
-    Then the page should show only the tiles "Apache-2.0,Zzolution"
-    When I enter "HTML" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "Datalog" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-
-    Given I am logged in as a moderator
-    When I go to the edit form of the "ZzoluDistro" distribution
-    And I fill in "Title" with "DistroZzolu"
-    And I fill in "Description" with "Nietzsche's"
-    And I press the "Remove" button
-    And I set a remote URL "http://example.com/guzzle" to "Access URL"
-    And I select "LGPL" from "Licence"
-    And I select "CSV" from "Format"
-    And I select "Human Language" from "Representation technique"
-    And I press "Save"
-    Then I should see the heading "DistroZzolu"
-
-    # Repeat the previous searches to prove that the initial keywords were
-    # removed from the Search API index.
-    Given I am an anonymous user
-    When I enter "zzoludistro" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "ubermensch" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "zzolu-distro" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "apache" in the search bar and press enter
-    Then the page should show only the tiles "Apache-2.0"
-    When I enter "HTML" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "Datalog" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-    # Search now with the new keywords.
-    When I enter "distrozzolu" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "nietzsche" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "guzzle" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "lGPL" in the search bar and press enter
-    # Also the licence itself is retrieved.
-    Then the page should show only the tiles "LGPL,Zzolution"
-    When I enter "CSV" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-    When I enter "Human Language" in the search bar and press enter
-    Then the page should show only the tiles "Zzolution"
-
-    Given I delete the "DistroZzolu" asset distribution
-
-    # The parent solution has been re-indexed without distribution data.
-    When I enter "distrozzolu" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "nietzsche" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "guzzle" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "lGPL" in the search bar and press enter
-    Then the page should show only the tiles "LGPL"
-    When I enter "CSV" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "Human Language" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-    # Add a new distribution, child of a release.
-    Given the following release:
-      | title         | Releazz   |
-      | state         | validated |
-      | is version of | Zzolution |
-
-    When I enter "ReleazzDistro" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-    Given the following distribution:
-      | title                    | ReleazzDistro                     |
-      | parent                   | Releazz                           |
-      | description              | Dracula                           |
-      | access url               | http://example.com/releazz-distro |
-      | licence                  | Apache-2.0                        |
-      | format                   | HTML                              |
-      | representation technique | Datalog                           |
-
-    When I enter "releazzDistro" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "dracula" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "releazz-distro" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "apache" in the search bar and press enter
-    # Also the licence itself is retrieved.
-    Then the page should show only the tiles "Apache-2.0,Releazz"
-    When I enter "HTML" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "Datalog" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-
-    Given I am logged in as a moderator
-    When I go to the edit form of the "ReleazzDistro" distribution
-    And I fill in "Title" with "DistroReleazz"
-    And I fill in "Description" with "Zorro"
-    And I press the "Remove" button
-    And I set a remote URL "http://example.com/mishmash" to "Access URL"
-    And I select "LGPL" from "Licence"
-    And I select "CSV" from "Format"
-    And I select "Human Language" from "Representation technique"
-    And I press "Save"
-
-    # Repeat the previous searches to prove that the initial keywords were
-    # removed from the Search API index.
-    Given I am an anonymous user
-    When I enter "releazzDistro" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "dracula" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "releazz-distro" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "apache" in the search bar and press enter
-    Then the page should show only the tiles "Apache-2.0"
-    When I enter "HTML" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "Datalog" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-    # Search now with the new keywords.
-    When I enter "dIstrOreleazz" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "zoRRo" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "mishMash" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "LGpl" in the search bar and press enter
-    # Also the licence itself is retrieved.
-    Then the page should show only the tiles "LGPL,Releazz"
-    When I enter "CSV" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-    When I enter "Human Language" in the search bar and press enter
-    Then the page should show only the tiles "Releazz"
-
-    Given I delete the "DistroReleazz" asset distribution
-
-    # The parent release has been re-indexed without distribution data.
-    When I enter "dIstrOreleazz" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "zoRRo" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "mishMash" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "lGPL" in the search bar and press enter
-    Then the page should show only the tiles "LGPL"
-    When I enter "CSV" in the search bar and press enter
-    Then I should see "No content found for your search."
-    When I enter "Human Language" in the search bar and press enter
-    Then I should see "No content found for your search."
-
-  Scenario: Collections are found by their keywords.
-    Given the following collection:
-      | title    | Collection sample       |
-      | keywords | unique, key-definitions |
-      | state    | validated               |
-
-    When I enter "key-definitions" in the search bar and press enter
-    Then the page should show only the tiles "Collection sample"
-
-    When I enter "unique" in the search bar and press enter
-    Then the page should show only the tiles "Collection sample"
-
-  @javascript
-  Scenario: Users are able to select the sort order.
-    Given collections:
-      | title             | description       | state     |
-      | Custom collection | Some custom data. | validated |
-    And news content:
-      | title                              | body                                                              | collection        | state     | created    | changed    |
-      | Relativity is the word             | No one cares about the body.                                      | Custom collection | validated | 01/01/2019 | 03/08/2019 |
-      | Relativity news: Relativity theory | I do care about the relativity keyword in the body.               | Custom collection | validated | 02/01/2019 | 02/08/2019 |
-      | Absolutely nonesense               | Some news are not worth it but I will add relativity here anyway. | Custom collection | validated | 03/01/2019 | 01/08/2019 |
-
-    When I am on the homepage
-    And I enter "Relativity" in the search bar and press enter
-    Then the option "Relevance" should be selected
-    And I should see the following tiles in the correct order:
-      | Relativity news: Relativity theory |
-      | Relativity is the word             |
-      | Absolutely nonesense               |
-    And I should be on "/search?keys=Relativity&sort_by=relevance"
-
-    Given I select "Creation Date" from "Sort by"
-    Then I should see the following tiles in the correct order:
-      | Absolutely nonesense               |
-      | Relativity news: Relativity theory |
-      | Relativity is the word             |
-    And I should be on "/search?keys=Relativity&sort_by=creation-date"
-
-    Given I select "Last Updated Date" from "Sort by"
-    Then I should see the following tiles in the correct order:
-      | Relativity is the word             |
-      | Relativity news: Relativity theory |
-      | Absolutely nonesense               |
-    And I should be on "/search?keys=Relativity&sort_by=last-updated-date"
diff --git a/tests/features/solution/homepage.feature b/tests/features/solution/homepage.feature
index d3c51d3614..ad4c8d1297 100644
--- a/tests/features/solution/homepage.feature
+++ b/tests/features/solution/homepage.feature
@@ -176,5 +176,5 @@ Feature: Solution homepage
     And I should not see the link "Supplier exchange"
     When I click "HR"
     Then the url should match "/search"
-    Then the option with text "HR   (1)" from select facet "topic" is selected
-    Then the "Solution" content checkbox item should be selected
+    Then the option with text "HR" from select facet form "topic" is selected
+    Then I should see the following facet summary "HR, Solution"
diff --git a/tests/src/Context/JoinupSearchContext.php b/tests/src/Context/JoinupSearchContext.php
index 7096a4f641..f3d7e2d764 100644
--- a/tests/src/Context/JoinupSearchContext.php
+++ b/tests/src/Context/JoinupSearchContext.php
@@ -273,6 +273,42 @@ public function iSelectAnOptionFromFacet(string $select, string $facet): void {
     $facet->selectOption($select);
   }
 
+  /**
+   * Clicks a facet item in an inline facet form.
+   *
+   * @param string $select
+   *   The option to select.
+   * @param string $facet
+   *   The facet alias.
+   *
+   * @throws \Exception
+   *   Thrown when the facet or the link inside the facet is not found.
+   *
+   * @When I select :option from the :facet select facet form
+   */
+  public function iSelectAnOptionFromFacetForm(string $select, string $facet): void {
+    $facet = $this->findFacetByAlias($facet, NULL, 'select', TRUE);
+    $facet->selectOption($select);
+  }
+
+  /**
+   * Clicks in more facet items in an inline facet form.
+   *
+   * @param string $select
+   *   The option to select.
+   * @param string $facet
+   *   The facet alias.
+   *
+   * @throws \Exception
+   *   Thrown when the facet or the link inside the facet is not found.
+   *
+   * @When I select :option option in the :facet select facet form
+   */
+  public function iSelectOtherOptionFromFacetForm(string $select, string $facet): void {
+    $facet = $this->findFacetByAlias($facet, NULL, 'select', TRUE);
+    $facet->selectOption($select, TRUE);
+  }
+
   /**
    * Asserts a selected option in the .
    *
@@ -285,12 +321,64 @@ public function iSelectAnOptionFromFacet(string $select, string $facet): void {
    *
    * @Then the option with text :option from select facet :select is selected
    */
-  public function assertSelectFacetOptionSelected($option, $select) {
-    $element = $this->findFacetByAlias($select, NULL, 'select');
+  public function assertSelectFacetOptionSelected(string $option, string $select): void {
+    // What appears as a select list in the frontend is actually output as a
+    // list of links by the Facets module which is ultimately converted into a
+    // select list using JavaScript.
+    // @see https://www.drupal.org/project/facets/issues/2937191
+    $html_tag = $this->browserSupportsJavaScript() ? 'select' : 'ul';
+    $element = $this->findFacetByAlias($select, NULL, $html_tag);
+    if (!$element) {
+      throw new \Exception(sprintf('The select "%s" was not found in the page %s', $select, $this->getSession()->getCurrentUrl()));
+    }
+    if ($this->browserSupportsJavaScript()) {
+      $this->assertSelectedOption($element, $option);
+    }
+    else {
+      $selected_option = $element->find('css', 'a.is-active');
+      if ($selected_option instanceof NodeElement) {
+        $text = $selected_option->getText();
+        // Selected facet options are prefixed with '(-) '. Strip this.
+        $text = preg_replace('/^\(-\) /', '', $text);
+        // Ignore duplicate whitespace.
+        $option = preg_replace('/\s{2,}/', ' ', $option);
+        Assert::assertEquals($option, $text, sprintf('The option "%s" is selected in the "%s" facet, but the option "%s" was expected.', $text, $select, $option));
+      }
+    }
+  }
+
+  /**
+   * Asserts a selected option in the select facets form.
+   *
+   * @param string $option
+   *   Text value of the option to find.
+   * @param string $select
+   *   Title of the select field.
+   *
+   * @throws \Exception
+   *    Throws an exception when the select is not found in page.
+   *
+   * @Then the option with text :option from select facet form :select is selected
+   */
+  public function assertSelectFacetFormOptionSelected(string $option, string $select): void {
+    $element = $this->findFacetByAlias($select, NULL, 'select', TRUE);
     if (!$element) {
       throw new \Exception(sprintf('The select "%s" was not found in the page %s', $select, $this->getSession()->getCurrentUrl()));
     }
-    $this->assertSelectedOption($element, $option);
+    if ($this->browserSupportsJavaScript()) {
+      $this->assertSelectedOption($element, $option);
+    }
+    else {
+      $selected_option = $element->find('css', 'a.is-active');
+      if ($selected_option instanceof NodeElement) {
+        $text = $selected_option->getText();
+        // Selected facet options are prefixed with '(-) '. Strip this.
+        $text = preg_replace('/^\(-\) /', '', $text);
+        // Ignore duplicate whitespace.
+        $option = preg_replace('/\s{2,}/', ' ', $option);
+        Assert::assertSame($option, $text, sprintf('The option "%s" is selected in the "%s" facet, but the option "%s" was expected.', $text, $select, $option));
+      }
+    }
   }
 
   /**
@@ -329,6 +417,25 @@ public function assertSelectOptionsAsList($select, TableNode $table) {
     $this->assertSelectAvailableOptions($element, $table);
   }
 
+  /**
+   * Asserts the list of available options in a facet form select box.
+   *
+   * @param string $select
+   *   The name of the field element.
+   * @param \Behat\Gherkin\Node\TableNode $table
+   *   The available list of options.
+   *
+   * @throws \Exception
+   *    Throws an exception when the select is not found or options are not
+   *    identical.
+   *
+   * @Then the :select select facet form should contain the following options:
+   */
+  public function assertSelectFacetFormOptionsAsList($select, TableNode $table) {
+    $element = $this->findFacetByAlias($select, NULL, 'select', TRUE);
+    $this->assertSelectAvailableOptions($element, $table);
+  }
+
   /**
    * Checks a checkbox link in a facet.
    *
@@ -356,6 +463,47 @@ public function checkCheckboxFacet(string $option, string $facet_type): void {
     throw new \Exception("The option '{$option}' was not found in the '{$facet_type}' facet.");
   }
 
+  /**
+   * Checks a checkbox in a facet form.
+   *
+   * @param string $option
+   *   The label of the checkbox.
+   * @param string $facet_type
+   *   The label of the facet.
+   *
+   * @throws \Exception
+   *   Thrown when the checkbox is not found.
+   *
+   * @Given I check the :option checkbox from the :facet_type facet form
+   */
+  public function checkCheckboxFacetForm(string $option, string $facet_type): void {
+    $facet = $this->findFacetByAlias($facet_type, NULL, '*', TRUE);
+    /** @var \Behat\Mink\Element\NodeElement[] $node_elements */
+    $node_elements = $facet->findAll('xpath', '//option');
+    foreach ($node_elements as $node_element) {
+      if ($node_element->getText() === $option) {
+        $node_element->click();
+        return;
+      }
+    }
+
+    throw new \Exception("The option '{$option}' was not found in the '{$facet_type}' facet.");
+  }
+
+  /**
+   * Facets form action buttons.
+   *
+   * @param string $name
+   *   The label of the input.
+   *
+   * @Given I click :name in facets form
+   */
+  public function iClickActionsInFacetsForm(string $name) {
+    $region = $this->getSession()->getPage();
+    $element = $region->find('xpath', "//input[@value='{$name}']");
+    $element->click();
+  }
+
   /**
    * Opens the dropdown for the given facet element.
    *
diff --git a/tests/src/Traits/TraversingTrait.php b/tests/src/Traits/TraversingTrait.php
index 7ad2a04149..ac7b02edfb 100644
--- a/tests/src/Traits/TraversingTrait.php
+++ b/tests/src/Traits/TraversingTrait.php
@@ -295,6 +295,8 @@ protected function getListingByHeading(string $type, string $heading): NodeEleme
    *   This can be useful in cases where the data drupal facet id is placed in
    *   more than one html tag e.g. the dropdown has the id placed in both the
    *   <li> tag of links as well as the <select> element.
+   * @param bool $facet_form
+   *   (optional) Check if is a facet form element.
    *
    * @return \Behat\Mink\Element\NodeElement
    *   The facet node element.
@@ -302,12 +304,17 @@ protected function getListingByHeading(string $type, string $heading): NodeEleme
    * @throws \Exception
    *   Thrown when the facet is not found in the designated area.
    */
-  protected function findFacetByAlias(string $alias, ?NodeElement $region = NULL, string $html_tag = '*'): NodeElement {
+  protected function findFacetByAlias(string $alias, ?NodeElement $region = NULL, string $html_tag = '*', bool $facet_form = FALSE): NodeElement {
     if ($region === NULL) {
       $region = $this->getSession()->getPage();
     }
     $facet_id = self::getFacetIdFromAlias($alias);
-    $element = $region->find('xpath', "//{$html_tag}[@data-drupal-facet-id='{$facet_id}']");
+    if ($facet_form) {
+      $element = $region->find('xpath', "//{$html_tag}[@data-drupal-selector='{$facet_id}']");
+    }
+    else {
+      $element = $region->find('xpath', "//{$html_tag}[@data-drupal-facet-id='{$facet_id}']");
+    }
 
     if (!$element) {
       throw new \Exception("The facet '$alias' was not found in the page.");
@@ -334,18 +341,18 @@ protected static function getFacetIdFromAlias(string $alias): string {
     $mappings = [
       'collection type' => 'collection_type',
       'collection topic' => 'collection_topic',
-      'collection/solution' => 'group',
-      'topic' => 'topic',
+      'collection/solution' => 'edit-group',
+      'topic' => 'edit-topic',
       'solution topic' => 'solution_topic',
       'solution spatial coverage' => 'solution_spatial_coverage',
-      'spatial coverage' => 'spatial_coverage',
+      'spatial coverage' => 'edit-spatial-coverage',
       'My solutions content' => 'solution_my_content',
       'My collections content' => 'collection_my_content',
       'My content' => 'content_my_content',
       'Event date' => 'event_date',
       'EIF recommendations' => 'category',
       'Collection event date' => 'collection_event_type',
-      'Content types' => 'type',
+      'Content types' => 'edit-type',
       'eif principle' => 'principle',
       'eif interoperability layer' => 'interoperability_layer',
       'eif conceptual model' => 'conceptual_model',
diff --git a/web/modules/custom/joinup_search/modules/search_api_arbitrary_facet/search_api_arbitrary_facet.module b/web/modules/custom/joinup_search/modules/search_api_arbitrary_facet/search_api_arbitrary_facet.module
index 174d19b926..1ea2873b26 100644
--- a/web/modules/custom/joinup_search/modules/search_api_arbitrary_facet/search_api_arbitrary_facet.module
+++ b/web/modules/custom/joinup_search/modules/search_api_arbitrary_facet/search_api_arbitrary_facet.module
@@ -207,10 +207,14 @@ function search_api_arbitrary_facet_search_api_solr_search_results_alter(ResultS
  * Implements hook_field_widget_info_alter().
  */
 function search_api_arbitrary_facet_widget_plugin_info_alter(array &$info) {
+  // Set providers to exclude from Arbitrary Facet Widget.
+  $providers = ['facets_form', 'facets_form_date_range'];
   foreach ($info as &$widget_info) {
     // Decorate all widgets with the arbitrary facet decorator.
-    $widget_info['decorated_class'] = $widget_info['class'];
-    $widget_info['class'] = '\Drupal\search_api_arbitrary_facet\ArbitraryFacetWidgetDecorator';
+    if (!in_array($widget_info['provider'], $providers)) {
+      $widget_info['decorated_class'] = $widget_info['class'];
+      $widget_info['class'] = '\Drupal\search_api_arbitrary_facet\ArbitraryFacetWidgetDecorator';
+    }
   }
 }
 
diff --git a/web/modules/custom/search_api_field/src/Plugin/facets/facet_source/SearchApiFieldDeriver.php b/web/modules/custom/search_api_field/src/Plugin/facets/facet_source/SearchApiFieldDeriver.php
index 7ca906c154..c25123da20 100644
--- a/web/modules/custom/search_api_field/src/Plugin/facets/facet_source/SearchApiFieldDeriver.php
+++ b/web/modules/custom/search_api_field/src/Plugin/facets/facet_source/SearchApiFieldDeriver.php
@@ -73,6 +73,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
         }
       }
 
+      $plugin_derivatives = [];
       $fs = FieldStorageConfig::loadMultiple($ids);
       /** @var \Drupal\field\Entity\FieldStorageConfig $field_config */
       foreach ($fs as $id => $field_config) {