diff --git a/modules/opencase_search/config/install/search_api.index.opencase_actors.yml b/modules/opencase_search/config/install/search_api.index.opencase_actors.yml
index 559c74b..b96681d 100644
--- a/modules/opencase_search/config/install/search_api.index.opencase_actors.yml
+++ b/modules/opencase_search/config/install/search_api.index.opencase_actors.yml
@@ -11,10 +11,15 @@ name: 'OpenCase Search: Actors'
 description: ''
 read_only: false
 field_settings:
-  name:
-    label: Name
+  first_name:
+    label: 'First Name'
     datasource_id: 'entity:oc_actor'
-    property_path: name
+    property_path: first_name
+    type: text
+  last_name:
+    label: 'Last Name'
+    datasource_id: 'entity:oc_actor'
+    property_path: last_name
     type: text
 datasource_settings:
   'entity:oc_actor':
@@ -25,16 +30,17 @@ datasource_settings:
       default: true
       selected: {  }
 processor_settings:
-  rendered_item: {  }
+  add_url: {  }
   aggregated_field: {  }
   ignorecase:
     all_fields: true
     fields:
-      - name
+      - first_name
+      - last_name
     weights:
       preprocess_index: -20
       preprocess_query: -20
-  add_url: {  }
+  rendered_item: {  }
 tracker_settings:
   default:
     indexing_order: fifo
diff --git a/modules/opencase_search/config/install/search_api.server.opencase_server.yml b/modules/opencase_search/config/install/search_api.server.opencase_server.yml
index 577ab22..04f5d27 100644
--- a/modules/opencase_search/config/install/search_api.server.opencase_server.yml
+++ b/modules/opencase_search/config/install/search_api.server.opencase_server.yml
@@ -10,7 +10,7 @@ backend: search_api_db
 backend_config:
   database: 'default:default'
   min_chars: 3
-  partial_matches: true
+  matching: partial
   autocomplete:
     suggest_suffix: true
     suggest_words: true
diff --git a/modules/opencase_search/config/install/views.view.actor_search.yml b/modules/opencase_search/config/install/views.view.actor_search.yml
index 8bdf340..f1b0c01 100644
--- a/modules/opencase_search/config/install/views.view.actor_search.yml
+++ b/modules/opencase_search/config/install/views.view.actor_search.yml
@@ -115,14 +115,14 @@ display:
       row:
         type: fields
       fields:
-        name:
-          id: name
+        first_name:
+          id: first_name
           table: search_api_datasource_opencase_actors_entity_oc_actor
-          field: name
+          field: first_name
           relationship: none
           group_type: group
           admin_label: ''
-          label: Name
+          label: 'First Name'
           exclude: false
           alter:
             alter_text: false
@@ -186,6 +186,151 @@ display:
             multi_separator: ', '
           entity_type: oc_actor
           plugin_id: search_api_field
+        last_name:
+          id: last_name
+          table: search_api_datasource_opencase_actors_entity_oc_actor
+          field: last_name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Last Name'
+          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: 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
+          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
+        type:
+          id: type
+          table: search_api_datasource_opencase_actors_entity_oc_actor
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Type
+          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: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          field_rendering: true
+          fallback_handler: search_api_entity
+          fallback_options:
+            link_to_item: false
+            use_highlighting: false
+            multi_type: separator
+            multi_separator: ', '
+            display_methods:
+              oc_actor_type:
+                display_method: label
+          entity_type: oc_actor
+          plugin_id: search_api_field
         created:
           id: created
           table: search_api_datasource_opencase_actors_entity_oc_actor
@@ -262,80 +407,6 @@ display:
             multi_separator: ', '
           entity_type: oc_actor
           plugin_id: search_api_field
-        type:
-          id: type
-          table: search_api_datasource_opencase_actors_entity_oc_actor
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Type
-          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: 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: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          field_rendering: true
-          fallback_handler: search_api_entity
-          fallback_options:
-            link_to_item: false
-            use_highlighting: false
-            multi_type: separator
-            multi_separator: ', '
-            display_methods:
-              oc_actor_type:
-                display_method: label
-          entity_type: oc_actor
-          plugin_id: search_api_field
         id:
           id: id
           table: search_api_datasource_opencase_actors_entity_oc_actor