diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml
index 79b7702..264a29f 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml
@@ -9,6 +9,7 @@ dependencies:
     - field.field.oc_actor.client.field_disability
     - field.field.oc_actor.client.field_ethnic_o
     - field.field.oc_actor.client.field_gender_identified_with
+    - field.field.oc_actor.client.field_general_noes
     - field.field.oc_actor.client.field_how_heard
     - field.field.oc_actor.client.field_income
     - field.field.oc_actor.client.field_languages_spoken
@@ -26,7 +27,7 @@ bundle: client
 mode: default
 content:
   field_asylum_status:
-    weight: 4
+    weight: 3
     settings: {  }
     third_party_settings: {  }
     type: options_select
@@ -40,7 +41,7 @@ content:
     type: string_textfield
     region: content
   field_confidentiality_form:
-    weight: 13
+    weight: 12
     settings:
       progress_indicator: throbber
     third_party_settings: {  }
@@ -53,7 +54,7 @@ content:
     type: datetime_default
     region: content
   field_dependants:
-    weight: 10
+    weight: 9
     settings:
       size: 60
       placeholder: ''
@@ -61,7 +62,7 @@ content:
     type: string_textfield
     region: content
   field_disability:
-    weight: 8
+    weight: 7
     settings:
       size: 60
       placeholder: ''
@@ -69,7 +70,7 @@ content:
     type: string_textfield
     region: content
   field_ethnic_o:
-    weight: 5
+    weight: 4
     settings:
       size: 60
       placeholder: ''
@@ -82,50 +83,52 @@ content:
     third_party_settings: {  }
     type: options_select
     region: content
+  field_general_noes:
+    weight: 13
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+    type: string_textarea
+    region: content
   field_how_heard:
-    weight: 11
+    weight: 10
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_income:
-    weight: 9
+    weight: 8
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_languages_spoken:
-    weight: 7
+    weight: 6
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_marital_:
-    weight: 3
+    weight: 2
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_nationalities:
     type: options_select
-    weight: 6
+    weight: 5
     region: content
     settings: {  }
     third_party_settings: {  }
   field_referred_by:
-    weight: 12
+    weight: 11
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
     type: string_textfield
     region: content
-  field_sex:
-    weight: 2
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
   name:
     type: string_textfield
     weight: -4
@@ -141,6 +144,6 @@ content:
       match_operator: CONTAINS
       size: 60
       placeholder: ''
+      match_limit: 10
     region: content
     third_party_settings: {  }
-hidden: {  }
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.volunteer.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.volunteer.default.yml
index b92a05e..d631463 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.volunteer.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.volunteer.default.yml
@@ -2,6 +2,8 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.oc_actor.volunteer.field_ethnic_o
+    - field.field.oc_actor.volunteer.field_general_noes
     - field.field.oc_actor.volunteer.field_languages_spoken
     - field.field.oc_actor.volunteer.field_nationalities
     - field.field.oc_actor.volunteer.field_osic_level
@@ -12,13 +14,7 @@ targetEntityType: oc_actor
 bundle: volunteer
 mode: default
 content:
-  field_languages_spoken:
-    weight: 1
-    settings: {  }
-    third_party_settings: {  }
-    type: options_select
-    region: content
-  field_nationalities:
+  field_ethnic_o:
     weight: 0
     settings:
       size: 60
@@ -26,18 +22,56 @@ content:
     third_party_settings: {  }
     type: string_textfield
     region: content
-  field_osic_level:
+  field_general_noes:
+    weight: 5
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+    type: string_textarea
+    region: content
+  field_languages_spoken:
     weight: 2
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
+  field_nationalities:
+    type: options_select
+    weight: 1
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_osic_level:
+    weight: 3
+    settings: {  }
+    third_party_settings: {  }
+    type: options_select
+    region: content
   field_skills:
     type: string_textarea
-    weight: 3
+    weight: 4
     region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: -4
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  user_id:
+    type: entity_reference_autocomplete
+    weight: 5
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+      match_limit: 10
+    region: content
+    third_party_settings: {  }
 hidden: {  }
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.accommodation.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.accommodation.default.yml
index b85bfd3..3afa432 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.accommodation.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.accommodation.default.yml
@@ -7,7 +7,7 @@ dependencies:
     - field.field.oc_case.accommodation.field_fee_or_equivalent_cost
     - field.field.oc_case.accommodation.field_outcome
     - field.field.oc_case.accommodation.field_type_of_acco
-    - opencase_entities.oc_case_type.accommodation
+    - opencase_cases.oc_case_type.accommodation
   module:
     - file
 id: oc_case.accommodation.default
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.asylum_support.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.asylum_support.default.yml
index 0bd02c3..8314c5c 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.asylum_support.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.asylum_support.default.yml
@@ -7,7 +7,7 @@ dependencies:
     - field.field.oc_case.asylum_support.field_fee_or_equivalent_cost
     - field.field.oc_case.asylum_support.field_outcome
     - field.field.oc_case.asylum_support.field_type_of_as
-    - opencase_entities.oc_case_type.asylum_support
+    - opencase_cases.oc_case_type.asylum_support
   module:
     - file
 id: oc_case.asylum_support.default
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.employability.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.employability.default.yml
index baa4174..88a7170 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.employability.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.employability.default.yml
@@ -8,7 +8,7 @@ dependencies:
     - field.field.oc_case.employability.field_gave_list_of_agencies
     - field.field.oc_case.employability.field_outcome
     - field.field.oc_case.employability.field_type_of_employability_help
-    - opencase_entities.oc_case_type.employability
+    - opencase_cases.oc_case_type.employability
   module:
     - file
 id: oc_case.employability.default
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.enquiry.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.enquiry.default.yml
new file mode 100644
index 0000000..b647493
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.enquiry.default.yml
@@ -0,0 +1,30 @@
+uuid: 3be6941a-41a5-4f81-a3ac-2f5741061ec4
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.enquiry.field_outcome
+    - field.field.oc_case.enquiry.field_subject_of_enquiry
+    - opencase_cases.oc_case_type.enquiry
+  module:
+    - file
+id: oc_case.enquiry.default
+targetEntityType: oc_case
+bundle: enquiry
+mode: default
+content:
+  field_outcome:
+    weight: 1
+    settings: {  }
+    third_party_settings: {  }
+    type: options_select
+    region: content
+  field_subject_of_enquiry:
+    weight: 0
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+    type: string_textarea
+    region: content
+hidden: {  }
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.health.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.health.default.yml
index 921e264..03ba48e 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.health.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.health.default.yml
@@ -7,7 +7,7 @@ dependencies:
     - field.field.oc_case.health.field_fee_or_equivalent_cost
     - field.field.oc_case.health.field_outcome
     - field.field.oc_case.health.field_type_health
-    - opencase_entities.oc_case_type.health
+    - opencase_cases.oc_case_type.health
   module:
     - file
 id: oc_case.health.default
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.immigration.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.immigration.default.yml
index 9a7b7b1..5721aaa 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.immigration.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.immigration.default.yml
@@ -8,7 +8,7 @@ dependencies:
     - field.field.oc_case.immigration.field_level
     - field.field.oc_case.immigration.field_outcome
     - field.field.oc_case.immigration.field_type_of_applicat
-    - opencase_entities.oc_case_type.immigration
+    - opencase_cases.oc_case_type.immigration
   module:
     - file
 id: oc_case.immigration.default
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.pro_bono_immigration_service.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.pro_bono_immigration_service.default.yml
new file mode 100644
index 0000000..c1ed95a
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.pro_bono_immigration_service.default.yml
@@ -0,0 +1,21 @@
+uuid: 97d85717-c582-4efa-93cc-786cc078f3d5
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.pro_bono_immigration_service.field_outcome
+    - opencase_cases.oc_case_type.pro_bono_immigration_service
+  module:
+    - file
+id: oc_case.pro_bono_immigration_service.default
+targetEntityType: oc_case
+bundle: pro_bono_immigration_service
+mode: default
+content:
+  field_outcome:
+    weight: 26
+    settings: {  }
+    third_party_settings: {  }
+    type: options_select
+    region: content
+hidden: {  }
diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.welfare_rights.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.welfare_rights.default.yml
index 27ca859..e569f47 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.welfare_rights.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_case.welfare_rights.default.yml
@@ -7,7 +7,7 @@ dependencies:
     - field.field.oc_case.welfare_rights.field_fee_or_equivalent_cost
     - field.field.oc_case.welfare_rights.field_outcome
     - field.field.oc_case.welfare_rights.field_type_of_welfare_rights_iss
-    - opencase_entities.oc_case_type.welfare_rights
+    - opencase_cases.oc_case_type.welfare_rights
   module:
     - file
 id: oc_case.welfare_rights.default
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_actor.client.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_actor.client.default.yml
index 9d05f40..09632e9 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_actor.client.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_actor.client.default.yml
@@ -9,6 +9,7 @@ dependencies:
     - field.field.oc_actor.client.field_disability
     - field.field.oc_actor.client.field_ethnic_o
     - field.field.oc_actor.client.field_gender_identified_with
+    - field.field.oc_actor.client.field_general_noes
     - field.field.oc_actor.client.field_how_heard
     - field.field.oc_actor.client.field_income
     - field.field.oc_actor.client.field_languages_spoken
@@ -27,7 +28,7 @@ bundle: client
 mode: default
 content:
   field_asylum_status:
-    weight: 6
+    weight: 3
     label: above
     settings: {  }
     third_party_settings: {  }
@@ -42,7 +43,7 @@ content:
     type: string
     region: content
   field_confidentiality_form:
-    weight: 15
+    weight: 12
     label: above
     settings:
       use_description_as_link_text: true
@@ -50,7 +51,7 @@ content:
     type: file_default
     region: content
   field_date_of_birth:
-    weight: 3
+    weight: 0
     label: above
     settings:
       timezone_override: ''
@@ -59,7 +60,7 @@ content:
     type: datetime_default
     region: content
   field_dependants:
-    weight: 12
+    weight: 9
     label: above
     settings:
       link_to_entity: false
@@ -67,14 +68,6 @@ content:
     type: string
     region: content
   field_disability:
-    weight: 10
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    type: string
-    region: content
-  field_ethnic_o:
     weight: 7
     label: above
     settings:
@@ -82,51 +75,65 @@ content:
     third_party_settings: {  }
     type: string
     region: content
-  field_gender_identified_with:
+  field_ethnic_o:
     weight: 4
     label: above
-    settings: {  }
-    third_party_settings: {  }
-    type: list_default
-    region: content
-  field_how_heard:
-    weight: 13
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    type: list_default
-    region: content
-  field_income:
-    weight: 11
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    type: list_default
-    region: content
-  field_languages_spoken:
-    weight: 9
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    type: list_default
-    region: content
-  field_marital_:
-    weight: 5
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    type: list_default
-    region: content
-  field_nationalities:
-    weight: 8
-    label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
     type: string
     region: content
+  field_gender_identified_with:
+    weight: 1
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_general_noes:
+    weight: 13
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: basic_string
+    region: content
+  field_how_heard:
+    weight: 10
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_income:
+    weight: 8
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_languages_spoken:
+    weight: 6
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_marital_:
+    weight: 2
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_nationalities:
+    type: list_default
+    weight: 5
+    region: content
+    label: above
+    settings: {  }
+    third_party_settings: {  }
   field_referred_by:
-    weight: 14
+    weight: 11
     label: above
     settings:
       link_to_entity: false
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml
index 4ee697b..a0cf1d6 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml
@@ -2,6 +2,8 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.oc_actor.volunteer.field_ethnic_o
+    - field.field.oc_actor.volunteer.field_general_noes
     - field.field.oc_actor.volunteer.field_languages_spoken
     - field.field.oc_actor.volunteer.field_nationalities
     - field.field.oc_actor.volunteer.field_osic_level
@@ -15,26 +17,40 @@ targetEntityType: oc_actor
 bundle: volunteer
 mode: default
 content:
-  field_languages_spoken:
-    weight: 4
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    type: list_default
-    region: content
-  field_nationalities:
-    weight: 3
+  field_ethnic_o:
+    weight: 0
     label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
     type: string
     region: content
-  field_osic_level:
+  field_general_noes:
     weight: 5
     label: above
     settings: {  }
     third_party_settings: {  }
+    type: basic_string
+    region: content
+  field_languages_spoken:
+    weight: 2
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_nationalities:
+    type: list_default
+    weight: 1
+    region: content
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+  field_osic_level:
+    weight: 3
+    label: above
+    settings: {  }
+    third_party_settings: {  }
     type: list_default
     region: content
   field_sdfdsfds:
@@ -46,7 +62,7 @@ content:
     region: content
   field_skills:
     type: basic_string
-    weight: 6
+    weight: 4
     region: content
     label: above
     settings: {  }
@@ -59,27 +75,4 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-  phone:
-    label: above
-    type: string
-    weight: 0
-    region: content
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-  phone2:
-    label: above
-    type: string
-    weight: 1
-    region: content
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-  postal_address:
-    label: above
-    type: basic_string
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
 hidden: {  }
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.accommodation.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.accommodation.default.yml
index 9db05f9..9365305 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.accommodation.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.accommodation.default.yml
@@ -7,7 +7,7 @@ dependencies:
     - field.field.oc_case.accommodation.field_fee_or_equivalent_cost
     - field.field.oc_case.accommodation.field_outcome
     - field.field.oc_case.accommodation.field_type_of_acco
-    - opencase_entities.oc_case_type.accommodation
+    - opencase_cases.oc_case_type.accommodation
   module:
     - file
     - options
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.asylum_support.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.asylum_support.default.yml
index d113aff..ea9becb 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.asylum_support.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.asylum_support.default.yml
@@ -7,7 +7,7 @@ dependencies:
     - field.field.oc_case.asylum_support.field_fee_or_equivalent_cost
     - field.field.oc_case.asylum_support.field_outcome
     - field.field.oc_case.asylum_support.field_type_of_as
-    - opencase_entities.oc_case_type.asylum_support
+    - opencase_cases.oc_case_type.asylum_support
   module:
     - file
     - options
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.employability.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.employability.default.yml
index 4a8271a..52e4f90 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.employability.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.employability.default.yml
@@ -8,7 +8,7 @@ dependencies:
     - field.field.oc_case.employability.field_gave_list_of_agencies
     - field.field.oc_case.employability.field_outcome
     - field.field.oc_case.employability.field_type_of_employability_help
-    - opencase_entities.oc_case_type.employability
+    - opencase_cases.oc_case_type.employability
   module:
     - file
     - options
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.enquiry.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.enquiry.default.yml
new file mode 100644
index 0000000..4d4de22
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.enquiry.default.yml
@@ -0,0 +1,33 @@
+uuid: da67cba0-f1ea-438c-8c96-71fb9d769f5a
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.enquiry.field_outcome
+    - field.field.oc_case.enquiry.field_subject_of_enquiry
+    - opencase_cases.oc_case_type.enquiry
+  module:
+    - file
+    - options
+    - user
+id: oc_case.enquiry.default
+targetEntityType: oc_case
+bundle: enquiry
+mode: default
+content:
+  field_outcome:
+    weight: 1
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+  field_subject_of_enquiry:
+    weight: 0
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: basic_string
+    region: content
+hidden:
+  search_api_excerpt: true
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.health.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.health.default.yml
index be108c8..7119076 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.health.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.health.default.yml
@@ -7,7 +7,7 @@ dependencies:
     - field.field.oc_case.health.field_fee_or_equivalent_cost
     - field.field.oc_case.health.field_outcome
     - field.field.oc_case.health.field_type_health
-    - opencase_entities.oc_case_type.health
+    - opencase_cases.oc_case_type.health
   module:
     - file
     - options
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.immigration.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.immigration.default.yml
index 82b7399..21255d7 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.immigration.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.immigration.default.yml
@@ -8,7 +8,7 @@ dependencies:
     - field.field.oc_case.immigration.field_level
     - field.field.oc_case.immigration.field_outcome
     - field.field.oc_case.immigration.field_type_of_applicat
-    - opencase_entities.oc_case_type.immigration
+    - opencase_cases.oc_case_type.immigration
   module:
     - file
     - options
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.pro_bono_immigration_service.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.pro_bono_immigration_service.default.yml
new file mode 100644
index 0000000..ae0e550
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.pro_bono_immigration_service.default.yml
@@ -0,0 +1,25 @@
+uuid: a559f6f0-cc30-4a13-8882-7a042a965fc7
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.oc_case.pro_bono_immigration_service.field_outcome
+    - opencase_cases.oc_case_type.pro_bono_immigration_service
+  module:
+    - file
+    - options
+    - user
+id: oc_case.pro_bono_immigration_service.default
+targetEntityType: oc_case
+bundle: pro_bono_immigration_service
+mode: default
+content:
+  field_outcome:
+    weight: 6
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
+hidden:
+  search_api_excerpt: true
diff --git a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.welfare_rights.default.yml b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.welfare_rights.default.yml
index b797f70..3414976 100644
--- a/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.welfare_rights.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_view_display.oc_case.welfare_rights.default.yml
@@ -7,7 +7,7 @@ dependencies:
     - field.field.oc_case.welfare_rights.field_fee_or_equivalent_cost
     - field.field.oc_case.welfare_rights.field_outcome
     - field.field.oc_case.welfare_rights.field_type_of_welfare_rights_iss
-    - opencase_entities.oc_case_type.welfare_rights
+    - opencase_cases.oc_case_type.welfare_rights
   module:
     - file
     - options
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_confidentiality_form.yml b/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_confidentiality_form.yml
index 4cc8185..f9019d3 100644
--- a/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_confidentiality_form.yml
+++ b/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_confidentiality_form.yml
@@ -19,7 +19,7 @@ default_value_callback: ''
 settings:
   file_directory: '[date:custom:Y]-[date:custom:m]'
   file_extensions: pdf
-  max_filesize: ''
+  max_filesize: '2 MB'
   description_field: false
   handler: 'default:file'
   handler_settings: {  }
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_general_noes.yml b/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_general_noes.yml
new file mode 100644
index 0000000..dbd81f0
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/field.field.oc_actor.client.field_general_noes.yml
@@ -0,0 +1,19 @@
+uuid: 35db2b5a-8ce8-4d8c-930d-195da8c0f895
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_general_noes
+    - opencase_entities.oc_actor_type.client
+id: oc_actor.client.field_general_noes
+field_name: field_general_noes
+entity_type: oc_actor
+bundle: client
+label: 'General notes'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string_long
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_general_noes.yml b/modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_general_noes.yml
new file mode 100644
index 0000000..425aead
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/field.field.oc_actor.volunteer.field_general_noes.yml
@@ -0,0 +1,19 @@
+uuid: acfde2f5-ba98-4e83-ba0e-712b23ee4330
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_actor.field_general_noes
+    - opencase_entities.oc_actor_type.volunteer
+id: oc_actor.volunteer.field_general_noes
+field_name: field_general_noes
+entity_type: oc_actor
+bundle: volunteer
+label: 'General notes'
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string_long
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_case.enquiry.field_outcome.yml b/modules/opencase_defaults/config/optional/field.field.oc_case.enquiry.field_outcome.yml
new file mode 100644
index 0000000..1a435f7
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/field.field.oc_case.enquiry.field_outcome.yml
@@ -0,0 +1,23 @@
+uuid: 8c80505b-97bb-4668-a24c-9c776b0661ba
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_outcome
+    - opencase_cases.oc_case_type.enquiry
+  module:
+    - options
+id: oc_case.enquiry.field_outcome
+field_name: field_outcome
+entity_type: oc_case
+bundle: enquiry
+label: Outcome
+description: ''
+required: false
+translatable: true
+default_value:
+  -
+    value: 'One-off interaction'
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_case.enquiry.field_subject_of_enquiry.yml b/modules/opencase_defaults/config/optional/field.field.oc_case.enquiry.field_subject_of_enquiry.yml
new file mode 100644
index 0000000..bb43104
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/field.field.oc_case.enquiry.field_subject_of_enquiry.yml
@@ -0,0 +1,19 @@
+uuid: 58b926b1-a245-4d73-8cca-b93d92b59144
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_subject_of_enquiry
+    - opencase_cases.oc_case_type.enquiry
+id: oc_case.enquiry.field_subject_of_enquiry
+field_name: field_subject_of_enquiry
+entity_type: oc_case
+bundle: enquiry
+label: 'Subject of Enquiry'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string_long
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_case.immigration.field_level.yml b/modules/opencase_defaults/config/optional/field.field.oc_case.immigration.field_level.yml
index cad6a63..d614a40 100644
--- a/modules/opencase_defaults/config/optional/field.field.oc_case.immigration.field_level.yml
+++ b/modules/opencase_defaults/config/optional/field.field.oc_case.immigration.field_level.yml
@@ -3,7 +3,7 @@ status: true
 dependencies:
   config:
     - field.storage.oc_case.field_level
-    - opencase_entities.oc_case_type.immigration
+    - opencase_cases.oc_case_type.immigration
   module:
     - options
 id: oc_case.immigration.field_level
diff --git a/modules/opencase_defaults/config/optional/field.field.oc_case.pro_bono_immigration_service.field_outcome.yml b/modules/opencase_defaults/config/optional/field.field.oc_case.pro_bono_immigration_service.field_outcome.yml
new file mode 100644
index 0000000..a2b8515
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/field.field.oc_case.pro_bono_immigration_service.field_outcome.yml
@@ -0,0 +1,21 @@
+uuid: aa34a1ff-3c45-408b-b0ad-f8b9138a4358
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_outcome
+    - opencase_cases.oc_case_type.pro_bono_immigration_service
+  module:
+    - options
+id: oc_case.pro_bono_immigration_service.field_outcome
+field_name: field_outcome
+entity_type: oc_case
+bundle: pro_bono_immigration_service
+label: Outcome
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: list_string
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_general_noes.yml b/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_general_noes.yml
new file mode 100644
index 0000000..4d3186d
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_general_noes.yml
@@ -0,0 +1,19 @@
+uuid: cf3b8b2e-1857-42bc-a807-b62b8ff2c458
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+id: oc_actor.field_general_noes
+field_name: field_general_noes
+entity_type: oc_actor
+type: string_long
+settings:
+  case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_nationalities.yml b/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_nationalities.yml
index ec370f6..92e8e48 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_nationalities.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_actor.field_nationalities.yml
@@ -10,6 +10,9 @@ entity_type: oc_actor
 type: list_string
 settings:
   allowed_values:
+    -
+      value: Stateless
+      label: Stateless
     -
       value: Afghan
       label: Afghan
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_case_finance.yml b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_case_finance.yml
index 7a75f38..05ada3d 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_case_finance.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_case_finance.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - opencase_cases
+    - opencase_entities
     - options
 id: oc_case.field_case_finance
 field_name: field_case_finance
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_fee_calculation.yml b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_fee_calculation.yml
index 67e6913..1503d63 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_fee_calculation.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_fee_calculation.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - opencase_case
+    - opencase_entities
     - options
 id: oc_case.field_fee_calculation
 field_name: field_fee_calculation
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_fee_or_equivalent_cost.yml b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_fee_or_equivalent_cost.yml
index 78cae15..a947b3b 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_fee_or_equivalent_cost.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_fee_or_equivalent_cost.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - opencase_cases
+    - opencase_entities
 id: oc_case.field_fee_or_equivalent_cost
 field_name: field_fee_or_equivalent_cost
 entity_type: oc_case
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_gave_list_of_agencies.yml b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_gave_list_of_agencies.yml
index 881254f..5aefa2d 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_gave_list_of_agencies.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_gave_list_of_agencies.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - opencase_cases
+    - opencase_entities
 id: oc_case.field_gave_list_of_agencies
 field_name: field_gave_list_of_agencies
 entity_type: oc_case
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_level.yml b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_level.yml
index f898ce6..fc507b7 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_level.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_level.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - opencase_cases
+    - opencase_entities
     - options
 id: oc_case.field_level
 field_name: field_level
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_outcome.yml b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_outcome.yml
index f762787..c4ab9e6 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_outcome.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_outcome.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - opencase_cases
+    - opencase_entities
     - options
 id: oc_case.field_outcome
 field_name: field_outcome
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_subject_of_enquiry.yml b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_subject_of_enquiry.yml
new file mode 100644
index 0000000..bec5e01
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_subject_of_enquiry.yml
@@ -0,0 +1,19 @@
+uuid: 91abf4d4-f0dd-4465-b801-2d0ce8e5c006
+langcode: en
+status: true
+dependencies:
+  module:
+    - opencase_entities
+id: oc_case.field_subject_of_enquiry
+field_name: field_subject_of_enquiry
+entity_type: oc_case
+type: string_long
+settings:
+  case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_health.yml b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_health.yml
index 5090a51..3501096 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_health.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_health.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - opencase_cases
+    - opencase_entities
     - options
 id: oc_case.field_type_health
 field_name: field_type_health
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_acco.yml b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_acco.yml
index 60dbc23..91f09f3 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_acco.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_acco.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - opencase_cases
+    - opencase_entities
     - options
 id: oc_case.field_type_of_acco
 field_name: field_type_of_acco
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_applicat.yml b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_applicat.yml
index d27164f..bc8702f 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_applicat.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_applicat.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - opencase_cases
+    - opencase_entities
     - options
 id: oc_case.field_type_of_applicat
 field_name: field_type_of_applicat
@@ -13,6 +13,9 @@ settings:
     -
       value: 'Asylum fresh submission'
       label: 'Asylum fresh submission'
+    -
+      value: SET(P)
+      label: SET(P)
     -
       value: 'Human rights'
       label: 'Human rights'
@@ -24,10 +27,13 @@ settings:
       label: 'Travel document'
     -
       value: 'Lost brp'
-      label: 'Lost brp'
+      label: 'Replacement brp'
     -
       value: 'Spouse visa and renewal'
       label: 'Spouse visa and renewal'
+    -
+      value: 'Visit visa'
+      label: 'Visit visa'
     -
       value: 'Tier 1'
       label: 'Tier 1'
@@ -37,6 +43,9 @@ settings:
     -
       value: 'Tier 4'
       label: 'Tier 4'
+    -
+      value: 'Tier 5'
+      label: 'Tier 5'
     -
       value: DL
       label: DL
@@ -46,9 +55,15 @@ settings:
     -
       value: 'Family reunion'
       label: 'Family reunion'
+    -
+      value: 'Family reunion (non-refugee)'
+      label: 'Family reunion (non-refugee)'
     -
       value: Stateless
       label: Stateless
+    -
+      value: 'EU SS'
+      label: 'EU SS'
     -
       value: 'EEA PR'
       label: 'EEA PR'
@@ -73,6 +88,15 @@ settings:
     -
       value: 'Judicial review'
       label: 'Judicial review'
+    -
+      value: 'Ten year partner/parent route'
+      label: 'Ten year partner/parent route'
+    -
+      value: 'Private life'
+      label: 'Private life'
+    -
+      value: NTL
+      label: NTL
   allowed_values_function: ''
 module: options
 locked: false
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_as.yml b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_as.yml
index 7afa1e4..33458e5 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_as.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_as.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - opencase_cases
+    - opencase_entities
     - options
 id: oc_case.field_type_of_as
 field_name: field_type_of_as
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_employability_help.yml b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_employability_help.yml
index 4b52e5a..86a8407 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_employability_help.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_employability_help.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - opencase_cases
+    - opencase_entities
     - options
 id: oc_case.field_type_of_employability_help
 field_name: field_type_of_employability_help
diff --git a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_welfare_rights_iss.yml b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_welfare_rights_iss.yml
index 47be47b..e394906 100644
--- a/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_welfare_rights_iss.yml
+++ b/modules/opencase_defaults/config/optional/field.storage.oc_case.field_type_of_welfare_rights_iss.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - opencase_cases
+    - opencase_entities
     - options
 id: oc_case.field_type_of_welfare_rights_iss
 field_name: field_type_of_welfare_rights_iss
diff --git a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.enquiry.yml b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.enquiry.yml
new file mode 100644
index 0000000..f5777b4
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.enquiry.yml
@@ -0,0 +1,17 @@
+uuid: 9f9d34a2-2d19-4b77-a1a0-8c988ab86a90
+langcode: en
+status: true
+dependencies: {  }
+id: enquiry
+label: Enquiry
+allowedActivityTypes:
+  application: 0
+  case_note: 0
+  destitution_funds_provided: 0
+  email: 0
+  interview: 0
+  lete: 0
+  research: 0
+  supervision: 0
+  telephone_call: 0
+  volunteer_training_session: 0
diff --git a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.pro_bono_immigration_service.yml b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.pro_bono_immigration_service.yml
new file mode 100644
index 0000000..ea96589
--- /dev/null
+++ b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.pro_bono_immigration_service.yml
@@ -0,0 +1,16 @@
+uuid: 0ee88268-bd79-4d17-9520-b1db6f1ad697
+langcode: en
+status: true
+dependencies: {  }
+id: pro_bono_immigration_service
+label: 'Pro Bono Immigration Service'
+allowedActivityTypes:
+  application: application
+  case_note: case_note
+  destitution_funds_provided: destitution_funds_provided
+  email: email
+  interview: interview
+  lete: lete
+  research: research
+  telephone_call: telephone_call
+  volunteer_training_session: 0
diff --git a/modules/opencase_defaults/config/optional/user.role.caseworker.yml b/modules/opencase_defaults/config/optional/user.role.caseworker.yml
index 608f5fd..cb2d9f0 100644
--- a/modules/opencase_defaults/config/optional/user.role.caseworker.yml
+++ b/modules/opencase_defaults/config/optional/user.role.caseworker.yml
@@ -15,6 +15,5 @@ permissions:
   - 'edit activity entities'
   - 'edit case entities'
   - 'edit client entities'
-  - 'use opencase'
   - 'view own cases'
   - 'view published client entities'
diff --git a/modules/opencase_defaults/config/optional/user.role.opencase_admin.yml b/modules/opencase_defaults/config/optional/user.role.opencase_admin.yml
index 50ae4f2..e4e32a9 100644
--- a/modules/opencase_defaults/config/optional/user.role.opencase_admin.yml
+++ b/modules/opencase_defaults/config/optional/user.role.opencase_admin.yml
@@ -10,14 +10,9 @@ permissions:
   - 'add case entities'
   - 'add client entities'
   - 'add volunteer entities'
-  - 'administer oc_activity display'
   - 'administer oc_activity fields'
-  - 'administer oc_activity form display'
-  - 'administer oc_actor display'
   - 'administer oc_actor fields'
-  - 'administer oc_actor form display'
   - 'administer oc_case fields'
-  - 'administer oc_case form display'
   - 'administer opencase entity bundles'
   - 'administer users'
   - 'delete activity entities'
diff --git a/modules/opencase_defaults/config/optional/user.role.overseer.yml b/modules/opencase_defaults/config/optional/user.role.overseer.yml
index eadda6c..9288470 100644
--- a/modules/opencase_defaults/config/optional/user.role.overseer.yml
+++ b/modules/opencase_defaults/config/optional/user.role.overseer.yml
@@ -18,7 +18,6 @@ permissions:
   - 'edit case entities'
   - 'edit client entities'
   - 'edit volunteer entities'
-  - 'use opencase'
   - 'view published case entities'
   - 'view published client entities'
   - 'view published volunteer entities'
diff --git a/modules/opencase_defaults/config/optional/user.role.volunteer_co_ord.yml b/modules/opencase_defaults/config/optional/user.role.volunteer_co_ord.yml
index 0a3d48f..98a1bc5 100644
--- a/modules/opencase_defaults/config/optional/user.role.volunteer_co_ord.yml
+++ b/modules/opencase_defaults/config/optional/user.role.volunteer_co_ord.yml
@@ -15,5 +15,4 @@ permissions:
   - 'edit activity entities'
   - 'edit case entities'
   - 'edit volunteer entities'
-  - 'use opencase'
   - 'view published volunteer entities'
diff --git a/modules/opencase_defaults/config/optional/views.view.name_and_status_changes.yml b/modules/opencase_defaults/config/optional/views.view.name_and_status_changes.yml
index ea02ebe..06b6ff7 100644
--- a/modules/opencase_defaults/config/optional/views.view.name_and_status_changes.yml
+++ b/modules/opencase_defaults/config/optional/views.view.name_and_status_changes.yml
@@ -40,11 +40,11 @@ display:
       exposed_form:
         type: basic
         options:
-          submit_button: Apply
+          submit_button: Go
           reset_button: false
           reset_button_label: Reset
           exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
+          expose_sort_order: false
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
@@ -535,8 +535,8 @@ display:
           exclude: true
           alter:
             alter_text: true
-            text: 'View the current record for this person ▼'
-            make_link: false
+            text: 'View current record for this person ▼'
+            make_link: true
             path: ''
             absolute: false
             external: false
@@ -572,12 +572,106 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: ''
+          text: 'See "rewrite results" (had to do it that way because contains HTML).'
           output_url_as_text: false
           absolute: false
           entity_type: oc_actor
           plugin_id: entity_link
-      filters: {  }
+      filters:
+        first_name:
+          id: first_name
+          table: oc_actor_field_revision
+          field: first_name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: starts
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: first_name_op
+            label: 'First Name'
+            description: ''
+            use_operator: false
+            operator: first_name_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: first_name
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+              overseer: '0'
+              caseworker: '0'
+              volunteer_co_ord: '0'
+              opencase_admin: '0'
+            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: {  }
+          entity_type: oc_actor
+          entity_field: first_name
+          plugin_id: string
+        last_name:
+          id: last_name
+          table: oc_actor_field_revision
+          field: last_name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: starts
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: last_name_op
+            label: 'Last Name'
+            description: ''
+            use_operator: false
+            operator: last_name_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: last_name
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+              overseer: '0'
+              caseworker: '0'
+              volunteer_co_ord: '0'
+              opencase_admin: '0'
+            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: {  }
+          entity_type: oc_actor
+          entity_field: last_name
+          plugin_id: string
       sorts:
         revision_created:
           id: revision_created
@@ -586,7 +680,7 @@ display:
           relationship: none
           group_type: min
           admin_label: ''
-          order: DESC
+          order: ASC
           exposed: false
           expose:
             label: ''
@@ -601,12 +695,14 @@ display:
       arguments: {  }
       display_extenders: {  }
       group_by: true
+      use_ajax: true
       title: 'Name, Asylum and Marital Status Report'
     cache_metadata:
       max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
+        - url
         - user.permissions
       tags:
         - 'config:field.storage.oc_actor.field_asylum_status'
@@ -617,16 +713,15 @@ display:
     display_title: Page
     position: 1
     display_options:
-      display_extenders:
-        library_in_views_display_extender:
-          attach_library:
-            attach_library: opencase/opencase-grouped-views
       path: opencase/reporting/name_and_status_changes
+      display_extenders:
+        library_in_views_display_extender: {  }
     cache_metadata:
       max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
+        - url
         - user.permissions
       tags:
         - 'config:field.storage.oc_actor.field_asylum_status'