diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/InventorySourcesList.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/InventorySourcesList.jsx
index c73fabf6ef..a4abf420c5 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/InventorySourcesList.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/InventorySourcesList.jsx
@@ -66,12 +66,36 @@ function InventorySourcesList({
         />
       )}
       renderToolbar={props => <DataListToolbar {...props} fillWidth />}
-      toolbarColumns={[
+      toolbarSearchColumns={[
+        {
+          name: i18n._(t`Name`),
+          key: 'name',
+          isDefault: true,
+        },
+        {
+          name: i18n._(t`Source`),
+          key: 'source',
+          options: [
+            [``, i18n._(t`Manual`)],
+            [`file`, i18n._(t`File, Directory or Script`)],
+            [`scm`, i18n._(t`Sourced from a Project`)],
+            [`ec2`, i18n._(t`Amazon EC2`)],
+            [`gce`, i18n._(t`Google Compute Engine`)],
+            [`azure_rm`, i18n._(t`Microsoft Azure Resource Manager`)],
+            [`vmware`, i18n._(t`VMware vCenter`)],
+            [`satellite6`, i18n._(t`Red Hat Satellite 6`)],
+            [`cloudforms`, i18n._(t`Red Hat CloudForms`)],
+            [`openstack`, i18n._(t`OpenStack`)],
+            [`rhv`, i18n._(t`Red Hat Virtualization`)],
+            [`tower`, i18n._(t`Ansible Tower`)],
+            [`custom`, i18n._(t`Custom Script`)],
+          ],
+        },
+      ]}
+      toolbarSortColumns={[
         {
           name: i18n._(t`Name`),
           key: 'name',
-          isSortable: true,
-          isSearchable: true,
         },
       ]}
     />
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/JobTemplatesList.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/JobTemplatesList.jsx
index a0400c07ae..bf7695f966 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/JobTemplatesList.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/JobTemplatesList.jsx
@@ -68,12 +68,29 @@ function JobTemplatesList({
       )}
       renderToolbar={props => <DataListToolbar {...props} fillWidth />}
       showPageSizeOptions={false}
-      toolbarColumns={[
+      toolbarSearchColumns={[
+        {
+          name: i18n._(t`Name`),
+          key: 'name',
+          isDefault: true,
+        },
+        {
+          name: i18n._(t`Playbook name`),
+          key: 'playbook',
+        },
+        {
+          name: i18n._(t`Created By (Username)`),
+          key: 'created_by__username',
+        },
+        {
+          name: i18n._(t`Modified By (Username)`),
+          key: 'modified_by__username',
+        },
+      ]}
+      toolbarSortColumns={[
         {
           name: i18n._(t`Name`),
           key: 'name',
-          isSortable: true,
-          isSearchable: true,
         },
       ]}
     />
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/ProjectsList.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/ProjectsList.jsx
index 98e12e745b..4ba28da12f 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/ProjectsList.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/ProjectsList.jsx
@@ -61,12 +61,40 @@ function ProjectsList({ history, i18n, nodeResource, onUpdateNodeResource }) {
       )}
       renderToolbar={props => <DataListToolbar {...props} fillWidth />}
       showPageSizeOptions={false}
-      toolbarColumns={[
+      toolbarSearchColumns={[
+        {
+          name: i18n._(t`Name`),
+          key: 'name',
+          isDefault: true,
+        },
+        {
+          name: i18n._(t`Type`),
+          key: 'type',
+          options: [
+            [``, i18n._(t`Manual`)],
+            [`git`, i18n._(t`Git`)],
+            [`hg`, i18n._(t`Mercurial`)],
+            [`svn`, i18n._(t`Subversion`)],
+            [`insights`, i18n._(t`Red Hat Insights`)],
+          ],
+        },
+        {
+          name: i18n._(t`SCM URL`),
+          key: 'scm_url',
+        },
+        {
+          name: i18n._(t`Modified By (Username)`),
+          key: 'modified_by__username',
+        },
+        {
+          name: i18n._(t`Created By (Username)`),
+          key: 'created_by__username',
+        },
+      ]}
+      toolbarSortColumns={[
         {
           name: i18n._(t`Name`),
           key: 'name',
-          isSortable: true,
-          isSearchable: true,
         },
       ]}
     />
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/WorkflowJobTemplatesList.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/WorkflowJobTemplatesList.jsx
index 4654b34a07..05a0d15e9c 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/WorkflowJobTemplatesList.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModal/NodeTypeStep/WorkflowJobTemplatesList.jsx
@@ -68,12 +68,33 @@ function WorkflowJobTemplatesList({
       )}
       renderToolbar={props => <DataListToolbar {...props} fillWidth />}
       showPageSizeOptions={false}
-      toolbarColumns={[
+      toolbarSearchColumns={[
+        {
+          name: i18n._(t`Name`),
+          key: 'name',
+          isDefault: true,
+        },
+        {
+          name: i18n._(t`Organization (Name)`),
+          key: 'organization__name',
+        },
+        {
+          name: i18n._(t`Inventory (Name)`),
+          key: 'inventory__name',
+        },
+        {
+          name: i18n._(t`Created By (Username)`),
+          key: 'created_by__username',
+        },
+        {
+          name: i18n._(t`Modified By (Username)`),
+          key: 'modified_by__username',
+        },
+      ]}
+      toolbarSortColumns={[
         {
           name: i18n._(t`Name`),
           key: 'name',
-          isSortable: true,
-          isSearchable: true,
         },
       ]}
     />