diff --git a/composer.json b/composer.json
index 1e162abb4..2e79123b4 100644
--- a/composer.json
+++ b/composer.json
@@ -117,6 +117,10 @@
             "drupal/diff": {
                 "2980335: Establish class attribute as array instead of string.": "https://www.drupal.org/files/issues/2018-06-18/2980335_2_define_classes_as_array.patch"
             },
+            "drupal/draggableviews": {
+                "2929116: Can't use Show weight values link with a draggable view": "https://www.drupal.org/files/issues/2019-05-24/draggableviews-show_row_weight_values-2929116-21.patch",
+                "2767437: Allow sort handler to select the view that stored the order": "https://www.drupal.org/files/issues/2021-05-13/draggableviews-sort_handler_specify_order_view-2767437-116_0.patch"
+            },
             "drupal/fullcalendar_view": {
                 "3168071: Mouse-hover tool-tip option for version since 8.x.4.2": "https://www.drupal.org/files/issues/2021-03-18/3168071-13.patch"
             },
diff --git a/config/sync/views.view.organizations_with_staff.yml b/config/sync/views.view.organizations_with_staff.yml
index 32b04fad0..c0c8f081b 100644
--- a/config/sync/views.view.organizations_with_staff.yml
+++ b/config/sync/views.view.organizations_with_staff.yml
@@ -15,11 +15,13 @@ dependencies:
     - taxonomy.vocabulary.locations
     - taxonomy.vocabulary.organization
   module:
+    - draggableviews
     - node
     - taxonomy
     - telephone
     - user
     - vefl
+    - views_autocomplete_filters
 id: organizations_with_staff
 label: 'Staff Directory'
 module: views
@@ -1258,14 +1260,17 @@ display:
           id: weight
           table: draggableviews_structure
           field: weight
-          relationship: reverse__node__field_organization
+          relationship: none
           group_type: group
           admin_label: ''
           order: ASC
           exposed: false
           expose:
             label: ''
-          plugin_id: standard
+          draggable_views_reference: 'staff_order:page_1'
+          draggable_views_null_order: after
+          draggable_views_pass_arguments: true
+          plugin_id: draggable_views_sort_default
         field_last_name_value:
           id: field_last_name_value
           table: node__field_last_name
diff --git a/config/sync/views.view.staff_official_portraits.yml b/config/sync/views.view.staff_official_portraits.yml
index a43f66154..7c0abaa20 100644
--- a/config/sync/views.view.staff_official_portraits.yml
+++ b/config/sync/views.view.staff_official_portraits.yml
@@ -527,22 +527,7 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: boolean
-      sorts:
-        weight:
-          id: weight
-          table: draggableviews_structure
-          field: weight
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: ASC
-          exposed: false
-          expose:
-            label: ''
-          draggable_views_reference: 'staff_official_portraits:portraits_sort'
-          draggable_views_null_order: after
-          draggable_views_pass_arguments: false
-          plugin_id: draggable_views_sort_default
+      sorts: {  }
       title: 'Staff Official Portraits'
       header: {  }
       footer: {  }
@@ -673,423 +658,3 @@ display:
         - 'config:field.storage.node.field_organization'
         - 'config:field.storage.node.field_staff_photo'
         - 'config:field.storage.node.field_staff_position'
-  portraits_sort:
-    display_plugin: page
-    id: portraits_sort
-    display_title: Sort
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: multimedia/official-portraits/sort
-      display_description: ''
-      fields:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 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: false
-            ellipsis: false
-            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: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-        draggableviews:
-          id: draggableviews
-          table: node_field_data
-          field: draggableviews
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          action_title: Action
-          include_exclude: exclude
-          selected_actions: null
-          entity_type: node
-          entity_field: nid
-          plugin_id: draggable_views_field
-        field_staff_position:
-          id: field_staff_position
-          table: node__field_staff_position
-          field: field_staff_position
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Position
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          plugin_id: field
-        field_organization:
-          id: field_organization
-          table: node__field_organization
-          field: field_organization
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Organization
-          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
-          plugin_id: field
-        parent_target_id:
-          id: parent_target_id
-          table: taxonomy_term__parent
-          field: parent_target_id
-          relationship: term_node_tid
-          group_type: group
-          admin_label: ''
-          label: 'Program Office/Region'
-          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
-          entity_type: taxonomy_term
-          entity_field: parent
-          plugin_id: field
-      defaults:
-        fields: false
-        style: false
-        row: false
-        sorts: false
-        relationships: false
-        title: false
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            title: title
-            field_staff_position: field_staff_position
-            weight: weight
-          info:
-            title:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_staff_position:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            weight:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: '-1'
-          empty_table: false
-      row:
-        type: fields
-        options: {  }
-      sorts:
-        weight:
-          id: weight
-          table: draggableviews_structure
-          field: weight
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: ASC
-          exposed: false
-          expose:
-            label: ''
-          draggable_views_reference: this
-          draggable_views_null_order: after
-          draggable_views_pass_arguments: false
-          plugin_id: draggable_views_sort_default
-      relationships:
-        term_node_tid:
-          id: term_node_tid
-          table: node_field_data
-          field: term_node_tid
-          relationship: none
-          group_type: group
-          admin_label: term
-          required: false
-          vids:
-            - organization
-          entity_type: node
-          plugin_id: node_term_data
-        parent_target_id:
-          id: parent_target_id
-          table: taxonomy_term__parent
-          field: parent_target_id
-          relationship: term_node_tid
-          group_type: group
-          admin_label: Parent
-          required: false
-          entity_type: taxonomy_term
-          entity_field: parent
-          plugin_id: standard
-      title: 'Sort Portraits'
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.field_organization'
-        - 'config:field.storage.node.field_staff_position'
diff --git a/config/sync/views.view.staff_order.yml b/config/sync/views.view.staff_order.yml
index d643463f3..93ad48caf 100644
--- a/config/sync/views.view.staff_order.yml
+++ b/config/sync/views.view.staff_order.yml
@@ -8,7 +8,6 @@ dependencies:
     - field.storage.node.field_staff_position
     - node.type.staff_member
     - taxonomy.vocabulary.organization
-    - taxonomy.vocabulary.research_program_area
     - user.role.authenticated
   module:
     - draggableviews
@@ -393,7 +392,10 @@ display:
           exposed: false
           expose:
             label: ''
-          plugin_id: standard
+          draggable_views_reference: this
+          draggable_views_null_order: after
+          draggable_views_pass_arguments: true
+          plugin_id: draggable_views_sort_default
         field_last_name_value:
           id: field_last_name_value
           table: node__field_last_name
@@ -518,70 +520,3 @@ display:
         - 'config:field.storage.node.field_first_name'
         - 'config:field.storage.node.field_last_name'
         - 'config:field.storage.node.field_staff_position'
-  page_2:
-    display_plugin: page
-    id: page_2
-    display_title: 'NRP Page'
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: staff/nrp/%/order
-      relationships: {  }
-      defaults:
-        relationships: false
-        arguments: false
-      arguments:
-        field_research_program_area_target_id:
-          id: field_research_program_area_target_id
-          table: node__field_research_program_area
-          field: field_research_program_area_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          default_action: empty
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: true
-          title: '{{ raw_arguments.field_research_program_area_target_id }} Staff'
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            items_per_page: 25
-            override: false
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: true
-          validate:
-            type: taxonomy_term_name_into_id
-            fail: 'not found'
-          validate_options:
-            bundles:
-              research_program_area: research_program_area
-            operation: view
-            access: false
-            transform: false
-          break_phrase: false
-          not: false
-          plugin_id: numeric
-      display_description: ''
-      enabled: false
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - 'user.node_grants:view'
-        - user.roles
-      tags:
-        - 'config:field.storage.node.field_first_name'
-        - 'config:field.storage.node.field_last_name'
-        - 'config:field.storage.node.field_staff_position'