diff --git a/config/core.entity_view_display.node.article.default.yml b/config/core.entity_view_display.node.article.default.yml
index 38c19038b..c48fba3c6 100644
--- a/config/core.entity_view_display.node.article.default.yml
+++ b/config/core.entity_view_display.node.article.default.yml
@@ -34,23 +34,7 @@ third_party_settings:
         layout_settings:
           label: Content
           context_mapping: {  }
-        components:
-          8f0e42b8-302c-435f-877f-0b65259f3ef5:
-            uuid: 8f0e42b8-302c-435f-877f-0b65259f3ef5
-            region: content
-            configuration:
-              id: 'field_block:node:article:field_short_title'
-              label_display: '0'
-              context_mapping:
-                entity: layout_builder.entity
-              formatter:
-                type: string
-                label: above
-                settings:
-                  link_to_entity: false
-                third_party_settings: {  }
-            weight: 0
-            additional: {  }
+        components: {  }
         third_party_settings: {  }
   layout_builder_restrictions:
     allowed_block_categories:
diff --git a/config/field.field.node.article.field_short_title.yml b/config/field.field.node.article.field_short_title.yml
index a282237b6..e6b8eeff9 100644
--- a/config/field.field.node.article.field_short_title.yml
+++ b/config/field.field.node.article.field_short_title.yml
@@ -11,7 +11,7 @@ entity_type: node
 bundle: article
 label: 'Short title'
 description: ''
-required: true
+required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
diff --git a/config/search_api.index.solr.yml b/config/search_api.index.solr.yml
index 17a2a386c..b019fb86c 100644
--- a/config/search_api.index.solr.yml
+++ b/config/search_api.index.solr.yml
@@ -68,7 +68,7 @@ field_settings:
     datasource_id: 'entity:node'
     property_path: 'field_tags:entity:name'
     type: text
-    boost: !!float 21
+    boost: 21.0
     dependencies:
       config:
         - field.storage.node.field_tags
@@ -99,7 +99,7 @@ field_settings:
     datasource_id: 'entity:node'
     property_path: title
     type: text
-    boost: !!float 13
+    boost: 13.0
     dependencies:
       module:
         - node
@@ -157,7 +157,7 @@ processor_settings:
     all_fields: false
     fields:
       - name
-    ignorable: '[''¿¡!?,.:;]'
+    ignorable: "['¿¡!?,.:;]"
     ignorable_classes:
       - Pc
       - Pd
diff --git a/config/search_api.settings.yml b/config/search_api.settings.yml
index 21dfa083c..510a3e528 100644
--- a/config/search_api.settings.yml
+++ b/config/search_api.settings.yml
@@ -5,7 +5,7 @@ cron_worker_runtime: 15
 default_tracker: default
 tracking_page_size: 100
 boost_factors:
-  - !!float 0
+  - 0.0
   - 0.1
   - 0.2
   - 0.3
@@ -14,15 +14,15 @@ boost_factors:
   - 0.7
   - 0.8
   - 0.9
-  - !!float 1
+  - 1.0
   - 1.1
   - 1.2
   - 1.3
   - 1.4
   - 1.5
-  - !!float 2
-  - !!float 3
-  - !!float 5
-  - !!float 8
-  - !!float 13
-  - !!float 21
+  - 2.0
+  - 3.0
+  - 5.0
+  - 8.0
+  - 13.0
+  - 21.0
diff --git a/config/search_api_solr.solr_field_type.text_fr_6_0_0.yml b/config/search_api_solr.solr_field_type.text_fr_6_0_0.yml
index e692816c9..b227c2810 100644
--- a/config/search_api_solr.solr_field_type.text_fr_6_0_0.yml
+++ b/config/search_api_solr.solr_field_type.text_fr_6_0_0.yml
@@ -592,5 +592,4 @@ text_files:
     "\u016B" => "u"
   synonyms: |
     drupal, durpal
-  nouns: |
-
+  nouns: ''
diff --git a/config/search_api_solr.solr_field_type.text_fr_7_0_0.yml b/config/search_api_solr.solr_field_type.text_fr_7_0_0.yml
index f6efbc5e2..4b30989a7 100644
--- a/config/search_api_solr.solr_field_type.text_fr_7_0_0.yml
+++ b/config/search_api_solr.solr_field_type.text_fr_7_0_0.yml
@@ -596,5 +596,4 @@ text_files:
     "\u016B" => "u"
   synonyms: |
     drupal, durpal
-  nouns: |
-
+  nouns: ''
diff --git a/html/modules/custom/ghi_content/src/Entity/ContentBase.php b/html/modules/custom/ghi_content/src/Entity/ContentBase.php
index 198320710..f8cc7f986 100644
--- a/html/modules/custom/ghi_content/src/Entity/ContentBase.php
+++ b/html/modules/custom/ghi_content/src/Entity/ContentBase.php
@@ -119,6 +119,17 @@ public function toUrl($rel = 'canonical', array $options = []) {
     return parent::toUrl($rel, $options);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function toLink($text = NULL, $rel = 'canonical', array $options = []) {
+    if (!isset($text)) {
+      // Use the short title as default.
+      $text = $this->getShortTitle() ?? NULL;
+    }
+    return parent::toLink($text, $rel, $options);
+  }
+
   /**
    * Get the short title for a document.
    */
diff --git a/html/modules/custom/ghi_content/src/RemoteContent/HpcContentModule/RemoteArticle.php b/html/modules/custom/ghi_content/src/RemoteContent/HpcContentModule/RemoteArticle.php
index c4309719d..5d25f7de0 100644
--- a/html/modules/custom/ghi_content/src/RemoteContent/HpcContentModule/RemoteArticle.php
+++ b/html/modules/custom/ghi_content/src/RemoteContent/HpcContentModule/RemoteArticle.php
@@ -50,7 +50,7 @@ public function getTitle() {
    * {@inheritdoc}
    */
   public function getShortTitle() {
-    return trim($this->data->title_short);
+    return trim($this->data->title_short ?? '');
   }
 
   /**