diff --git a/config/sync/views.view.admin_nodes.yml b/config/sync/views.view.admin_nodes.yml
index beba388..e147839 100644
--- a/config/sync/views.view.admin_nodes.yml
+++ b/config/sync/views.view.admin_nodes.yml
@@ -1508,10 +1508,10 @@ display:
           entity_type: node
           entity_field: title
           plugin_id: string
-        field_manufacturer_target_id:
-          id: field_manufacturer_target_id
-          table: node__field_manufacturer
-          field: field_manufacturer_target_id
+        tid:
+          id: tid
+          table: taxonomy_index
+          field: tid
           relationship: none
           group_type: group
           admin_label: ''
@@ -1520,71 +1520,28 @@ display:
           group: 1
           exposed: true
           expose:
-            operator_id: field_manufacturer_target_id_op
-            label: Manufacturer
+            operator_id: tid_op
+            label: Company
             description: ''
             use_operator: false
-            operator: field_manufacturer_target_id_op
-            identifier: field_manufacturer_target_id
+            operator: tid_op
+            identifier: tid
             required: false
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
+              unverified: '0'
               anonymous: '0'
+              free_user: '0'
+              contact_company: '0'
+              alpha_testeur: '0'
+              student: '0'
+              adherent: '0'
+              translator: '0'
+              admin_showroom: '0'
               admin: '0'
               root: '0'
-              user: '0'
-            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: {  }
-          reduce_duplicates: false
-          type: textfield
-          limit: true
-          vid: company
-          hierarchy: false
-          error_message: true
-          parent: 0
-          level_labels: ''
-          force_deepest: false
-          plugin_id: taxonomy_index_tid
-        field_distributor_target_id:
-          id: field_distributor_target_id
-          table: node__field_distributor
-          field: field_distributor_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_distributor_target_id_op
-            label: Distributor
-            description: ''
-            use_operator: false
-            operator: field_distributor_target_id_op
-            identifier: field_distributor_target_id
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              admin: '0'
-              root: '0'
-              user: '0'
             reduce: false
           is_grouped: false
           group_info:
@@ -1773,6 +1730,107 @@ display:
           include_content_with_unpublished_translation: 0
           entity_type: node
           plugin_id: select_translation_filter
+        field_samples_location:
+          id: field_samples_location
+          table: node__field_samples
+          field: field_samples_location
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_samples_location_op
+            label: 'Samples Location'
+            description: ''
+            use_operator: false
+            operator: field_samples_location_op
+            identifier: field_samples_location
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              unverified: '0'
+              anonymous: '0'
+              free_user: '0'
+              contact_company: '0'
+              alpha_testeur: '0'
+              student: '0'
+              adherent: '0'
+              translator: '0'
+              admin_showroom: '0'
+              admin: '0'
+              root: '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: {  }
+          plugin_id: string
+        field_samples_target_id:
+          id: field_samples_target_id
+          table: node__field_samples
+          field: field_samples_target_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value:
+            min: ''
+            max: ''
+            value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_samples_target_id_op
+            label: 'Samples ID'
+            description: ''
+            use_operator: false
+            operator: field_samples_target_id_op
+            identifier: field_samples_target_id
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              unverified: '0'
+              anonymous: '0'
+              free_user: '0'
+              contact_company: '0'
+              alpha_testeur: '0'
+              student: '0'
+              adherent: '0'
+              translator: '0'
+              admin_showroom: '0'
+              admin: '0'
+              root: '0'
+            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: numeric
       sorts:
         changed:
           id: changed
@@ -2005,61 +2063,39 @@ display:
                   title: ''
                   description: ''
                   open: '1'
-                  weight: '-23'
+                  weight: '-17'
                   id: container-0
                   pid: root
                   depth: '1'
                   type: container
-                type:
-                  weight: '-23'
-                  id: type
+                field_workflow_value:
+                  weight: '-17'
+                  id: field_workflow_value
                   pid: container-0
                   depth: '2'
                   type: filter
-                langcode_1:
-                  weight: '-22'
-                  id: langcode_1
-                  pid: container-0
-                  depth: '2'
-                  type: filter
-                langcode:
-                  weight: '-21'
-                  id: langcode
+                field_migration_value:
+                  weight: '-16'
+                  id: field_migration_value
                   pid: container-0
                   depth: '2'
                   type: filter
                 title:
-                  weight: '-20'
+                  weight: '-15'
                   id: title
                   pid: container-0
                   depth: '2'
                   type: filter
                 field_memo_value:
-                  weight: '-19'
+                  weight: '-14'
                   id: field_memo_value
                   pid: container-0
                   depth: '2'
                   type: filter
-                container-1:
-                  container_type: container
-                  title: ''
-                  description: ''
-                  open: '1'
-                  weight: '-20'
-                  id: container-1
-                  pid: root
-                  depth: '1'
-                  type: container
-                field_manufacturer_target_id:
-                  weight: '-21'
-                  id: field_manufacturer_target_id
-                  pid: container-1
-                  depth: '2'
-                  type: filter
-                field_distributor_target_id:
-                  weight: '-20'
-                  id: field_distributor_target_id
-                  pid: container-1
+                tid:
+                  weight: '-13'
+                  id: tid
+                  pid: container-0
                   depth: '2'
                   type: filter
                 container-2:
@@ -2067,50 +2103,54 @@ display:
                   title: ''
                   description: ''
                   open: '1'
-                  weight: '-19'
+                  weight: '-16'
                   id: container-2
                   pid: root
                   depth: '1'
                   type: container
-                field_workflow_value:
-                  weight: '-21'
-                  id: field_workflow_value
+                field_samples_location:
+                  weight: '-17'
+                  id: field_samples_location
                   pid: container-2
                   depth: '2'
                   type: filter
-                field_migration_value:
-                  weight: '-20'
-                  id: field_migration_value
+                submit:
+                  weight: '-16'
+                  id: submit
                   pid: container-2
                   depth: '2'
-                  type: filter
+                  type: buttons
+                reset:
+                  weight: '-15'
+                  id: reset
+                  pid: container-2
+                  depth: '2'
+                  type: buttons
                 container-3:
                   container_type: container
                   title: ''
                   description: ''
-                  weight: '-18'
+                  weight: '-14'
                   open: 0
                   id: container-3
                   pid: root
                   depth: '1'
                   type: container
-                submit:
-                  weight: '-21'
-                  id: submit
-                  pid: container-3
-                  depth: '2'
-                  type: buttons
-                reset:
-                  weight: '-20'
-                  id: reset
-                  pid: container-3
-                  depth: '2'
-                  type: buttons
+                container-1:
+                  container_type: container
+                  title: ''
+                  description: ''
+                  open: '1'
+                  weight: '-13'
+                  id: container-1
+                  pid: root
+                  depth: '1'
+                  type: container
                 container-4:
                   container_type: details
                   title: 'Container 4'
                   description: ''
-                  weight: '-17'
+                  weight: '-12'
                   open: 0
                   id: container-4
                   pid: root
@@ -2120,7 +2160,7 @@ display:
                   container_type: details
                   title: 'Container 5'
                   description: ''
-                  weight: '-16'
+                  weight: '-11'
                   open: 0
                   id: container-5
                   pid: root
@@ -2130,7 +2170,7 @@ display:
                   container_type: details
                   title: 'Container 6'
                   description: ''
-                  weight: '-15'
+                  weight: '-10'
                   open: 0
                   id: container-6
                   pid: root
@@ -2140,42 +2180,12 @@ display:
                   container_type: details
                   title: 'Container 7'
                   description: ''
-                  weight: '-14'
+                  weight: '-9'
                   open: 0
                   id: container-7
                   pid: root
                   depth: '1'
                   type: container
-                container-8:
-                  container_type: details
-                  title: 'Container 8'
-                  description: ''
-                  weight: '-13'
-                  open: 0
-                  id: container-8
-                  pid: root
-                  depth: '1'
-                  type: container
-                container-9:
-                  container_type: details
-                  title: 'Container 9'
-                  description: ''
-                  weight: '-12'
-                  open: 0
-                  id: container-9
-                  pid: root
-                  depth: '1'
-                  type: container
-                container-10:
-                  container_type: details
-                  title: 'Container 10'
-                  description: ''
-                  weight: '-11'
-                  open: 0
-                  id: container-10
-                  pid: root
-                  depth: '1'
-                  type: container
       path: admin/content/materials
       menu:
         type: tab
@@ -2193,6 +2203,8 @@ display:
         fields: false
         style: false
         row: false
+        filters: false
+        filter_groups: false
       fields:
         views_bulk_operations_bulk_form:
           id: views_bulk_operations_bulk_form
@@ -3480,6 +3492,368 @@ display:
         title: ''
         description: ''
         weight: 0
+      filters:
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value:
+            materiau: materiau
+          group: 1
+          exposed: false
+          expose:
+            operator_id: type_op
+            label: 'Content type'
+            description: ''
+            use_operator: false
+            operator: type_op
+            identifier: type
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              admin: '0'
+              root: '0'
+              user: '0'
+            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: title_op
+            label: Title
+            description: ''
+            use_operator: false
+            operator: title_op
+            identifier: title
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              admin: '0'
+              root: '0'
+              user: '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: node
+          entity_field: title
+          plugin_id: string
+        tid:
+          id: tid
+          table: taxonomy_index
+          field: tid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: tid_op
+            label: Company
+            description: ''
+            use_operator: false
+            operator: tid_op
+            identifier: tid
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              unverified: '0'
+              anonymous: '0'
+              free_user: '0'
+              contact_company: '0'
+              alpha_testeur: '0'
+              student: '0'
+              adherent: '0'
+              translator: '0'
+              admin_showroom: '0'
+              admin: '0'
+              root: '0'
+            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: {  }
+          reduce_duplicates: false
+          type: textfield
+          limit: true
+          vid: company
+          hierarchy: false
+          error_message: true
+          parent: 0
+          level_labels: ''
+          force_deepest: false
+          plugin_id: taxonomy_index_tid
+        field_memo_value:
+          id: field_memo_value
+          table: node__field_memo
+          field: field_memo_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_memo_value_op
+            label: Memo
+            description: ''
+            use_operator: false
+            operator: field_memo_value_op
+            identifier: field_memo_value
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              admin: '0'
+              root: '0'
+              user: '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: {  }
+          plugin_id: string
+        field_migration_value:
+          id: field_migration_value
+          table: node__field_migration
+          field: field_migration_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_migration_value_op
+            label: Migration
+            description: ''
+            use_operator: false
+            operator: field_migration_value_op
+            identifier: field_migration_value
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              admin: '0'
+              root: '0'
+              user: '0'
+            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: {  }
+          reduce_duplicates: false
+          plugin_id: workflow_state
+        field_workflow_value:
+          id: field_workflow_value
+          table: node__field_workflow
+          field: field_workflow_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_workflow_value_op
+            label: Workflow
+            description: ''
+            use_operator: false
+            operator: field_workflow_value_op
+            identifier: field_workflow_value
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              admin: '0'
+              root: '0'
+              user: '0'
+            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: {  }
+          reduce_duplicates: false
+          plugin_id: workflow_state
+        select_translation:
+          id: select_translation
+          table: node_field_data
+          field: select_translation
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: default
+          group: 1
+          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: {  }
+          priorities: ''
+          default_language_only: 0
+          include_content_with_unpublished_translation: 0
+          entity_type: node
+          plugin_id: select_translation_filter
+        field_samples_location:
+          id: field_samples_location
+          table: node__field_samples
+          field: field_samples_location
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_samples_location_op
+            label: 'Samples Location'
+            description: ''
+            use_operator: false
+            operator: field_samples_location_op
+            identifier: field_samples_location
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              unverified: '0'
+              anonymous: '0'
+              free_user: '0'
+              contact_company: '0'
+              alpha_testeur: '0'
+              student: '0'
+              adherent: '0'
+              translator: '0'
+              admin_showroom: '0'
+              admin: '0'
+              root: '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: {  }
+          plugin_id: string
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
     cache_metadata:
       max-age: 0
       contexts:
diff --git a/config/sync/views.view.commerce_licenses.yml b/config/sync/views.view.commerce_licenses.yml
index de42eee..61c4260 100644
--- a/config/sync/views.view.commerce_licenses.yml
+++ b/config/sync/views.view.commerce_licenses.yml
@@ -5,6 +5,8 @@ dependencies:
   config:
     - field.storage.profile.field_first_name
     - field.storage.profile.field_name
+    - user.role.adherent
+    - user.role.student
   module:
     - commerce
     - commerce_license
@@ -1522,6 +1524,60 @@ display:
           entity_type: user
           entity_field: mail
           plugin_id: string
+        roles_target_id:
+          id: roles_target_id
+          table: user__roles
+          field: roles_target_id
+          relationship: uid
+          group_type: group
+          admin_label: ''
+          operator: or
+          value:
+            all: all
+            student: student
+            adherent: adherent
+          group: 1
+          exposed: true
+          expose:
+            operator_id: roles_target_id_op
+            label: Roles
+            description: ''
+            use_operator: false
+            operator: roles_target_id_op
+            identifier: roles_target_id
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              unverified: '0'
+              anonymous: '0'
+              free_user: '0'
+              contact_company: '0'
+              alpha_testeur: '0'
+              student: '0'
+              adherent: '0'
+              translator: '0'
+              admin_showroom: '0'
+              admin: '0'
+              root: '0'
+            reduce: true
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: true
+          entity_type: user
+          entity_field: roles
+          plugin_id: user_roles
       sorts: {  }
       title: Licenses
       header: