diff --git a/modules/opencase_defaults/config/optional/block.block.osiclevel.yml b/modules/opencase_defaults/config/optional/block.block.osiclevel.yml
index 3bab4f0..9e2a830 100644
--- a/modules/opencase_defaults/config/optional/block.block.osiclevel.yml
+++ b/modules/opencase_defaults/config/optional/block.block.osiclevel.yml
@@ -23,6 +23,6 @@ settings:
 visibility:
   request_path:
     id: request_path
-    pages: '/opencase/reporting/*'
+    pages: /opencase/reporting/volunteers
     negate: false
     context_mapping: {  }
diff --git a/modules/opencase_defaults/config/optional/facets.facet.osic_level_export.yml b/modules/opencase_defaults/config/optional/facets.facet.osic_level_export.yml
index 401bceb..c042d79 100644
--- a/modules/opencase_defaults/config/optional/facets.facet.osic_level_export.yml
+++ b/modules/opencase_defaults/config/optional/facets.facet.osic_level_export.yml
@@ -3,19 +3,18 @@ status: true
 dependencies:
   config:
     - search_api.index.opencase_reporting_volunteers
-    - views.view.reporting_volunteers
   module:
-    - search_api
+    - views_data_export
 id: osic_level_export
-name: 'OSIC level (Export)'
+name: 'OSIC level Export'
 url_alias: osic_level
 weight: 0
-min_count: 0
+min_count: 1
 show_only_one_result: false
 field_identifier: field_osic_level
 facet_source_id: 'search_api:views_data_export__reporting_volunteers__data_export_1'
 widget:
-  type: checkbox
+  type: links
   config:
     show_numbers: false
     soft_limit: 0
@@ -30,6 +29,18 @@ hard_limit: 0
 exclude: false
 only_visible_when_facet_source_is_visible: true
 processor_configs:
+  active_widget_order:
+    processor_id: active_widget_order
+    weights:
+      sort: 20
+    settings:
+      sort: DESC
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: 30
+    settings:
+      sort: DESC
   display_value_widget_order:
     processor_id: display_value_widget_order
     weights:
diff --git a/modules/opencase_defaults/config/optional/search_api.index.opencase_reporting_volunteers.yml b/modules/opencase_defaults/config/optional/search_api.index.opencase_reporting_volunteers.yml
index a06aa54..8b0ef97 100644
--- a/modules/opencase_defaults/config/optional/search_api.index.opencase_reporting_volunteers.yml
+++ b/modules/opencase_defaults/config/optional/search_api.index.opencase_reporting_volunteers.yml
@@ -1,25 +1,26 @@
 langcode: en
 status: true
 dependencies:
+  config:
+    - field.storage.oc_actor.field_languages_spoken
+    - field.storage.oc_actor.field_osic_level
+    - search_api.server.opencase_reporting_server
   module:
     - opencase_entities
     - search_api
-  config:
-    - field.storage.oc_actor.field_osic_level
-    - search_api.server.opencase_reporting_server
 id: opencase_reporting_volunteers
 name: 'OpenCase Reporting: Volunteers'
 description: ''
 read_only: false
 field_settings:
-  created:
-    label: Created
+  field_languages_spoken:
+    label: 'Languages spoken'
     datasource_id: 'entity:oc_actor'
-    property_path: created
-    type: date
+    property_path: field_languages_spoken
+    type: string
     dependencies:
-      module:
-        - opencase_entities
+      config:
+        - field.storage.oc_actor.field_languages_spoken
   field_osic_level:
     label: 'OSIC level'
     datasource_id: 'entity:oc_actor'
@@ -28,6 +29,14 @@ field_settings:
     dependencies:
       config:
         - field.storage.oc_actor.field_osic_level
+  name:
+    label: Name
+    datasource_id: 'entity:oc_actor'
+    property_path: name
+    type: string
+    dependencies:
+      module:
+        - opencase_entities
 datasource_settings:
   'entity:oc_actor':
     bundles:
diff --git a/modules/opencase_defaults/config/optional/views.view.reporting_volunteers.yml b/modules/opencase_defaults/config/optional/views.view.reporting_volunteers.yml
index 715c5c6..188c035 100644
--- a/modules/opencase_defaults/config/optional/views.view.reporting_volunteers.yml
+++ b/modules/opencase_defaults/config/optional/views.view.reporting_volunteers.yml
@@ -70,12 +70,33 @@ display:
             next: ››
       style:
         type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            field_languages_spoken: field_languages_spoken
+          info:
+            field_languages_spoken:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: '-1'
+          empty_table: false
       row:
         type: fields
       fields:
         name:
           id: name
-          table: search_api_datasource_opencase_reporting_volunteers_entity_oc_actor
+          table: search_api_index_opencase_reporting_volunteers
           field: name
           relationship: none
           group_type: group
@@ -142,16 +163,15 @@ display:
             use_highlighting: false
             multi_type: separator
             multi_separator: ', '
-          entity_type: oc_actor
           plugin_id: search_api_field
-        created:
-          id: created
-          table: search_api_datasource_opencase_reporting_volunteers_entity_oc_actor
-          field: created
+        field_languages_spoken_1:
+          id: field_languages_spoken_1
+          table: search_api_index_opencase_reporting_volunteers
+          field: field_languages_spoken
           relationship: none
           group_type: group
           admin_label: ''
-          label: 'Created Date'
+          label: 'Languages spoken'
           exclude: false
           alter:
             alter_text: false
@@ -184,7 +204,7 @@ display:
           element_class: ''
           element_label_type: ''
           element_label_class: ''
-          element_label_colon: false
+          element_label_colon: true
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
@@ -193,11 +213,8 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
+          type: list_default
+          settings: {  }
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -209,16 +226,12 @@ display:
           separator: ', '
           field_api_classes: false
           field_rendering: true
-          fallback_handler: search_api_date
+          fallback_handler: search_api
           fallback_options:
-            date_format: fallback
-            custom_date_format: ''
-            timezone: ''
             link_to_item: false
             use_highlighting: false
             multi_type: separator
             multi_separator: ', '
-          entity_type: oc_actor
           plugin_id: search_api_field
         field_osic_level:
           id: field_osic_level
@@ -227,7 +240,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          label: 'OSIC Level'
+          label: 'OSIC level'
           exclude: false
           alter:
             alter_text: false
@@ -288,102 +301,16 @@ display:
             use_highlighting: false
             multi_type: separator
             multi_separator: ', '
-          entity_type: null
-          entity_field: null
-          plugin_id: search_api_field
-        field_languages_spoken:
-          id: field_languages_spoken
-          table: search_api_datasource_opencase_reporting_volunteers_entity_oc_actor
-          field: field_languages_spoken
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Languages
-          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: true
-          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: list_default
-          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
-          field_rendering: true
-          fallback_handler: search_api
-          fallback_options:
-            link_to_item: false
-            use_highlighting: false
-            multi_type: separator
-            multi_separator: ', '
-          entity_type: oc_actor
           plugin_id: search_api_field
       filters: {  }
       sorts: {  }
       title: 'Volunteer Report'
-      header:
-        entity_block_content:
-          id: entity_block_content
-          table: views
-          field: entity_block_content
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: false
-          tokenize: true
-          target: 944ff38d-5931-4439-91d5-f53b5ad7aac7
-          view_mode: default
-          bypass_access: false
-          plugin_id: entity
+      header: {  }
       footer: {  }
       empty: {  }
       relationships: {  }
       arguments: {  }
       display_extenders: {  }
-      use_ajax: true
     cache_metadata:
       max-age: -1
       contexts:
@@ -403,6 +330,13 @@ display:
       display_extenders: {  }
       path: opencase/reporting/volunteers
       filename: '[view:title].csv'
+      cache:
+        type: none
+      defaults:
+        cache: false
+      displays:
+        page_1: page_1
+        default: '0'
       style:
         type: data_export
         options:
@@ -427,9 +361,6 @@ display:
               category: ''
               manager: ''
               company: ''
-      displays:
-        page_1: page_1
-        default: '0'
     cache_metadata:
       max-age: -1
       contexts:
@@ -448,6 +379,10 @@ display:
     display_options:
       display_extenders: {  }
       path: opencase/reporting/volunteers
+      cache:
+        type: none
+      defaults:
+        cache: false
     cache_metadata:
       max-age: -1
       contexts: