diff --git a/core/modules/block_content/config/optional/views.view.block_content.yml b/core/modules/block_content/config/optional/views.view.block_content.yml
index 4e87489..7c2bba8 100644
--- a/core/modules/block_content/config/optional/views.view.block_content.yml
+++ b/core/modules/block_content/config/optional/views.view.block_content.yml
@@ -160,10 +160,23 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          link_to_entity: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
           entity_type: null
           entity_field: info
-          plugin_id: block_content
+          plugin_id: field
         type:
           id: type
           table: block_content_field_data
@@ -212,11 +225,23 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          link_to_entity: false
-          machine_name: '0'
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
           entity_type: block_content
           entity_field: type
-          plugin_id: block_content_type
+          plugin_id: field
         changed:
           id: changed
           table: block_content_field_data
@@ -436,8 +461,9 @@ display:
       display_extenders: {  }
     cache_metadata:
       contexts:
-        0: cache.context.url
-        2: language
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
       cacheable: false
   page_1:
     display_plugin: page
@@ -457,6 +483,7 @@ display:
         menu_name: admin
     cache_metadata:
       contexts:
-        0: cache.context.url
-        2: language
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
       cacheable: false