diff --git a/cern_event_page.features.yml b/cern_event_page.features.yml
index 4927fd06ca1c0a01aff2a97f08171b7fd228b552..10171bb341d2b8941355fd1e5e61f49f43ed6e20 100644
--- a/cern_event_page.features.yml
+++ b/cern_event_page.features.yml
@@ -1,3 +1,5 @@
 excluded:
   - taxonomy.vocabulary.cern_event_category
+  - block.block.views_block__cern_more_about_more_about
+  - block.block.views_block__events_block_1
 required: true
diff --git a/cern_event_page.info.yml b/cern_event_page.info.yml
index cc48409427db30ad5c1bc9d27d9fb76e8293d9ca..fcbdef0b89b7d27737aefeab8e7ca72b2771b98e 100644
--- a/cern_event_page.info.yml
+++ b/cern_event_page.info.yml
@@ -1,5 +1,6 @@
 name: 'CERN Event Page'
-description: 'Provides Event Page content type and related configuration. Content type for creating event nodes'
+description: 'Provides Event Page content type and related configuration. Content type for creating event nodes.'
+package: 'CERN Home Exclusive'
 type: module
 core: 8.x
 dependencies:
@@ -12,6 +13,7 @@ dependencies:
   - cern_indico_events
   - cern_landing_page
   - cern_news_pages
+  - cern_resource_page
   - cern_system_page
   - cern_taxonomies
   - cern_webcast_events
@@ -35,11 +37,11 @@ dependencies:
   - path
   - pathauto
   - scheduler
+  - smart_trim
   - social_media
   - taxonomy
   - text
   - user
   - views
   - workflows
-version: '1.4'
-package: CERN
+version: '1.7'
diff --git a/cern_event_page.module b/cern_event_page.module
index e8d584da39fa5fe6d4d080259c2755805e8788e8..17871f8c77d46da2e3b11eab89f603190a960e5f 100644
--- a/cern_event_page.module
+++ b/cern_event_page.module
@@ -46,14 +46,14 @@ function cern_event_page_views_query_alter(ViewExecutable $view, QueryPluginBase
     }
     $date_field_groups = [];
     if (!empty($date_from)) {
-      $date_field_groups['event'][] = ['p_event_display_start_date' => '>='];
-      $date_field_groups['indico'][] = ['indico_event_start_date' => '>='];
-      $date_field_groups['webcast'][] = ['webcast_event_start_date' => '>='];
+      $date_field_groups['event'][0] = ['p_event_display_start_date' => '>='];
+      $date_field_groups['indico'][0] = ['indico_event_start_date' => '>='];
+      $date_field_groups['webcast'][0] = ['webcast_event_start_date' => '>='];
     }
     if (!empty($date_to)) {
-      $date_field_groups['event'][] = ['p_event_display_end_date' => '<='];
-      $date_field_groups['indico'][] = ['indico_event_end_date' => '<='];
-      $date_field_groups['webcast'][] = ['webcast_event_end_date' => '<='];
+      $date_field_groups['event'][1] = ['p_event_display_end_date' => '<='];
+      $date_field_groups['indico'][1] = ['indico_event_end_date' => '<='];
+      $date_field_groups['webcast'][1] = ['webcast_event_end_date' => '<='];
     }
     foreach($date_field_groups as $date_field_group){
       $conditions = [];
@@ -88,8 +88,59 @@ function cern_event_page_views_query_alter(ViewExecutable $view, QueryPluginBase
       $query->addWhereExpression(2, $conditions);
     }
   }
+  
+  if ($view->storage->get('id') === 'cern_upcoming_events' || $view->storage->get('id') === 'cern_events') {
+    if ($view->current_display === 'past_events') {
+      $order_direction = 'DESC';
+    } else {
+      $order_direction = 'ASC';
+    }
+    // override the ordering
+    // this is because the two different date fields are one or the other
+    // but not both fields, so we coalesce.
+    $field_start_date = "
+      CASE
+        WHEN type = 'event_page' THEN node__field_p_event_display_start_date.field_p_event_display_start_date_value
+        WHEN type = 'indico_event' THEN node__field_indico_event_start_date.field_indico_event_start_date_value
+        WHEN type = 'webcast_event' THEN node__field_webcast_event_start_date.field_webcast_event_start_date_value
+      END";
+    $query->addField(NULL, $field_start_date, 'start_date');
+    $query->orderby = array([
+      'field' => 'start_date',
+      'direction' => $order_direction,
+    ]);
+  }
+
+ // Alter for the view block "Other Events"
+  if ($view->storage->get('id') === 'events') {
+    // Category ID value
+    $field_category_value = "";
+    // Get node
+    $node = \Drupal::routeMatch()->getParameter('node');
+    // Check if node exists
+    if (isset($node)) {
+      // Get Content Type (CT)
+      $type = $node->getType();
+      // If node is Event page CT
+      if ($type == "event_page") {
+        $field_category_value = \Drupal::routeMatch()->getParameter('node')->get('field_p_event_webcast_indico_id')->value;
+      // If node is Indico CT
+      } else if ($type == "indico_event") {
+        $field_category_value = \Drupal::routeMatch()->getParameter('node')->get('field_indico_event_category_id')->value;
+      // If node is Webcast CT
+      } else if ($type == "webcast_event") {
+        $field_category_value = \Drupal::routeMatch()->getParameter('node')->get('field_webcast_event_category')->value;
+      }
+
+      // Adding value for
+      foreach ($query->where[2]['conditions'] as $key => $value) {
+        $query->where[2]['conditions'][$key]['value'] = $field_category_value;
+      }
+    }
+  }
 }
 
+
 /**
  * Implements hook_views_post_render().
  *
diff --git a/config/install/block.block.views_block__events_other_events.yml b/config/install/block.block.views_block__events_other_events.yml
deleted file mode 100644
index b2d47ac7ea1c1e2bd7fc33873195dfec3335aa22..0000000000000000000000000000000000000000
--- a/config/install/block.block.views_block__events_other_events.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.events
-  module:
-    - ctools
-    - views
-  theme:
-    - cernpublic
-id: views_block__events_other_events
-theme: cernpublic
-region: right
-weight: 0
-provider: null
-plugin: 'views_block:events-other_events'
-settings:
-  id: 'views_block:events-other_events'
-  label: ''
-  provider: views
-  label_display: visible
-  views_label: ''
-  items_per_page: none
-  context_mapping: {  }
-visibility:
-  'entity_bundle:node':
-    id: 'entity_bundle:node'
-    bundles:
-      event_page: event_page
-    negate: false
-    context_mapping:
-      node: '@node.node_route_context:node'
diff --git a/config/install/core.entity_form_display.node.event_page.default.yml b/config/install/core.entity_form_display.node.event_page.default.yml
index 20ed635f8c3a340d4409d9efaa22a1c10de4401b..de34844b09de24eca86dab4a38ad9dffe1bf1dad 100644
--- a/config/install/core.entity_form_display.node.event_page.default.yml
+++ b/config/install/core.entity_form_display.node.event_page.default.yml
@@ -20,6 +20,7 @@ dependencies:
     - field.field.node.event_page.field_p_event_display_tags
     - field.field.node.event_page.field_p_event_display_timezone
     - field.field.node.event_page.field_p_event_display_topic
+    - field.field.node.event_page.field_p_event_webcast_indico_id
     - image.style.thumbnail
     - node.type.event_page
   module:
@@ -84,8 +85,9 @@ third_party_settings:
       children:
         - field_p_event_display_audience
         - field_p_event_display_category
-        - field_p_event_display_tags
         - field_p_event_display_topic
+        - field_p_event_webcast_indico_id
+        - field_p_event_display_tags
       parent_name: group_tabs
       weight: 14
       format_type: tab
@@ -121,7 +123,7 @@ third_party_settings:
         - field_p_event_display_caption
         - field_p_event_display_cds
       parent_name: group_text
-      weight: 15
+      weight: 14
       format_type: fieldset
       format_settings:
         id: ''
@@ -179,12 +181,9 @@ mode: default
 content:
   field_p_event_display_audience:
     weight: 10
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
+    settings: {  }
     third_party_settings: {  }
-    type: entity_reference_autocomplete
+    type: options_select
     region: content
   field_p_event_display_body:
     weight: 12
@@ -204,12 +203,9 @@ content:
     region: content
   field_p_event_display_category:
     weight: 11
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
+    settings: {  }
     third_party_settings: {  }
-    type: entity_reference_autocomplete
+    type: options_select
     region: content
   field_p_event_display_cds:
     weight: 19
@@ -224,7 +220,7 @@ content:
     type: datetime_default
     region: content
   field_p_event_display_ext_link:
-    weight: 16
+    weight: 15
     settings:
       placeholder_url: ''
       placeholder_title: ''
@@ -261,7 +257,7 @@ content:
     type: options_select
     region: content
   field_p_event_display_place:
-    weight: 14
+    weight: 13
     settings:
       rows: 5
       placeholder: ''
@@ -290,7 +286,7 @@ content:
     type: datetime_default
     region: content
   field_p_event_display_tags:
-    weight: 12
+    weight: 14
     settings:
       match_operator: CONTAINS
       size: 60
@@ -307,13 +303,18 @@ content:
       placeholder: ''
     third_party_settings: {  }
   field_p_event_display_topic:
+    weight: 12
+    settings: {  }
+    third_party_settings: {  }
+    type: options_select
+    region: content
+  field_p_event_webcast_indico_id:
     weight: 13
     settings:
-      match_operator: CONTAINS
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: entity_reference_autocomplete
+    type: string_textfield
     region: content
   langcode:
     type: language_select
@@ -371,6 +372,8 @@ content:
   url_redirects:
     weight: 50
     region: content
+    settings: {  }
+    third_party_settings: {  }
 hidden:
   created: true
   publish_on: true
diff --git a/config/install/core.entity_view_display.node.event_page.cern_card.yml b/config/install/core.entity_view_display.node.event_page.cern_card.yml
index 3ef7f8379e6b2f100fa5c7814254b14b393c5108..c391e5f4cf503a185598c5354a21207f9c0d0512 100644
--- a/config/install/core.entity_view_display.node.event_page.cern_card.yml
+++ b/config/install/core.entity_view_display.node.event_page.cern_card.yml
@@ -50,8 +50,6 @@ third_party_settings:
         - node_title
       ics_link:
         - field_p_event_display_ics_link
-      audience:
-        - field_p_event_display_audience
       place:
         - field_p_event_display_place
       content_type:
@@ -68,7 +66,7 @@ third_party_settings:
           class: ''
       'dynamic_token_field:node-cern_ct_type':
         plugin_id: 'dynamic_token_field:node-cern_ct_type'
-        weight: 7
+        weight: 6
         label: hidden
         formatter: default
 id: node.event_page.cern_card
@@ -76,17 +74,6 @@ targetEntityType: node
 bundle: event_page
 mode: cern_card
 content:
-  content_moderation_control:
-    weight: -20
-    region: content
-  field_p_event_display_audience:
-    weight: 5
-    label: hidden
-    settings:
-      link: true
-    third_party_settings: {  }
-    type: entity_reference_label
-    region: audience
   field_p_event_display_end_date:
     weight: 1
     label: hidden
@@ -108,7 +95,7 @@ content:
       url_plain: false
     third_party_settings: {  }
   field_p_event_display_place:
-    weight: 6
+    weight: 5
     label: hidden
     settings:
       trim_length: 50
@@ -134,6 +121,8 @@ content:
       link_to_entity: false
     third_party_settings: {  }
 hidden:
+  content_moderation_control: true
+  field_p_event_display_audience: true
   field_p_event_display_body: true
   field_p_event_display_caption: true
   field_p_event_display_category: true
diff --git a/config/install/core.entity_view_display.node.event_page.cern_featured.yml b/config/install/core.entity_view_display.node.event_page.cern_featured.yml
index 7bad24dbb5d2421ce7f60e541f781e1296b1a0f3..1f183de4432c384d7b17d585386a62db97fe2ac4 100644
--- a/config/install/core.entity_view_display.node.event_page.cern_featured.yml
+++ b/config/install/core.entity_view_display.node.event_page.cern_featured.yml
@@ -59,9 +59,6 @@ targetEntityType: node
 bundle: event_page
 mode: cern_featured
 content:
-  content_moderation_control:
-    weight: -20
-    region: content
   field_p_event_display_place:
     type: text_default
     weight: 2
@@ -79,6 +76,7 @@ content:
       timezone_override: ''
     third_party_settings: {  }
 hidden:
+  content_moderation_control: true
   field_p_event_display_audience: true
   field_p_event_display_body: true
   field_p_event_display_caption: true
diff --git a/config/install/core.entity_view_display.node.event_page.default.yml b/config/install/core.entity_view_display.node.event_page.default.yml
index 27255caffa415abf607c4f38849d642616b08fab..df8a6be3927e182405e9b2cfdc57e21a6a896ad0 100644
--- a/config/install/core.entity_view_display.node.event_page.default.yml
+++ b/config/install/core.entity_view_display.node.event_page.default.yml
@@ -20,6 +20,7 @@ dependencies:
     - field.field.node.event_page.field_p_event_display_tags
     - field.field.node.event_page.field_p_event_display_timezone
     - field.field.node.event_page.field_p_event_display_topic
+    - field.field.node.event_page.field_p_event_webcast_indico_id
     - node.type.event_page
   module:
     - cern_cds_media
@@ -169,6 +170,14 @@ content:
     third_party_settings: {  }
     type: entity_reference_label
     region: content
+  field_p_event_webcast_indico_id:
+    weight: 118
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    type: string
+    region: content
   links:
     weight: 100
     region: content
diff --git a/config/install/core.entity_view_display.node.event_page.full.yml b/config/install/core.entity_view_display.node.event_page.full.yml
index 3e0e17afdec9f2adf4a724a7cc60738c089588ca..fc162e8802943df479a61b90836cdad655e89147 100644
--- a/config/install/core.entity_view_display.node.event_page.full.yml
+++ b/config/install/core.entity_view_display.node.event_page.full.yml
@@ -57,13 +57,13 @@ third_party_settings:
         - field_p_event_display_end_date
       ics_link:
         - field_p_event_display_ics_link
+      timezone:
+        - field_p_event_display_timezone
       audience:
         - field_p_event_display_audience
       image:
         - field_p_event_display_cds
         - field_p_event_display_image
-      timezone:
-        - field_p_event_display_timezone
       caption:
         - field_p_event_display_caption
       body:
@@ -74,49 +74,50 @@ third_party_settings:
         - field_p_event_display_category
       file:
         - field_p_event_display_file
-      margin_body:
-        - field_p_event_display_bodymargin
     fields:
       node_title:
         plugin_id: node_title
         weight: 0
         label: hidden
         formatter: default
+        settings:
+          wrapper: ''
+          class: ''
+          link: false
 id: node.event_page.full
 targetEntityType: node
 bundle: event_page
 mode: full
 content:
-  content_moderation_control:
-    weight: -20
-    region: content
   field_p_event_display_audience:
-    weight: 6
-    label: above
+    weight: 8
+    label: hidden
     settings:
-      link: false
+      link: true
     third_party_settings:
       field_formatter_class:
-        class: ''
+        class: audience-item
+      ds:
+        ds_limit: ''
     type: entity_reference_label
     region: audience
   field_p_event_display_body:
-    weight: 10
+    weight: 12
     label: hidden
     settings: {  }
     third_party_settings: {  }
     type: text_default
     region: body
   field_p_event_display_caption:
-    weight: 9
+    weight: 11
     label: hidden
     settings: {  }
     third_party_settings: {  }
     type: basic_string
     region: caption
   field_p_event_display_category:
-    weight: 12
-    label: above
+    weight: 14
+    label: hidden
     settings:
       link: false
     third_party_settings:
@@ -125,7 +126,7 @@ content:
     type: entity_reference_label
     region: category
   field_p_event_display_cds:
-    weight: 7
+    weight: 9
     label: hidden
     settings: {  }
     third_party_settings: {  }
@@ -143,7 +144,7 @@ content:
     region: end_date
   field_p_event_display_ext_link:
     weight: 3
-    label: above
+    label: hidden
     settings:
       trim_length: 80
       url_only: false
@@ -155,16 +156,17 @@ content:
     region: link
   field_p_event_display_file:
     type: file_default
-    weight: 13
+    weight: 15
     region: file
-    label: above
-    settings: {  }
+    label: hidden
+    settings:
+      use_description_as_link_text: true
     third_party_settings: {  }
   field_p_event_display_ics_link:
     type: link_separate
     weight: 6
     region: ics_link
-    label: above
+    label: hidden
     settings:
       trim_length: 80
       rel: ''
@@ -173,7 +175,7 @@ content:
       url_plain: false
     third_party_settings: {  }
   field_p_event_display_image:
-    weight: 8
+    weight: 10
     label: hidden
     settings:
       image_style: ''
@@ -211,19 +213,20 @@ content:
     type: string
     weight: 7
     region: timezone
-    label: above
+    label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
   field_p_event_display_topic:
-    weight: 11
-    label: above
+    weight: 13
+    label: hidden
     settings:
       link: true
     third_party_settings: {  }
     type: entity_reference_label
     region: topic
 hidden:
+  content_moderation_control: true
   field_p_event_display_media_type: true
   field_p_event_display_pro_menu: true
   field_p_event_display_tags: true
diff --git a/config/install/core.entity_view_display.node.event_page.teaser.yml b/config/install/core.entity_view_display.node.event_page.teaser.yml
index 0bba01030335abcc148c7a960e3a32f66bb6ef8a..8a562495851b053687522949cb2d0fa8334b6921 100644
--- a/config/install/core.entity_view_display.node.event_page.teaser.yml
+++ b/config/install/core.entity_view_display.node.event_page.teaser.yml
@@ -1,5 +1,5 @@
 langcode: en
-status: false
+status: true
 dependencies:
   config:
     - core.entity_view_mode.node.teaser
@@ -23,21 +23,111 @@ dependencies:
     - field.field.node.event_page.field_p_event_display_topic
     - node.type.event_page
   module:
+    - datetime
+    - ds
+    - field_formatter_class
+    - image
+    - smart_trim
     - user
+third_party_settings:
+  ds:
+    layout:
+      id: pattern_preview_list
+      library: null
+      disable_css: false
+      entity_classes: all_classes
+      settings:
+        pattern:
+          field_templates: only_content
+    regions:
+      image:
+        - field_p_event_display_image
+      topic:
+        - field_p_event_display_topic
+      title:
+        - node_title
+      strap:
+        - field_p_event_display_body
+      news_format:
+        - 'dynamic_token_field:node-cern_ct_type'
+      date:
+        - field_p_event_display_start_date
+    fields:
+      'dynamic_token_field:node-cern_ct_type':
+        plugin_id: 'dynamic_token_field:node-cern_ct_type'
+        weight: 4
+        label: hidden
+        formatter: default
+      node_title:
+        plugin_id: node_title
+        weight: 2
+        label: hidden
+        formatter: default
+        settings:
+          link: true
+          wrapper: ''
+          class: ''
 id: node.event_page.teaser
 targetEntityType: node
 bundle: event_page
 mode: teaser
 content:
-  content_moderation_control:
-    weight: -20
-    region: content
-  links:
-    weight: 100
-    region: content
+  field_p_event_display_body:
+    type: smart_trim
+    weight: 3
+    region: strap
+    label: above
+    settings:
+      trim_length: 300
+      trim_type: chars
+      trim_suffix: ''
+      wrap_class: trimmed
+      more_text: More
+      more_class: more-link
+      trim_options:
+        text: true
+        trim_zero: false
+      wrap_output: false
+      more_link: false
+      summary_handler: full
+    third_party_settings:
+      field_formatter_class:
+        class: ''
+  field_p_event_display_image:
+    type: image
+    weight: 0
+    region: image
+    label: above
+    settings:
+      image_style: ''
+      image_link: content
+    third_party_settings:
+      field_formatter_class:
+        class: ''
+  field_p_event_display_start_date:
+    type: datetime_custom
+    weight: 5
+    region: date
+    label: above
+    settings:
+      timezone_override: ''
+      date_format: 'd F, Y'
+    third_party_settings:
+      field_formatter_class:
+        class: ''
+  field_p_event_display_topic:
+    type: entity_reference_label
+    weight: 1
+    region: topic
+    label: above
+    settings:
+      link: false
+    third_party_settings:
+      field_formatter_class:
+        class: ''
 hidden:
+  content_moderation_control: true
   field_p_event_display_audience: true
-  field_p_event_display_body: true
   field_p_event_display_caption: true
   field_p_event_display_category: true
   field_p_event_display_cds: true
@@ -45,13 +135,11 @@ hidden:
   field_p_event_display_ext_link: true
   field_p_event_display_file: true
   field_p_event_display_ics_link: true
-  field_p_event_display_image: true
   field_p_event_display_media_type: true
   field_p_event_display_place: true
   field_p_event_display_pro_menu: true
   field_p_event_display_speaker: true
-  field_p_event_display_start_date: true
   field_p_event_display_tags: true
   field_p_event_display_timezone: true
-  field_p_event_display_topic: true
   langcode: true
+  links: true
diff --git a/config/install/core.entity_view_display.node.indico_event.teaser.yml b/config/install/core.entity_view_display.node.indico_event.teaser.yml
new file mode 100644
index 0000000000000000000000000000000000000000..fc18867172d2df578466a4f978d5618ff530f99d
--- /dev/null
+++ b/config/install/core.entity_view_display.node.indico_event.teaser.yml
@@ -0,0 +1,119 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.node.teaser
+    - field.field.node.indico_event.body
+    - field.field.node.indico_event.feeds_item
+    - field.field.node.indico_event.field_indico_event_category
+    - field.field.node.indico_event.field_indico_event_category_id
+    - field.field.node.indico_event.field_indico_event_end_date
+    - field.field.node.indico_event.field_indico_event_indico_ical
+    - field.field.node.indico_event.field_indico_event_indico_link
+    - field.field.node.indico_event.field_indico_event_location
+    - field.field.node.indico_event.field_indico_event_room
+    - field.field.node.indico_event.field_indico_event_room_map_url
+    - field.field.node.indico_event.field_indico_event_start_date
+    - field.field.node.indico_event.field_indico_event_timezone
+    - field.field.node.indico_event.field_indico_event_type
+    - node.type.indico_event
+  module:
+    - datetime
+    - ds
+    - field_formatter_class
+    - options
+    - smart_trim
+    - user
+third_party_settings:
+  ds:
+    layout:
+      id: pattern_preview_list
+      library: null
+      disable_css: false
+      entity_classes: all_classes
+      settings:
+        pattern:
+          field_templates: only_content
+    regions:
+      topic:
+        - field_indico_event_type
+      title:
+        - node_title
+      strap:
+        - body
+      news_format:
+        - 'dynamic_token_field:node-cern_ct_type'
+      date:
+        - field_indico_event_start_date
+    fields:
+      node_title:
+        plugin_id: node_title
+        weight: 1
+        label: hidden
+        formatter: default
+        settings:
+          link: true
+          wrapper: ''
+          class: ''
+      'dynamic_token_field:node-cern_ct_type':
+        plugin_id: 'dynamic_token_field:node-cern_ct_type'
+        weight: 3
+        label: hidden
+        formatter: default
+id: node.indico_event.teaser
+targetEntityType: node
+bundle: indico_event
+mode: teaser
+content:
+  body:
+    label: hidden
+    type: smart_trim
+    weight: 2
+    settings:
+      trim_length: 300
+      trim_type: chars
+      trim_suffix: ''
+      wrap_class: trimmed
+      more_text: More
+      more_class: more-link
+      summary_handler: full
+      trim_options:
+        text: true
+        trim_zero: false
+      wrap_output: false
+      more_link: false
+    third_party_settings:
+      field_formatter_class:
+        class: ''
+    region: strap
+  field_indico_event_start_date:
+    type: datetime_custom
+    weight: 4
+    region: date
+    label: above
+    settings:
+      timezone_override: ''
+      date_format: 'd F, Y'
+    third_party_settings:
+      field_formatter_class:
+        class: ''
+  field_indico_event_type:
+    type: list_key
+    weight: 0
+    region: topic
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+hidden:
+  feeds_item: true
+  field_indico_event_category: true
+  field_indico_event_category_id: true
+  field_indico_event_end_date: true
+  field_indico_event_indico_ical: true
+  field_indico_event_indico_link: true
+  field_indico_event_location: true
+  field_indico_event_room: true
+  field_indico_event_room_map_url: true
+  field_indico_event_timezone: true
+  langcode: true
+  links: true
diff --git a/config/install/core.entity_view_display.node.webcast_event.cern_card.yml b/config/install/core.entity_view_display.node.webcast_event.cern_card.yml
index e969c595ff3dacdde77dda829c870dbe86818fec..2aac77ccb8fbe72020c51c049c558e0c5af73172 100644
--- a/config/install/core.entity_view_display.node.webcast_event.cern_card.yml
+++ b/config/install/core.entity_view_display.node.webcast_event.cern_card.yml
@@ -49,8 +49,6 @@ third_party_settings:
         - field_webcast_event_wc_ical
       audience:
         - field_webcast_event_restricted
-      place:
-        - field_webcast_event_room
       content_type:
         - 'dynamic_token_field:node-cern_ct_type'
     fields:
@@ -65,7 +63,7 @@ third_party_settings:
           class: ''
       'dynamic_token_field:node-cern_ct_type':
         plugin_id: 'dynamic_token_field:node-cern_ct_type'
-        weight: 7
+        weight: 6
         label: hidden
         formatter: default
 id: node.webcast_event.cern_card
@@ -73,9 +71,6 @@ targetEntityType: node
 bundle: webcast_event
 mode: cern_card
 content:
-  content_moderation_control:
-    weight: -20
-    region: content
   field_webcast_event_end_date:
     weight: 1
     label: hidden
@@ -94,14 +89,6 @@ content:
     third_party_settings: {  }
     type: boolean
     region: audience
-  field_webcast_event_room:
-    type: string
-    weight: 6
-    region: place
-    label: inline
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
   field_webcast_event_start_date:
     weight: 0
     label: hidden
@@ -127,6 +114,7 @@ content:
       link_to_entity: false
     third_party_settings: {  }
 hidden:
+  content_moderation_control: true
   feeds_item: true
   field_webcast_embed_link_camera: true
   field_webcast_embed_link_slides: true
@@ -136,6 +124,7 @@ hidden:
   field_webcast_event_id: true
   field_webcast_event_image: true
   field_webcast_event_indico_link: true
+  field_webcast_event_room: true
   field_webcast_event_speakers: true
   field_webcast_event_type: true
   field_webcast_event_wc_link: true
diff --git a/config/install/core.entity_view_display.node.webcast_event.teaser.yml b/config/install/core.entity_view_display.node.webcast_event.teaser.yml
new file mode 100644
index 0000000000000000000000000000000000000000..99a421e141df70feb75c427fb6d67a3f3c501116
--- /dev/null
+++ b/config/install/core.entity_view_display.node.webcast_event.teaser.yml
@@ -0,0 +1,138 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.node.teaser
+    - field.field.node.webcast_event.feeds_item
+    - field.field.node.webcast_event.field_webcast_embed_link_camera
+    - field.field.node.webcast_event.field_webcast_embed_link_slides
+    - field.field.node.webcast_event.field_webcast_event_abstract
+    - field.field.node.webcast_event.field_webcast_event_category
+    - field.field.node.webcast_event.field_webcast_event_category_id
+    - field.field.node.webcast_event.field_webcast_event_end_date
+    - field.field.node.webcast_event.field_webcast_event_id
+    - field.field.node.webcast_event.field_webcast_event_image
+    - field.field.node.webcast_event.field_webcast_event_indico_link
+    - field.field.node.webcast_event.field_webcast_event_restricted
+    - field.field.node.webcast_event.field_webcast_event_room
+    - field.field.node.webcast_event.field_webcast_event_speakers
+    - field.field.node.webcast_event.field_webcast_event_start_date
+    - field.field.node.webcast_event.field_webcast_event_timezone
+    - field.field.node.webcast_event.field_webcast_event_type
+    - field.field.node.webcast_event.field_webcast_event_wc_ical
+    - field.field.node.webcast_event.field_webcast_event_wc_link
+    - node.type.webcast_event
+  module:
+    - datetime
+    - ds
+    - field_formatter_class
+    - smart_trim
+    - user
+third_party_settings:
+  ds:
+    layout:
+      id: pattern_preview_list
+      library: null
+      disable_css: false
+      entity_classes: all_classes
+      settings:
+        pattern:
+          field_templates: only_content
+    regions:
+      image:
+        - field_webcast_event_image
+      topic:
+        - field_webcast_event_type
+      title:
+        - node_title
+      strap:
+        - field_webcast_event_abstract
+      news_format:
+        - 'dynamic_token_field:node-cern_ct_type'
+      date:
+        - field_webcast_event_start_date
+    fields:
+      node_title:
+        plugin_id: node_title
+        weight: 2
+        label: hidden
+        formatter: default
+        settings:
+          link: true
+          wrapper: ''
+          class: ''
+      'dynamic_token_field:node-cern_ct_type':
+        plugin_id: 'dynamic_token_field:node-cern_ct_type'
+        weight: 4
+        label: hidden
+        formatter: default
+id: node.webcast_event.teaser
+targetEntityType: node
+bundle: webcast_event
+mode: teaser
+content:
+  field_webcast_event_abstract:
+    type: smart_trim
+    weight: 3
+    region: strap
+    label: above
+    settings:
+      trim_length: 300
+      trim_type: chars
+      trim_suffix: ''
+      wrap_class: trimmed
+      more_text: More
+      more_class: more-link
+      trim_options:
+        text: true
+        trim_zero: false
+      wrap_output: false
+      more_link: false
+      summary_handler: full
+    third_party_settings:
+      field_formatter_class:
+        class: ''
+  field_webcast_event_image:
+    type: string
+    weight: 0
+    region: image
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+  field_webcast_event_start_date:
+    type: datetime_custom
+    weight: 5
+    region: date
+    label: above
+    settings:
+      timezone_override: ''
+      date_format: 'd F, Y'
+    third_party_settings:
+      field_formatter_class:
+        class: ''
+  field_webcast_event_type:
+    type: string
+    weight: 1
+    region: topic
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+hidden:
+  feeds_item: true
+  field_webcast_embed_link_camera: true
+  field_webcast_embed_link_slides: true
+  field_webcast_event_category: true
+  field_webcast_event_category_id: true
+  field_webcast_event_end_date: true
+  field_webcast_event_id: true
+  field_webcast_event_indico_link: true
+  field_webcast_event_restricted: true
+  field_webcast_event_room: true
+  field_webcast_event_speakers: true
+  field_webcast_event_timezone: true
+  field_webcast_event_wc_ical: true
+  field_webcast_event_wc_link: true
+  langcode: true
+  links: true
diff --git a/config/install/field.field.node.event_page.field_p_event_webcast_indico_id.yml b/config/install/field.field.node.event_page.field_p_event_webcast_indico_id.yml
new file mode 100644
index 0000000000000000000000000000000000000000..924439a40aa8af01575f7aa9328ebcc0748c10a2
--- /dev/null
+++ b/config/install/field.field.node.event_page.field_p_event_webcast_indico_id.yml
@@ -0,0 +1,18 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_p_event_webcast_indico_id
+    - node.type.event_page
+id: node.event_page.field_p_event_webcast_indico_id
+field_name: field_p_event_webcast_indico_id
+entity_type: node
+bundle: event_page
+label: 'Webcast Indico ID'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/config/install/field.storage.node.field_p_event_display_audience.yml b/config/install/field.storage.node.field_p_event_display_audience.yml
index 4f9c1e08c5a7abb757cc42bca6a655205f9d6a75..9f152de4d16c0c67607feca93965a5951b5e4534 100644
--- a/config/install/field.storage.node.field_p_event_display_audience.yml
+++ b/config/install/field.storage.node.field_p_event_display_audience.yml
@@ -12,7 +12,7 @@ settings:
   target_type: taxonomy_term
 module: core
 locked: false
-cardinality: 1
+cardinality: -1
 translatable: true
 indexes: {  }
 persist_with_no_fields: false
diff --git a/config/install/field.storage.node.field_p_event_display_tags.yml b/config/install/field.storage.node.field_p_event_display_tags.yml
index 791448a4ef39525716d85daa64128314e359399c..52d57c4462bc35262975cc47f922efb702a9c926 100644
--- a/config/install/field.storage.node.field_p_event_display_tags.yml
+++ b/config/install/field.storage.node.field_p_event_display_tags.yml
@@ -12,7 +12,7 @@ settings:
   target_type: taxonomy_term
 module: core
 locked: false
-cardinality: 1
+cardinality: -1
 translatable: true
 indexes: {  }
 persist_with_no_fields: false
diff --git a/config/install/field.storage.node.field_p_event_webcast_indico_id.yml b/config/install/field.storage.node.field_p_event_webcast_indico_id.yml
new file mode 100644
index 0000000000000000000000000000000000000000..629075141c0caa85852ebec481b7d7d89f79c76d
--- /dev/null
+++ b/config/install/field.storage.node.field_p_event_webcast_indico_id.yml
@@ -0,0 +1,20 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+id: node.field_p_event_webcast_indico_id
+field_name: field_p_event_webcast_indico_id
+entity_type: node
+type: string
+settings:
+  max_length: 255
+  is_ascii: false
+  case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/install/views.view.cern_events.yml b/config/install/views.view.cern_events.yml
index db610dd6b8b3f5a52f7e05ad0b64f2dc78a6cd40..f1c369ce1de460bda52ab70fffbcfd9eabd7c704 100644
--- a/config/install/views.view.cern_events.yml
+++ b/config/install/views.view.cern_events.yml
@@ -54,7 +54,7 @@ display:
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
-        type: mini
+        type: full
         options:
           items_per_page: 12
           offset: 0
@@ -63,6 +63,8 @@ display:
           tags:
             previous: ‹‹
             next: ››
+            first: '« First'
+            last: 'Last »'
           expose:
             items_per_page: false
             items_per_page_label: 'Items per page'
@@ -71,6 +73,7 @@ display:
             items_per_page_options_all_label: '- All -'
             offset: false
             offset_label: Offset
+          quantity: 5
       style:
         type: default
       row:
@@ -339,7 +342,7 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: true
-          is_grouped: false
+          is_grouped: true
           group_info:
             label: 'Content type'
             description: null
@@ -350,10 +353,7 @@ display:
             remember: false
             default_group: All
             default_group_multiple: {  }
-            group_items:
-              1: {  }
-              2: {  }
-              3: {  }
+            group_items: {  }
           entity_type: node
           entity_field: type
           plugin_id: bundle
@@ -697,62 +697,17 @@ display:
           group_type: group
           admin_label: ''
           empty: false
-          content: '<a href="/events/past">Past Events</a> | <a class="active" href="/events">Feature Events (@total)</a>'
+          content: '<a href="/events/past">Past Events</a> | <a class="active" href="/events">Future Events (@total)</a>'
           plugin_id: result
       defaults:
         header: false
         arguments: false
         title: false
-      exposed_block: false
-      arguments: {  }
-      title: 'Feature Events'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  past_events:
-    display_plugin: page
-    id: past_events
-    display_title: 'Past Events'
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: events/past
-      menu:
-        type: none
-        title: 'Featured events'
-        description: ''
-        expanded: false
-        parent: ''
-        weight: 0
-        context: '0'
-        menu_name: main
-      display_description: ''
-      header:
-        result:
-          id: result
-          table: views
-          field: result
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          content: '<a class="active" href="/events/past">Past Events (@total)</a> | <a href="/events">Feature Events</a>'
-          plugin_id: result
-      defaults:
-        header: false
-        arguments: false
         filters: false
         filter_groups: false
       exposed_block: false
       arguments: {  }
+      title: 'Future Events'
       filters:
         status:
           value: '1'
@@ -847,24 +802,148 @@ display:
           entity_type: node
           entity_field: title
           plugin_id: string
-        field_p_event_display_topic_target_id:
-          id: field_p_event_display_topic_target_id
-          table: node__field_p_event_display_topic
-          field: field_p_event_display_topic_target_id
+        type_1:
+          id: type_1
+          table: node_field_data
+          field: type
           relationship: none
           group_type: group
           admin_label: ''
-          operator: or
-          value: {  }
+          operator: in
+          value:
+            event_page: event_page
+            indico_event: indico_event
+            webcast_event: webcast_event
           group: 1
           exposed: true
           expose:
-            operator_id: field_p_event_display_topic_target_id_op
-            label: Topic
+            operator_id: type_1_op
+            label: Type
             description: ''
             use_operator: false
-            operator: field_p_event_display_topic_target_id_op
-            identifier: topic
+            operator: type_1_op
+            identifier: type
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: true
+          is_grouped: true
+          group_info:
+            label: Type
+            description: ''
+            identifier: type
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items:
+              1:
+                title: Event
+                operator: in
+                value:
+                  event_page: event_page
+                  indico_event: indico_event
+                  all: '0'
+                  article: '0'
+                  basic_page: '0'
+                  faq_page: '0'
+                  feature_story_page: '0'
+                  landing_page: '0'
+                  news_page: '0'
+                  resource_page: '0'
+                  story_page: '0'
+                  system_page: '0'
+                  webcast_event: '0'
+              2:
+                title: Webcast
+                operator: in
+                value:
+                  webcast_event: webcast_event
+                  all: '0'
+                  article: '0'
+                  basic_page: '0'
+                  event_page: '0'
+                  faq_page: '0'
+                  feature_story_page: '0'
+                  indico_event: '0'
+                  landing_page: '0'
+                  news_page: '0'
+                  resource_page: '0'
+                  story_page: '0'
+                  system_page: '0'
+          entity_type: node
+          entity_field: type
+          plugin_id: bundle
+        field_p_event_display_start_date_value:
+          id: field_p_event_display_start_date_value
+          table: node__field_p_event_display_start_date
+          field: field_p_event_display_start_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '>='
+          value:
+            min: ''
+            max: ''
+            value: ''
+            type: date
+          group: 3
+          exposed: true
+          expose:
+            operator_id: field_p_event_display_start_date_value_op
+            label: 'Date From'
+            description: ''
+            use_operator: false
+            operator: field_p_event_display_start_date_value_op
+            identifier: date_from
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: datetime
+        field_p_event_display_end_date_value:
+          id: field_p_event_display_end_date_value
+          table: node__field_p_event_display_end_date
+          field: field_p_event_display_end_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '<='
+          value:
+            min: ''
+            max: ''
+            value: ''
+            type: date
+          group: 3
+          exposed: true
+          expose:
+            operator_id: field_p_event_display_end_date_value_op
+            label: 'Date To'
+            description: ''
+            use_operator: false
+            operator: field_p_event_display_end_date_value_op
+            identifier: date_to
             required: false
             remember: false
             multiple: false
@@ -872,6 +951,163 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: datetime
+        field_indico_event_start_date_value:
+          id: field_indico_event_start_date_value
+          table: node__field_indico_event_start_date
+          field: field_indico_event_start_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '>='
+          value:
+            min: ''
+            max: ''
+            value: now
+            type: offset
+          group: 2
+          exposed: false
+          expose:
+            operator_id: field_indico_event_start_date_value_op
+            label: 'Start Date (field_indico_event_start_date)'
+            description: null
+            use_operator: false
+            operator: field_indico_event_start_date_value_op
+            identifier: field_indico_event_start_date_value
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: datetime
+        field_webcast_event_start_date_value:
+          id: field_webcast_event_start_date_value
+          table: node__field_webcast_event_start_date
+          field: field_webcast_event_start_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '>='
+          value:
+            min: ''
+            max: ''
+            value: now
+            type: offset
+          group: 2
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: datetime
+        field_p_event_display_start_date_value_1:
+          id: field_p_event_display_start_date_value_1
+          table: node__field_p_event_display_start_date
+          field: field_p_event_display_start_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '>='
+          value:
+            min: ''
+            max: ''
+            value: now
+            type: offset
+          group: 2
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: datetime
+        langcode:
+          id: langcode
+          table: node_field_data
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value:
+            '***LANGUAGE_language_interface***': '***LANGUAGE_language_interface***'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
             reduce: false
           is_grouped: false
           group_info:
@@ -885,31 +1121,133 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          reduce_duplicates: false
-          type: select
-          limit: true
-          vid: cern_topics
-          hierarchy: false
-          error_message: true
-          plugin_id: taxonomy_index_tid
-        field_p_event_display_audience_target_id:
-          id: field_p_event_display_audience_target_id
-          table: node__field_p_event_display_audience
-          field: field_p_event_display_audience_target_id
+          entity_type: node
+          entity_field: langcode
+          plugin_id: language
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+          2: OR
+          3: AND
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      tags: {  }
+  past_events:
+    display_plugin: page
+    id: past_events
+    display_title: 'Past Events'
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: events/past
+      menu:
+        type: none
+        title: 'Featured events'
+        description: ''
+        expanded: false
+        parent: ''
+        weight: 0
+        context: '0'
+        menu_name: main
+      display_description: ''
+      header:
+        result:
+          id: result
+          table: views
+          field: result
           relationship: none
           group_type: group
           admin_label: ''
-          operator: or
-          value: {  }
+          empty: true
+          content: '<a class="active" href="/events/past">Past Events (@total)</a> | <a href="/events">Future Events</a>'
+          plugin_id: result
+      defaults:
+        header: false
+        arguments: false
+        filters: false
+        filter_groups: false
+      exposed_block: false
+      arguments: {  }
+      filters:
+        status:
+          value: '1'
+          table: node_field_data
+          field: status
+          plugin_id: boolean
+          entity_type: node
+          entity_field: status
+          id: status
+          expose:
+            operator: ''
+          group: 1
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value:
+            event_page: event_page
+            indico_event: indico_event
+            webcast_event: webcast_event
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          entity_field: type
+          plugin_id: bundle
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
           group: 1
           exposed: true
           expose:
-            operator_id: field_p_event_display_audience_target_id_op
-            label: Audience
+            operator_id: title_op
+            label: 'Search Events'
             description: ''
             use_operator: false
-            operator: field_p_event_display_audience_target_id_op
-            identifier: audience
+            operator: title_op
+            identifier: title
             required: false
             remember: false
             multiple: false
@@ -917,7 +1255,6 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-            reduce: false
           is_grouped: false
           group_info:
             label: ''
@@ -930,13 +1267,9 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          reduce_duplicates: false
-          type: select
-          limit: true
-          vid: cern_audience
-          hierarchy: false
-          error_message: true
-          plugin_id: taxonomy_index_tid
+          entity_type: node
+          entity_field: title
+          plugin_id: string
         type_1:
           id: type_1
           table: node_field_data
@@ -966,11 +1299,11 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: true
-          is_grouped: false
+          is_grouped: true
           group_info:
-            label: 'Content type'
-            description: null
-            identifier: type_1
+            label: Type
+            description: ''
+            identifier: type
             optional: true
             widget: select
             multiple: false
@@ -978,9 +1311,74 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items:
-              1: {  }
-              2: {  }
-              3: {  }
+              1:
+                title: Event
+                operator: in
+                value:
+                  event_page: event_page
+                  indico_event: indico_event
+                  all: '0'
+                  article: '0'
+                  basic_page: '0'
+                  faq_page: '0'
+                  feature_story_page: '0'
+                  landing_page: '0'
+                  news_page: '0'
+                  resource_page: '0'
+                  story_page: '0'
+                  system_page: '0'
+                  webcast_event: '0'
+              2:
+                title: Webcast
+                operator: in
+                value:
+                  webcast_event: webcast_event
+                  all: '0'
+                  article: '0'
+                  basic_page: '0'
+                  event_page: '0'
+                  faq_page: '0'
+                  feature_story_page: '0'
+                  indico_event: '0'
+                  landing_page: '0'
+                  news_page: '0'
+                  resource_page: '0'
+                  story_page: '0'
+                  system_page: '0'
+              3:
+                title: ''
+                operator: in
+                value:
+                  all: '0'
+                  article: '0'
+                  basic_page: '0'
+                  event_page: '0'
+                  faq_page: '0'
+                  feature_story_page: '0'
+                  indico_event: '0'
+                  landing_page: '0'
+                  news_page: '0'
+                  resource_page: '0'
+                  story_page: '0'
+                  system_page: '0'
+                  webcast_event: '0'
+              4:
+                title: ''
+                operator: in
+                value:
+                  all: '0'
+                  article: '0'
+                  basic_page: '0'
+                  event_page: '0'
+                  faq_page: '0'
+                  feature_story_page: '0'
+                  indico_event: '0'
+                  landing_page: '0'
+                  news_page: '0'
+                  resource_page: '0'
+                  story_page: '0'
+                  system_page: '0'
+                  webcast_event: '0'
           entity_type: node
           entity_field: type
           plugin_id: bundle
@@ -1241,7 +1639,6 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
-        - user
         - 'user.node_grants:view'
         - user.permissions
       tags: {  }
diff --git a/config/install/views.view.cern_events_menu.yml b/config/install/views.view.cern_events_menu.yml
index b3df6ed76c254bb847ddc073c2b7393bc363ab2b..ab7ce699a7afc302f49fd4ed8b27b3d049dcd80a 100644
--- a/config/install/views.view.cern_events_menu.yml
+++ b/config/install/views.view.cern_events_menu.yml
@@ -229,7 +229,20 @@ display:
             value: 'Events for:'
             format: basic_html
           plugin_id: text
-      footer: {  }
+      footer:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          tokenize: false
+          content:
+            value: '<div class="more-link form-group"><a href="[site:url]events">+ More</a></div>'
+            format: cern_full_html
+          plugin_id: text
       empty: {  }
       relationships:
         reverse__node__field_p_event_display_audience:
@@ -245,7 +258,7 @@ display:
       arguments: {  }
       display_extenders: {  }
       group_by: true
-      use_more: true
+      use_more: false
       use_more_always: true
       use_more_text: '+ More'
       link_url: /events
diff --git a/config/install/views.view.cern_next_event.yml b/config/install/views.view.cern_next_event.yml
index 2b42f0ad7bb3c892b53abe797a11c950d7c0eaa8..a8464e8ee7d908e3bebbd1b095b7406fb1e9b1f1 100644
--- a/config/install/views.view.cern_next_event.yml
+++ b/config/install/views.view.cern_next_event.yml
@@ -408,11 +408,15 @@ display:
         - user.permissions
       tags:
         - 'config:core.entity_view_display.node.article.default'
+        - 'config:core.entity_view_display.node.article.full'
         - 'config:core.entity_view_display.node.article.rss'
         - 'config:core.entity_view_display.node.article.teaser'
+        - 'config:core.entity_view_display.node.basic_page.cern_card'
         - 'config:core.entity_view_display.node.basic_page.default'
         - 'config:core.entity_view_display.node.basic_page.full'
         - 'config:core.entity_view_display.node.basic_page.teaser'
+        - 'config:core.entity_view_display.node.custom_content_type.default'
+        - 'config:core.entity_view_display.node.custom_content_type.teaser'
         - 'config:core.entity_view_display.node.event_page.cern_card'
         - 'config:core.entity_view_display.node.event_page.cern_featured'
         - 'config:core.entity_view_display.node.event_page.default'
@@ -431,18 +435,19 @@ display:
         - 'config:core.entity_view_display.node.indico_event.default'
         - 'config:core.entity_view_display.node.indico_event.full'
         - 'config:core.entity_view_display.node.indico_event.teaser'
+        - 'config:core.entity_view_display.node.landing_page.cern_card'
         - 'config:core.entity_view_display.node.landing_page.default'
+        - 'config:core.entity_view_display.node.landing_page.teaser'
         - 'config:core.entity_view_display.node.news_page.cern_card'
         - 'config:core.entity_view_display.node.news_page.cern_featured'
         - 'config:core.entity_view_display.node.news_page.default'
         - 'config:core.entity_view_display.node.news_page.full'
         - 'config:core.entity_view_display.node.news_page.teaser'
-        - 'config:core.entity_view_display.node.page.default'
-        - 'config:core.entity_view_display.node.page.teaser'
         - 'config:core.entity_view_display.node.resource_page.cern_card'
         - 'config:core.entity_view_display.node.resource_page.default'
         - 'config:core.entity_view_display.node.resource_page.full'
         - 'config:core.entity_view_display.node.resource_page.teaser'
+        - 'config:core.entity_view_display.node.story_page.cern_card'
         - 'config:core.entity_view_display.node.story_page.default'
         - 'config:core.entity_view_display.node.story_page.teaser'
         - 'config:core.entity_view_display.node.system_page.default'
@@ -471,11 +476,15 @@ display:
         - user.permissions
       tags:
         - 'config:core.entity_view_display.node.article.default'
+        - 'config:core.entity_view_display.node.article.full'
         - 'config:core.entity_view_display.node.article.rss'
         - 'config:core.entity_view_display.node.article.teaser'
+        - 'config:core.entity_view_display.node.basic_page.cern_card'
         - 'config:core.entity_view_display.node.basic_page.default'
         - 'config:core.entity_view_display.node.basic_page.full'
         - 'config:core.entity_view_display.node.basic_page.teaser'
+        - 'config:core.entity_view_display.node.custom_content_type.default'
+        - 'config:core.entity_view_display.node.custom_content_type.teaser'
         - 'config:core.entity_view_display.node.event_page.cern_card'
         - 'config:core.entity_view_display.node.event_page.cern_featured'
         - 'config:core.entity_view_display.node.event_page.default'
@@ -494,18 +503,19 @@ display:
         - 'config:core.entity_view_display.node.indico_event.default'
         - 'config:core.entity_view_display.node.indico_event.full'
         - 'config:core.entity_view_display.node.indico_event.teaser'
+        - 'config:core.entity_view_display.node.landing_page.cern_card'
         - 'config:core.entity_view_display.node.landing_page.default'
+        - 'config:core.entity_view_display.node.landing_page.teaser'
         - 'config:core.entity_view_display.node.news_page.cern_card'
         - 'config:core.entity_view_display.node.news_page.cern_featured'
         - 'config:core.entity_view_display.node.news_page.default'
         - 'config:core.entity_view_display.node.news_page.full'
         - 'config:core.entity_view_display.node.news_page.teaser'
-        - 'config:core.entity_view_display.node.page.default'
-        - 'config:core.entity_view_display.node.page.teaser'
         - 'config:core.entity_view_display.node.resource_page.cern_card'
         - 'config:core.entity_view_display.node.resource_page.default'
         - 'config:core.entity_view_display.node.resource_page.full'
         - 'config:core.entity_view_display.node.resource_page.teaser'
+        - 'config:core.entity_view_display.node.story_page.cern_card'
         - 'config:core.entity_view_display.node.story_page.default'
         - 'config:core.entity_view_display.node.story_page.teaser'
         - 'config:core.entity_view_display.node.system_page.default'
@@ -803,11 +813,15 @@ display:
         - user.permissions
       tags:
         - 'config:core.entity_view_display.node.article.default'
+        - 'config:core.entity_view_display.node.article.full'
         - 'config:core.entity_view_display.node.article.rss'
         - 'config:core.entity_view_display.node.article.teaser'
+        - 'config:core.entity_view_display.node.basic_page.cern_card'
         - 'config:core.entity_view_display.node.basic_page.default'
         - 'config:core.entity_view_display.node.basic_page.full'
         - 'config:core.entity_view_display.node.basic_page.teaser'
+        - 'config:core.entity_view_display.node.custom_content_type.default'
+        - 'config:core.entity_view_display.node.custom_content_type.teaser'
         - 'config:core.entity_view_display.node.event_page.cern_card'
         - 'config:core.entity_view_display.node.event_page.cern_featured'
         - 'config:core.entity_view_display.node.event_page.default'
@@ -826,18 +840,19 @@ display:
         - 'config:core.entity_view_display.node.indico_event.default'
         - 'config:core.entity_view_display.node.indico_event.full'
         - 'config:core.entity_view_display.node.indico_event.teaser'
+        - 'config:core.entity_view_display.node.landing_page.cern_card'
         - 'config:core.entity_view_display.node.landing_page.default'
+        - 'config:core.entity_view_display.node.landing_page.teaser'
         - 'config:core.entity_view_display.node.news_page.cern_card'
         - 'config:core.entity_view_display.node.news_page.cern_featured'
         - 'config:core.entity_view_display.node.news_page.default'
         - 'config:core.entity_view_display.node.news_page.full'
         - 'config:core.entity_view_display.node.news_page.teaser'
-        - 'config:core.entity_view_display.node.page.default'
-        - 'config:core.entity_view_display.node.page.teaser'
         - 'config:core.entity_view_display.node.resource_page.cern_card'
         - 'config:core.entity_view_display.node.resource_page.default'
         - 'config:core.entity_view_display.node.resource_page.full'
         - 'config:core.entity_view_display.node.resource_page.teaser'
+        - 'config:core.entity_view_display.node.story_page.cern_card'
         - 'config:core.entity_view_display.node.story_page.default'
         - 'config:core.entity_view_display.node.story_page.teaser'
         - 'config:core.entity_view_display.node.system_page.default'
diff --git a/config/install/views.view.cern_upcoming_events.yml b/config/install/views.view.cern_upcoming_events.yml
index c87214f01b972b9542df3d88e5dbc601c0658618..728e1229de71c80ba62eae32169bdc7111287c3d 100644
--- a/config/install/views.view.cern_upcoming_events.yml
+++ b/config/install/views.view.cern_upcoming_events.yml
@@ -372,7 +372,20 @@ display:
           plugin_id: datetime
       title: 'Upcoming events'
       header: {  }
-      footer: {  }
+      footer:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          tokenize: false
+          content:
+            value: '<div class="more-link "><a href="/events">View all events</a></div>'
+            format: cern_full_html
+          plugin_id: text
       empty: {  }
       relationships: {  }
       arguments: {  }
@@ -382,7 +395,7 @@ display:
         groups:
           1: AND
           2: OR
-      use_more: true
+      use_more: false
       use_more_always: true
       use_more_text: 'View all events'
       link_url: /events
@@ -395,11 +408,15 @@ display:
         - user.permissions
       tags:
         - 'config:core.entity_view_display.node.article.default'
+        - 'config:core.entity_view_display.node.article.full'
         - 'config:core.entity_view_display.node.article.rss'
         - 'config:core.entity_view_display.node.article.teaser'
+        - 'config:core.entity_view_display.node.basic_page.cern_card'
         - 'config:core.entity_view_display.node.basic_page.default'
         - 'config:core.entity_view_display.node.basic_page.full'
         - 'config:core.entity_view_display.node.basic_page.teaser'
+        - 'config:core.entity_view_display.node.custom_content_type.default'
+        - 'config:core.entity_view_display.node.custom_content_type.teaser'
         - 'config:core.entity_view_display.node.event_page.cern_card'
         - 'config:core.entity_view_display.node.event_page.cern_featured'
         - 'config:core.entity_view_display.node.event_page.default'
@@ -418,18 +435,19 @@ display:
         - 'config:core.entity_view_display.node.indico_event.default'
         - 'config:core.entity_view_display.node.indico_event.full'
         - 'config:core.entity_view_display.node.indico_event.teaser'
+        - 'config:core.entity_view_display.node.landing_page.cern_card'
         - 'config:core.entity_view_display.node.landing_page.default'
+        - 'config:core.entity_view_display.node.landing_page.teaser'
         - 'config:core.entity_view_display.node.news_page.cern_card'
         - 'config:core.entity_view_display.node.news_page.cern_featured'
         - 'config:core.entity_view_display.node.news_page.default'
         - 'config:core.entity_view_display.node.news_page.full'
         - 'config:core.entity_view_display.node.news_page.teaser'
-        - 'config:core.entity_view_display.node.page.default'
-        - 'config:core.entity_view_display.node.page.teaser'
         - 'config:core.entity_view_display.node.resource_page.cern_card'
         - 'config:core.entity_view_display.node.resource_page.default'
         - 'config:core.entity_view_display.node.resource_page.full'
         - 'config:core.entity_view_display.node.resource_page.teaser'
+        - 'config:core.entity_view_display.node.story_page.cern_card'
         - 'config:core.entity_view_display.node.story_page.default'
         - 'config:core.entity_view_display.node.story_page.teaser'
         - 'config:core.entity_view_display.node.system_page.default'
@@ -679,11 +697,15 @@ display:
         - user.permissions
       tags:
         - 'config:core.entity_view_display.node.article.default'
+        - 'config:core.entity_view_display.node.article.full'
         - 'config:core.entity_view_display.node.article.rss'
         - 'config:core.entity_view_display.node.article.teaser'
+        - 'config:core.entity_view_display.node.basic_page.cern_card'
         - 'config:core.entity_view_display.node.basic_page.default'
         - 'config:core.entity_view_display.node.basic_page.full'
         - 'config:core.entity_view_display.node.basic_page.teaser'
+        - 'config:core.entity_view_display.node.custom_content_type.default'
+        - 'config:core.entity_view_display.node.custom_content_type.teaser'
         - 'config:core.entity_view_display.node.event_page.cern_card'
         - 'config:core.entity_view_display.node.event_page.cern_featured'
         - 'config:core.entity_view_display.node.event_page.default'
@@ -702,18 +724,19 @@ display:
         - 'config:core.entity_view_display.node.indico_event.default'
         - 'config:core.entity_view_display.node.indico_event.full'
         - 'config:core.entity_view_display.node.indico_event.teaser'
+        - 'config:core.entity_view_display.node.landing_page.cern_card'
         - 'config:core.entity_view_display.node.landing_page.default'
+        - 'config:core.entity_view_display.node.landing_page.teaser'
         - 'config:core.entity_view_display.node.news_page.cern_card'
         - 'config:core.entity_view_display.node.news_page.cern_featured'
         - 'config:core.entity_view_display.node.news_page.default'
         - 'config:core.entity_view_display.node.news_page.full'
         - 'config:core.entity_view_display.node.news_page.teaser'
-        - 'config:core.entity_view_display.node.page.default'
-        - 'config:core.entity_view_display.node.page.teaser'
         - 'config:core.entity_view_display.node.resource_page.cern_card'
         - 'config:core.entity_view_display.node.resource_page.default'
         - 'config:core.entity_view_display.node.resource_page.full'
         - 'config:core.entity_view_display.node.resource_page.teaser'
+        - 'config:core.entity_view_display.node.story_page.cern_card'
         - 'config:core.entity_view_display.node.story_page.default'
         - 'config:core.entity_view_display.node.story_page.teaser'
         - 'config:core.entity_view_display.node.system_page.default'
@@ -1001,11 +1024,15 @@ display:
         - user.permissions
       tags:
         - 'config:core.entity_view_display.node.article.default'
+        - 'config:core.entity_view_display.node.article.full'
         - 'config:core.entity_view_display.node.article.rss'
         - 'config:core.entity_view_display.node.article.teaser'
+        - 'config:core.entity_view_display.node.basic_page.cern_card'
         - 'config:core.entity_view_display.node.basic_page.default'
         - 'config:core.entity_view_display.node.basic_page.full'
         - 'config:core.entity_view_display.node.basic_page.teaser'
+        - 'config:core.entity_view_display.node.custom_content_type.default'
+        - 'config:core.entity_view_display.node.custom_content_type.teaser'
         - 'config:core.entity_view_display.node.event_page.cern_card'
         - 'config:core.entity_view_display.node.event_page.cern_featured'
         - 'config:core.entity_view_display.node.event_page.default'
@@ -1024,18 +1051,19 @@ display:
         - 'config:core.entity_view_display.node.indico_event.default'
         - 'config:core.entity_view_display.node.indico_event.full'
         - 'config:core.entity_view_display.node.indico_event.teaser'
+        - 'config:core.entity_view_display.node.landing_page.cern_card'
         - 'config:core.entity_view_display.node.landing_page.default'
+        - 'config:core.entity_view_display.node.landing_page.teaser'
         - 'config:core.entity_view_display.node.news_page.cern_card'
         - 'config:core.entity_view_display.node.news_page.cern_featured'
         - 'config:core.entity_view_display.node.news_page.default'
         - 'config:core.entity_view_display.node.news_page.full'
         - 'config:core.entity_view_display.node.news_page.teaser'
-        - 'config:core.entity_view_display.node.page.default'
-        - 'config:core.entity_view_display.node.page.teaser'
         - 'config:core.entity_view_display.node.resource_page.cern_card'
         - 'config:core.entity_view_display.node.resource_page.default'
         - 'config:core.entity_view_display.node.resource_page.full'
         - 'config:core.entity_view_display.node.resource_page.teaser'
+        - 'config:core.entity_view_display.node.story_page.cern_card'
         - 'config:core.entity_view_display.node.story_page.default'
         - 'config:core.entity_view_display.node.story_page.teaser'
         - 'config:core.entity_view_display.node.system_page.default'
diff --git a/config/install/views.view.events.yml b/config/install/views.view.events.yml
index 8937e499c850f74241cd63eec117072facee5b9b..946e93865e3f72551c4aeea8d0f5749eaff9286d 100644
--- a/config/install/views.view.events.yml
+++ b/config/install/views.view.events.yml
@@ -3,8 +3,15 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.node.cern_card
+    - field.storage.node.field_indico_event_category_id
+    - field.storage.node.field_p_event_display_caption
+    - field.storage.node.field_p_event_display_category
+    - field.storage.node.field_p_event_webcast_indico_id
+    - field.storage.node.field_p_resource_display_360_url
+    - field.storage.node.field_webcast_event_category_id
     - node.type.event_page
-    - taxonomy.vocabulary.cern_event_category
+    - node.type.indico_event
+    - node.type.webcast_event
   module:
     - datetime
     - ds
@@ -162,6 +169,8 @@ display:
           operator: in
           value:
             event_page: event_page
+            indico_event: indico_event
+            webcast_event: webcast_event
           group: 1
           exposed: false
           expose:
@@ -245,7 +254,93 @@ display:
             max: ''
             value: now
             type: offset
-          group: 1
+          group: 2
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            placeholder: ''
+            min_placeholder: ''
+            max_placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: datetime
+        field_indico_event_start_date_value:
+          id: field_indico_event_start_date_value
+          table: node__field_indico_event_start_date
+          field: field_indico_event_start_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '>='
+          value:
+            min: ''
+            max: ''
+            value: now
+            type: date
+          group: 2
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            placeholder: ''
+            min_placeholder: ''
+            max_placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: datetime
+        field_webcast_event_start_date_value:
+          id: field_webcast_event_start_date_value
+          table: node__field_webcast_event_start_date
+          field: field_webcast_event_start_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '>='
+          value:
+            min: ''
+            max: ''
+            value: now
+            type: date
+          group: 2
           exposed: false
           expose:
             operator_id: ''
@@ -315,16 +410,16 @@ display:
           empty: false
           tokenize: false
           content:
-            value: '<a href=/news> View all events </a>'
-            format: full_html
+            value: '<a href="/events"> View all events </a>'
+            format: basic_html
           plugin_id: text
       empty: {  }
       relationships: {  }
       arguments:
-        field_p_event_display_category_target_id:
-          id: field_p_event_display_category_target_id
-          table: node__field_p_event_display_category
-          field: field_p_event_display_category_target_id
+        nid:
+          id: nid
+          table: node_field_data
+          field: nid
           relationship: none
           group_type: group
           admin_label: ''
@@ -335,14 +430,8 @@ display:
             title: All
           title_enable: false
           title: ''
-          default_argument_type: taxonomy_tid
-          default_argument_options:
-            node: true
-            limit: true
-            vids:
-              cern_event_category: cern_event_category
-            anyall: +
-            term_page: '0'
+          default_argument_type: node
+          default_argument_options: {  }
           default_argument_skip_url: false
           summary_options:
             base_path: ''
@@ -359,8 +448,39 @@ display:
             fail: 'not found'
           validate_options: {  }
           break_phrase: false
-          not: false
-          plugin_id: numeric
+          not: true
+          entity_type: node
+          entity_field: nid
+          plugin_id: node_nid
+      display_extenders: {  }
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+          2: AND
+          3: AND
+          4: AND
+          5: AND
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - 'user.node_grants:view'
+        - user.permissions
+      tags: {  }
+  block_1:
+    display_plugin: block
+    id: block_1
+    display_title: Block
+    position: 1
+    display_options:
+      display_extenders: {  }
+      block_description: 'Other events'
+      rendering_language: '***LANGUAGE_language_interface***'
+      block_hide_empty: true
+      arguments:
         nid:
           id: nid
           table: node_field_data
@@ -397,30 +517,857 @@ display:
           entity_type: node
           entity_field: nid
           plugin_id: node_nid
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  other_events:
-    display_plugin: block
-    id: other_events
-    display_title: Block
-    position: 1
-    display_options:
-      display_extenders: {  }
-      block_description: 'Other events'
-      rendering_language: '***LANGUAGE_language_interface***'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - url
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
+      defaults:
+        arguments: false
+        filters: false
+        filter_groups: false
+        sorts: false
+        style: false
+        row: false
+        fields: false
+        query: false
+      filters:
+        status:
+          value: '1'
+          table: node_field_data
+          field: status
+          plugin_id: boolean
+          entity_type: node
+          entity_field: status
+          id: status
+          expose:
+            operator: ''
+          group: 1
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value:
+            event_page: event_page
+            indico_event: indico_event
+            webcast_event: webcast_event
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          entity_field: type
+          plugin_id: bundle
+        langcode:
+          id: langcode
+          table: node_field_data
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value:
+            '***LANGUAGE_language_interface***': '***LANGUAGE_language_interface***'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          entity_field: langcode
+          plugin_id: language
+        field_indico_event_category_id_value:
+          id: field_indico_event_category_id_value
+          table: node__field_indico_event_category_id
+          field: field_indico_event_category_id_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: ''
+          group: 2
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: string
+        field_p_event_webcast_indico_id_value:
+          id: field_p_event_webcast_indico_id_value
+          table: node__field_p_event_webcast_indico_id
+          field: field_p_event_webcast_indico_id_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: ''
+          group: 2
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: string
+        field_indico_event_start_date_value:
+          id: field_indico_event_start_date_value
+          table: node__field_indico_event_start_date
+          field: field_indico_event_start_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '>='
+          value:
+            min: ''
+            max: ''
+            value: now
+            type: date
+          group: 3
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            placeholder: ''
+            min_placeholder: ''
+            max_placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: datetime
+        field_p_event_display_start_date_value:
+          id: field_p_event_display_start_date_value
+          table: node__field_p_event_display_start_date
+          field: field_p_event_display_start_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '>='
+          value:
+            min: ''
+            max: ''
+            value: now
+            type: date
+          group: 3
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            placeholder: ''
+            min_placeholder: ''
+            max_placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: datetime
+        field_webcast_event_start_date_value:
+          id: field_webcast_event_start_date_value
+          table: node__field_webcast_event_start_date
+          field: field_webcast_event_start_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '>='
+          value:
+            min: ''
+            max: ''
+            value: now
+            type: date
+          group: 3
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            placeholder: ''
+            min_placeholder: ''
+            max_placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: datetime
+        field_webcast_event_category_value:
+          id: field_webcast_event_category_value
+          table: node__field_webcast_event_category
+          field: field_webcast_event_category_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: ''
+          group: 2
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: string
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+          2: OR
+          3: OR
+      sorts:
+        random:
+          id: random
+          table: views
+          field: random
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: ASC
+          exposed: false
+          expose:
+            label: ''
+          plugin_id: random
+      style:
+        type: default
+        options: {  }
+      row:
+        type: 'ds_entity:node'
+        options:
+          relationship: none
+          view_mode: cern_card
+          alternating_fieldset:
+            alternating: false
+            allpages: false
+            item_0: teaser
+            item_1: teaser
+            item_2: teaser
+            item_3: teaser
+            item_4: teaser
+            item_5: teaser
+            item_6: teaser
+            item_7: teaser
+            item_8: teaser
+            item_9: teaser
+            item_10: teaser
+            item_11: teaser
+          grouping_fieldset:
+            group: false
+          advanced_fieldset:
+            advanced: false
+      fields:
+        field_indico_event_category_id:
+          id: field_indico_event_category_id
+          table: node__field_indico_event_category_id
+          field: field_indico_event_category_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          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
+          plugin_id: field
+        field_webcast_event_category_id:
+          id: field_webcast_event_category_id
+          table: node__field_webcast_event_category_id
+          field: field_webcast_event_category_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          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
+          plugin_id: field
+        field_p_event_webcast_indico_id:
+          id: field_p_event_webcast_indico_id
+          table: node__field_p_event_webcast_indico_id
+          field: field_p_event_webcast_indico_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          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
+          plugin_id: field
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: 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: node
+          entity_field: title
+          plugin_id: field
+        field_p_resource_display_360_url:
+          id: field_p_resource_display_360_url
+          table: node__field_p_resource_display_360_url
+          field: field_p_resource_display_360_url
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          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
+          plugin_id: field
+        field_p_event_display_caption:
+          id: field_p_event_display_caption
+          table: node__field_p_event_display_caption
+          field: field_p_event_display_caption
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: basic_string
+          settings: {  }
+          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
+          plugin_id: field
+        field_p_event_display_category:
+          id: field_p_event_display_category
+          table: node__field_p_event_display_category
+          field: field_p_event_display_category
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          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
+          plugin_id: field
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_interface'
+        - url
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:field.storage.node.field_indico_event_category_id'
+        - 'config:field.storage.node.field_p_event_display_caption'
+        - 'config:field.storage.node.field_p_event_display_category'
+        - 'config:field.storage.node.field_p_event_webcast_indico_id'
+        - 'config:field.storage.node.field_p_resource_display_360_url'
+        - 'config:field.storage.node.field_webcast_event_category_id'