diff --git a/awx/ui_next/src/components/ListHeader/ListHeader.jsx b/awx/ui_next/src/components/ListHeader/ListHeader.jsx
index 5db0c677fb..ad9cab62ce 100644
--- a/awx/ui_next/src/components/ListHeader/ListHeader.jsx
+++ b/awx/ui_next/src/components/ListHeader/ListHeader.jsx
@@ -46,16 +46,14 @@ class ListHeader extends React.Component {
   }
 
   handleSearch(key, value) {
-    const { history, qsConfig } = this.props;
-    const { search } = history.location;
-    const oldParams = parseQueryString(qsConfig, search);
+    const { location, qsConfig } = this.props;
+    const oldParams = parseQueryString(qsConfig, location.search);
     this.pushHistoryState(mergeParams(oldParams, { [key]: value }));
   }
 
   handleRemove(key, value) {
-    const { history, qsConfig } = this.props;
-    const { search } = history.location;
-    const oldParams = parseQueryString(qsConfig, search);
+    const { location, qsConfig } = this.props;
+    const oldParams = parseQueryString(qsConfig, location.search);
     this.pushHistoryState(removeParams(qsConfig, oldParams, { [key]: value }));
   }
 
@@ -64,9 +62,8 @@ class ListHeader extends React.Component {
   }
 
   handleSort(key, order) {
-    const { history, qsConfig } = this.props;
-    const { search } = history.location;
-    const oldParams = parseQueryString(qsConfig, search);
+    const { location, qsConfig } = this.props;
+    const oldParams = parseQueryString(qsConfig, location.search);
     this.pushHistoryState(
       replaceParams(oldParams, {
         order_by: order === 'ascending' ? key : `-${key}`,
@@ -89,11 +86,14 @@ class ListHeader extends React.Component {
       columns,
       renderToolbar,
       qsConfig,
+      location,
     } = this.props;
     const [orderBy, sortOrder] = this.getSortOrder();
+    const params = parseQueryString(qsConfig, location.search);
+    const isEmpty = itemCount === 0 && Object.keys(params).length === 0;
     return (
       <Fragment>
-        {itemCount === 0 ? (
+        {isEmpty ? (
           <Fragment>
             <EmptyStateControlsWrapper>
               {emptyStateControls}
diff --git a/awx/ui_next/src/components/PaginatedDataList/PaginatedDataList.jsx b/awx/ui_next/src/components/PaginatedDataList/PaginatedDataList.jsx
index fc0c2d16e2..e89431d3a8 100644
--- a/awx/ui_next/src/components/PaginatedDataList/PaginatedDataList.jsx
+++ b/awx/ui_next/src/components/PaginatedDataList/PaginatedDataList.jsx
@@ -99,47 +99,36 @@ class PaginatedDataList extends React.Component {
       );
     }
 
-    if (items.length <= 0) {
-      return (
-        <Fragment>
-          <ListHeader
-            emptyStateControls={emptyStateControls}
-            itemCount={itemCount}
-            columns={columns}
-            qsConfig={qsConfig}
-          />
-          {Content}
-        </Fragment>
-      );
-    }
-
     return (
       <Fragment>
         <ListHeader
           itemCount={itemCount}
           renderToolbar={renderToolbar}
+          emptyStateControls={emptyStateControls}
           columns={columns}
           qsConfig={qsConfig}
         />
         {Content}
-        <Pagination
-          variant="bottom"
-          itemCount={itemCount}
-          page={queryParams.page || 1}
-          perPage={queryParams.page_size}
-          perPageOptions={
-            showPageSizeOptions
-              ? [
-                  { title: '5', value: 5 },
-                  { title: '10', value: 10 },
-                  { title: '20', value: 20 },
-                  { title: '50', value: 50 },
-                ]
-              : []
-          }
-          onSetPage={this.handleSetPage}
-          onPerPageSelect={this.handleSetPageSize}
-        />
+        {items.length ? (
+          <Pagination
+            variant="bottom"
+            itemCount={itemCount}
+            page={queryParams.page || 1}
+            perPage={queryParams.page_size}
+            perPageOptions={
+              showPageSizeOptions
+                ? [
+                    { title: '5', value: 5 },
+                    { title: '10', value: 10 },
+                    { title: '20', value: 20 },
+                    { title: '50', value: 50 },
+                  ]
+                : []
+            }
+            onSetPage={this.handleSetPage}
+            onPerPageSelect={this.handleSetPageSize}
+          />
+        ) : null}
       </Fragment>
     );
   }
diff --git a/awx/ui_next/src/screens/Job/JobList/JobList.jsx b/awx/ui_next/src/screens/Job/JobList/JobList.jsx
index 02e76946df..6cfdab62e0 100644
--- a/awx/ui_next/src/screens/Job/JobList/JobList.jsx
+++ b/awx/ui_next/src/screens/Job/JobList/JobList.jsx
@@ -150,7 +150,8 @@ class JobList extends Component {
       selected,
     } = this.state;
     const { match, i18n } = this.props;
-    const isAllSelected = selected.length === jobs.length;
+    const isAllSelected =
+      selected.length === jobs.length && selected.length > 0;
     return (
       <PageSection>
         <Card>
diff --git a/awx/ui_next/src/screens/Organization/OrganizationAccess/__snapshots__/OrganizationAccess.test.jsx.snap b/awx/ui_next/src/screens/Organization/OrganizationAccess/__snapshots__/OrganizationAccess.test.jsx.snap
index a26f750136..16a90aad59 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationAccess/__snapshots__/OrganizationAccess.test.jsx.snap
+++ b/awx/ui_next/src/screens/Organization/OrganizationAccess/__snapshots__/OrganizationAccess.test.jsx.snap
@@ -248,6 +248,7 @@ exports[`<OrganizationAccess /> initially renders succesfully 1`] = `
                   "namespace": "access",
                 }
               }
+              renderToolbar={[Function]}
             >
               <Route>
                 <ListHeader
@@ -311,37 +312,1818 @@ exports[`<OrganizationAccess /> initially renders succesfully 1`] = `
                   }
                   renderToolbar={[Function]}
                 >
-                  <ListHeader__EmptyStateControlsWrapper>
-                    <StyledComponent
-                      forwardedComponent={
+                  <WithI18n
+                    additionalControls={
+                      Array [
+                        <WithI18n
+                          onClick={[Function]}
+                        />,
+                      ]
+                    }
+                    columns={
+                      Array [
                         Object {
-                          "$$typeof": Symbol(react.forward_ref),
-                          "attrs": Array [],
-                          "componentStyle": ComponentStyle {
-                            "componentId": "ListHeader__EmptyStateControlsWrapper-sc-1gm7wbv-0",
-                            "isStatic": true,
-                            "lastClassName": "bXVfpW",
-                            "rules": Array [
-                              "display:flex;margin-top:20px;margin-right:20px;margin-bottom:20px;justify-content:flex-end;& >:not(:first-child){margin-left:20px;}",
-                            ],
-                          },
-                          "displayName": "ListHeader__EmptyStateControlsWrapper",
-                          "foldedComponentIds": Array [],
-                          "render": [Function],
-                          "styledComponentId": "ListHeader__EmptyStateControlsWrapper-sc-1gm7wbv-0",
-                          "target": "div",
-                          "toString": [Function],
-                          "warnTooManyClasses": [Function],
-                          "withComponent": [Function],
-                        }
+                          "isSearchable": true,
+                          "isSortable": true,
+                          "key": "first_name",
+                          "name": "First Name",
+                        },
+                        Object {
+                          "isSearchable": true,
+                          "isSortable": true,
+                          "key": "username",
+                          "name": "Username",
+                        },
+                        Object {
+                          "isSearchable": true,
+                          "isSortable": true,
+                          "key": "last_name",
+                          "name": "Last Name",
+                        },
+                      ]
+                    }
+                    onSearch={[Function]}
+                    onSort={[Function]}
+                    qsConfig={
+                      Object {
+                        "dateFields": Array [
+                          "modified",
+                          "created",
+                        ],
+                        "defaultParams": Object {
+                          "order_by": "first_name",
+                          "page": 1,
+                          "page_size": 5,
+                        },
+                        "integerFields": Array [
+                          "page",
+                          "page_size",
+                        ],
+                        "namespace": "access",
                       }
-                      forwardedRef={null}
+                    }
+                    sortOrder="ascending"
+                    sortedColumnKey="first_name"
+                  >
+                    <I18n
+                      update={true}
+                      withHash={true}
                     >
-                      <div
-                        className="ListHeader__EmptyStateControlsWrapper-sc-1gm7wbv-0 bXVfpW"
-                      />
-                    </StyledComponent>
-                  </ListHeader__EmptyStateControlsWrapper>
+                      <DataListToolbar
+                        additionalControls={
+                          Array [
+                            <WithI18n
+                              onClick={[Function]}
+                            />,
+                          ]
+                        }
+                        columns={
+                          Array [
+                            Object {
+                              "isSearchable": true,
+                              "isSortable": true,
+                              "key": "first_name",
+                              "name": "First Name",
+                            },
+                            Object {
+                              "isSearchable": true,
+                              "isSortable": true,
+                              "key": "username",
+                              "name": "Username",
+                            },
+                            Object {
+                              "isSearchable": true,
+                              "isSortable": true,
+                              "key": "last_name",
+                              "name": "Last Name",
+                            },
+                          ]
+                        }
+                        fillWidth={false}
+                        i18n={"/i18n/"}
+                        isAllSelected={false}
+                        isCompact={false}
+                        onCompact={null}
+                        onExpand={null}
+                        onSearch={[Function]}
+                        onSelectAll={null}
+                        onSort={[Function]}
+                        qsConfig={
+                          Object {
+                            "dateFields": Array [
+                              "modified",
+                              "created",
+                            ],
+                            "defaultParams": Object {
+                              "order_by": "first_name",
+                              "page": 1,
+                              "page_size": 5,
+                            },
+                            "integerFields": Array [
+                              "page",
+                              "page_size",
+                            ],
+                            "namespace": "access",
+                          }
+                        }
+                        showSelectAll={false}
+                        sortOrder="ascending"
+                        sortedColumnKey="first_name"
+                      >
+                        <DataListToolbar__AWXToolbar>
+                          <StyledComponent
+                            forwardedComponent={
+                              Object {
+                                "$$typeof": Symbol(react.forward_ref),
+                                "attrs": Array [],
+                                "componentStyle": ComponentStyle {
+                                  "componentId": "DataListToolbar__AWXToolbar-ajzso8-0",
+                                  "isStatic": true,
+                                  "lastClassName": "bKIKDr",
+                                  "rules": Array [
+                                    "--awx-toolbar--BackgroundColor:var(--pf-global--BackgroundColor--light-100);--awx-toolbar--BorderColor:#ebebeb;--awx-toolbar--BorderWidth:var(--pf-global--BorderWidth--sm);--pf-global--target-size--MinHeight:0;--pf-global--target-size--MinWidth:0;--pf-global--FontSize--md:14px;border-bottom:var(--awx-toolbar--BorderWidth) solid var(--awx-toolbar--BorderColor);background-color:var(--awx-toolbar--BackgroundColor);display:flex;min-height:70px;flex-grow:1;",
+                                  ],
+                                },
+                                "displayName": "DataListToolbar__AWXToolbar",
+                                "foldedComponentIds": Array [],
+                                "render": [Function],
+                                "styledComponentId": "DataListToolbar__AWXToolbar-ajzso8-0",
+                                "target": "div",
+                                "toString": [Function],
+                                "warnTooManyClasses": [Function],
+                                "withComponent": [Function],
+                              }
+                            }
+                            forwardedRef={null}
+                          >
+                            <div
+                              className="DataListToolbar__AWXToolbar-ajzso8-0 bKIKDr"
+                            >
+                              <Styled(DataListToolbar__Toolbar)
+                                _css=""
+                              >
+                                <StyledComponent
+                                  _css=""
+                                  forwardedComponent={
+                                    Object {
+                                      "$$typeof": Symbol(react.forward_ref),
+                                      "attrs": Array [],
+                                      "componentStyle": ComponentStyle {
+                                        "componentId": "sc-bdVaJa",
+                                        "isStatic": false,
+                                        "lastClassName": "hCBHGV",
+                                        "rules": Array [
+                                          "flex-grow:1;margin-left:20px;margin-right:20px;",
+                                          [Function],
+                                        ],
+                                      },
+                                      "displayName": "Styled(DataListToolbar__Toolbar)",
+                                      "foldedComponentIds": Array [
+                                        "DataListToolbar__Toolbar-ajzso8-1",
+                                      ],
+                                      "render": [Function],
+                                      "styledComponentId": "sc-bdVaJa",
+                                      "target": [Function],
+                                      "toString": [Function],
+                                      "warnTooManyClasses": [Function],
+                                      "withComponent": [Function],
+                                    }
+                                  }
+                                  forwardedRef={null}
+                                >
+                                  <Toolbar
+                                    _css=""
+                                    className="DataListToolbar__Toolbar-ajzso8-1 sc-bdVaJa hCBHGV"
+                                  >
+                                    <div
+                                      _css=""
+                                      className="pf-l-toolbar DataListToolbar__Toolbar-ajzso8-1 sc-bdVaJa hCBHGV"
+                                    >
+                                      <DataListToolbar__ColumnLeft
+                                        fillWidth={false}
+                                      >
+                                        <StyledComponent
+                                          fillWidth={false}
+                                          forwardedComponent={
+                                            Object {
+                                              "$$typeof": Symbol(react.forward_ref),
+                                              "attrs": Array [],
+                                              "componentStyle": ComponentStyle {
+                                                "componentId": "DataListToolbar__ColumnLeft-ajzso8-3",
+                                                "isStatic": false,
+                                                "lastClassName": "bPvPpR",
+                                                "rules": Array [
+                                                  "display:flex;flex-basis:",
+                                                  [Function],
+                                                  ";flex-grow:",
+                                                  [Function],
+                                                  ";justify-content:flex-start;align-items:center;padding:10px 0 8px 0;@media screen and (min-width:980px){flex-basis:",
+                                                  [Function],
+                                                  ";}",
+                                                ],
+                                              },
+                                              "displayName": "DataListToolbar__ColumnLeft",
+                                              "foldedComponentIds": Array [],
+                                              "render": [Function],
+                                              "styledComponentId": "DataListToolbar__ColumnLeft-ajzso8-3",
+                                              "target": "div",
+                                              "toString": [Function],
+                                              "warnTooManyClasses": [Function],
+                                              "withComponent": [Function],
+                                            }
+                                          }
+                                          forwardedRef={null}
+                                        >
+                                          <div
+                                            className="DataListToolbar__ColumnLeft-ajzso8-3 bPvPpR"
+                                          >
+                                            <Styled(ToolbarItem)>
+                                              <StyledComponent
+                                                forwardedComponent={
+                                                  Object {
+                                                    "$$typeof": Symbol(react.forward_ref),
+                                                    "attrs": Array [],
+                                                    "componentStyle": ComponentStyle {
+                                                      "componentId": "sc-bwzfXH",
+                                                      "isStatic": true,
+                                                      "lastClassName": "iBEPfq",
+                                                      "rules": Array [
+                                                        "flex-grow: 1;",
+                                                      ],
+                                                    },
+                                                    "displayName": "Styled(ToolbarItem)",
+                                                    "foldedComponentIds": Array [],
+                                                    "render": [Function],
+                                                    "styledComponentId": "sc-bwzfXH",
+                                                    "target": [Function],
+                                                    "toString": [Function],
+                                                    "warnTooManyClasses": [Function],
+                                                    "withComponent": [Function],
+                                                  }
+                                                }
+                                                forwardedRef={null}
+                                              >
+                                                <ToolbarItem
+                                                  className="sc-bwzfXH iBEPfq"
+                                                >
+                                                  <div
+                                                    className="pf-l-toolbar__item sc-bwzfXH iBEPfq"
+                                                  >
+                                                    <WithI18n
+                                                      columns={
+                                                        Array [
+                                                          Object {
+                                                            "isSearchable": true,
+                                                            "isSortable": true,
+                                                            "key": "first_name",
+                                                            "name": "First Name",
+                                                          },
+                                                          Object {
+                                                            "isSearchable": true,
+                                                            "isSortable": true,
+                                                            "key": "username",
+                                                            "name": "Username",
+                                                          },
+                                                          Object {
+                                                            "isSearchable": true,
+                                                            "isSortable": true,
+                                                            "key": "last_name",
+                                                            "name": "Last Name",
+                                                          },
+                                                        ]
+                                                      }
+                                                      onSearch={[Function]}
+                                                      qsConfig={
+                                                        Object {
+                                                          "dateFields": Array [
+                                                            "modified",
+                                                            "created",
+                                                          ],
+                                                          "defaultParams": Object {
+                                                            "order_by": "first_name",
+                                                            "page": 1,
+                                                            "page_size": 5,
+                                                          },
+                                                          "integerFields": Array [
+                                                            "page",
+                                                            "page_size",
+                                                          ],
+                                                          "namespace": "access",
+                                                        }
+                                                      }
+                                                      sortedColumnKey="first_name"
+                                                    >
+                                                      <I18n
+                                                        update={true}
+                                                        withHash={true}
+                                                      >
+                                                        <Search
+                                                          columns={
+                                                            Array [
+                                                              Object {
+                                                                "isSearchable": true,
+                                                                "isSortable": true,
+                                                                "key": "first_name",
+                                                                "name": "First Name",
+                                                              },
+                                                              Object {
+                                                                "isSearchable": true,
+                                                                "isSortable": true,
+                                                                "key": "username",
+                                                                "name": "Username",
+                                                              },
+                                                              Object {
+                                                                "isSearchable": true,
+                                                                "isSortable": true,
+                                                                "key": "last_name",
+                                                                "name": "Last Name",
+                                                              },
+                                                            ]
+                                                          }
+                                                          i18n={"/i18n/"}
+                                                          onSearch={[Function]}
+                                                          qsConfig={
+                                                            Object {
+                                                              "dateFields": Array [
+                                                                "modified",
+                                                                "created",
+                                                              ],
+                                                              "defaultParams": Object {
+                                                                "order_by": "first_name",
+                                                                "page": 1,
+                                                                "page_size": 5,
+                                                              },
+                                                              "integerFields": Array [
+                                                                "page",
+                                                                "page_size",
+                                                              ],
+                                                              "namespace": "access",
+                                                            }
+                                                          }
+                                                          sortedColumnKey="first_name"
+                                                        >
+                                                          <Form
+                                                            autoComplete="off"
+                                                          >
+                                                            <form
+                                                              autoComplete="off"
+                                                              className="pf-c-form"
+                                                              noValidate={true}
+                                                            >
+                                                              <div
+                                                                className="pf-c-input-group"
+                                                              >
+                                                                <FormGroup
+                                                                  fieldId="searchKeyDropdown"
+                                                                  label={
+                                                                    <span
+                                                                      className="pf-screen-reader"
+                                                                    >
+                                                                      Search key dropdown
+                                                                    </span>
+                                                                  }
+                                                                >
+                                                                  <div
+                                                                    className="pf-c-form__group"
+                                                                  >
+                                                                    <label
+                                                                      className="pf-c-form__label"
+                                                                      htmlFor="searchKeyDropdown"
+                                                                    >
+                                                                      <span
+                                                                        className="pf-c-form__label-text"
+                                                                      >
+                                                                        <span
+                                                                          className="pf-screen-reader"
+                                                                        >
+                                                                          Search key dropdown
+                                                                        </span>
+                                                                      </span>
+                                                                    </label>
+                                                                    <Search__Dropdown
+                                                                      dropdownItems={
+                                                                        Array [
+                                                                          <DropdownItem
+                                                                            component="button"
+                                                                          >
+                                                                            Username
+                                                                          </DropdownItem>,
+                                                                          <DropdownItem
+                                                                            component="button"
+                                                                          >
+                                                                            Last Name
+                                                                          </DropdownItem>,
+                                                                        ]
+                                                                      }
+                                                                      isOpen={false}
+                                                                      onSelect={[Function]}
+                                                                      onToggle={[Function]}
+                                                                      toggle={
+                                                                        <DropdownToggle
+                                                                          id="awx-search"
+                                                                          onToggle={[Function]}
+                                                                        >
+                                                                          First Name
+                                                                        </DropdownToggle>
+                                                                      }
+                                                                    >
+                                                                      <StyledComponent
+                                                                        dropdownItems={
+                                                                          Array [
+                                                                            <DropdownItem
+                                                                              component="button"
+                                                                            >
+                                                                              Username
+                                                                            </DropdownItem>,
+                                                                            <DropdownItem
+                                                                              component="button"
+                                                                            >
+                                                                              Last Name
+                                                                            </DropdownItem>,
+                                                                          ]
+                                                                        }
+                                                                        forwardedComponent={
+                                                                          Object {
+                                                                            "$$typeof": Symbol(react.forward_ref),
+                                                                            "attrs": Array [],
+                                                                            "componentStyle": ComponentStyle {
+                                                                              "componentId": "Search__Dropdown-sc-1dwuww3-2",
+                                                                              "isStatic": true,
+                                                                              "lastClassName": "eQMakY",
+                                                                              "rules": Array [
+                                                                                "&&&{> button{min-height:30px;min-width:70px;height:30px;padding:0 10px;margin:0px;::before{border-color:var(--pf-global--BorderColor--200);border-top-left-radius:3px;border-bottom-left-radius:3px;}> span{width:auto;}> svg{margin:0px;padding-top:3px;padding-left:3px;}}}",
+                                                                              ],
+                                                                            },
+                                                                            "displayName": "Search__Dropdown",
+                                                                            "foldedComponentIds": Array [],
+                                                                            "render": [Function],
+                                                                            "styledComponentId": "Search__Dropdown-sc-1dwuww3-2",
+                                                                            "target": [Function],
+                                                                            "toString": [Function],
+                                                                            "warnTooManyClasses": [Function],
+                                                                            "withComponent": [Function],
+                                                                          }
+                                                                        }
+                                                                        forwardedRef={null}
+                                                                        isOpen={false}
+                                                                        onSelect={[Function]}
+                                                                        onToggle={[Function]}
+                                                                        toggle={
+                                                                          <DropdownToggle
+                                                                            id="awx-search"
+                                                                            onToggle={[Function]}
+                                                                          >
+                                                                            First Name
+                                                                          </DropdownToggle>
+                                                                        }
+                                                                      >
+                                                                        <Dropdown
+                                                                          className="Search__Dropdown-sc-1dwuww3-2 eQMakY"
+                                                                          dropdownItems={
+                                                                            Array [
+                                                                              <DropdownItem
+                                                                                component="button"
+                                                                              >
+                                                                                Username
+                                                                              </DropdownItem>,
+                                                                              <DropdownItem
+                                                                                component="button"
+                                                                              >
+                                                                                Last Name
+                                                                              </DropdownItem>,
+                                                                            ]
+                                                                          }
+                                                                          isOpen={false}
+                                                                          onSelect={[Function]}
+                                                                          onToggle={[Function]}
+                                                                          toggle={
+                                                                            <DropdownToggle
+                                                                              id="awx-search"
+                                                                              onToggle={[Function]}
+                                                                            >
+                                                                              First Name
+                                                                            </DropdownToggle>
+                                                                          }
+                                                                        >
+                                                                          <DropdownWithContext
+                                                                            className="Search__Dropdown-sc-1dwuww3-2 eQMakY"
+                                                                            direction="down"
+                                                                            dropdownItems={
+                                                                              Array [
+                                                                                <DropdownItem
+                                                                                  component="button"
+                                                                                >
+                                                                                  Username
+                                                                                </DropdownItem>,
+                                                                                <DropdownItem
+                                                                                  component="button"
+                                                                                >
+                                                                                  Last Name
+                                                                                </DropdownItem>,
+                                                                              ]
+                                                                            }
+                                                                            isGrouped={false}
+                                                                            isOpen={false}
+                                                                            isPlain={false}
+                                                                            onSelect={[Function]}
+                                                                            onToggle={[Function]}
+                                                                            position="left"
+                                                                            toggle={
+                                                                              <DropdownToggle
+                                                                                id="awx-search"
+                                                                                onToggle={[Function]}
+                                                                              >
+                                                                                First Name
+                                                                              </DropdownToggle>
+                                                                            }
+                                                                          >
+                                                                            <div
+                                                                              className="pf-c-dropdown Search__Dropdown-sc-1dwuww3-2 eQMakY"
+                                                                              onToggle={[Function]}
+                                                                            >
+                                                                              <DropdownToggle
+                                                                                ariaHasPopup={true}
+                                                                                id="awx-search"
+                                                                                isOpen={false}
+                                                                                isPlain={false}
+                                                                                key=".0"
+                                                                                onEnter={[Function]}
+                                                                                onToggle={[Function]}
+                                                                                parentRef={
+                                                                                  Object {
+                                                                                    "current": <div
+                                                                                      class="pf-c-dropdown Search__Dropdown-sc-1dwuww3-2 eQMakY"
+                                                                                    >
+                                                                                      <button
+                                                                                        aria-expanded="false"
+                                                                                        aria-haspopup="true"
+                                                                                        class="pf-c-dropdown__toggle"
+                                                                                        id="awx-search"
+                                                                                        type="button"
+                                                                                      >
+                                                                                        <span
+                                                                                          class="pf-c-dropdown__toggle-text"
+                                                                                        >
+                                                                                          First Name
+                                                                                        </span>
+                                                                                        <svg
+                                                                                          aria-hidden="true"
+                                                                                          class="pf-c-dropdown__toggle-icon"
+                                                                                          fill="currentColor"
+                                                                                          height="1em"
+                                                                                          role="img"
+                                                                                          style="vertical-align: -0.125em;"
+                                                                                          viewBox="0 0 320 512"
+                                                                                          width="1em"
+                                                                                        >
+                                                                                          <path
+                                                                                            d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+                                                                                            transform=""
+                                                                                          />
+                                                                                        </svg>
+                                                                                      </button>
+                                                                                    </div>,
+                                                                                  }
+                                                                                }
+                                                                              >
+                                                                                <Toggle
+                                                                                  ariaHasPopup={true}
+                                                                                  className=""
+                                                                                  id="awx-search"
+                                                                                  isActive={false}
+                                                                                  isDisabled={false}
+                                                                                  isFocused={false}
+                                                                                  isHovered={false}
+                                                                                  isOpen={false}
+                                                                                  isPlain={false}
+                                                                                  isSplitButton={false}
+                                                                                  onEnter={[Function]}
+                                                                                  onToggle={[Function]}
+                                                                                  parentRef={
+                                                                                    Object {
+                                                                                      "current": <div
+                                                                                        class="pf-c-dropdown Search__Dropdown-sc-1dwuww3-2 eQMakY"
+                                                                                      >
+                                                                                        <button
+                                                                                          aria-expanded="false"
+                                                                                          aria-haspopup="true"
+                                                                                          class="pf-c-dropdown__toggle"
+                                                                                          id="awx-search"
+                                                                                          type="button"
+                                                                                        >
+                                                                                          <span
+                                                                                            class="pf-c-dropdown__toggle-text"
+                                                                                          >
+                                                                                            First Name
+                                                                                          </span>
+                                                                                          <svg
+                                                                                            aria-hidden="true"
+                                                                                            class="pf-c-dropdown__toggle-icon"
+                                                                                            fill="currentColor"
+                                                                                            height="1em"
+                                                                                            role="img"
+                                                                                            style="vertical-align: -0.125em;"
+                                                                                            viewBox="0 0 320 512"
+                                                                                            width="1em"
+                                                                                          >
+                                                                                            <path
+                                                                                              d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+                                                                                              transform=""
+                                                                                            />
+                                                                                          </svg>
+                                                                                        </button>
+                                                                                      </div>,
+                                                                                    }
+                                                                                  }
+                                                                                >
+                                                                                  <button
+                                                                                    aria-expanded={false}
+                                                                                    aria-haspopup={true}
+                                                                                    className="pf-c-dropdown__toggle"
+                                                                                    disabled={false}
+                                                                                    id="awx-search"
+                                                                                    onClick={[Function]}
+                                                                                    onKeyDown={[Function]}
+                                                                                    type="button"
+                                                                                  >
+                                                                                    <span
+                                                                                      className="pf-c-dropdown__toggle-text"
+                                                                                    >
+                                                                                      First Name
+                                                                                    </span>
+                                                                                    <CaretDownIcon
+                                                                                      className="pf-c-dropdown__toggle-icon"
+                                                                                      color="currentColor"
+                                                                                      noVerticalAlign={false}
+                                                                                      size="sm"
+                                                                                      title={null}
+                                                                                    >
+                                                                                      <svg
+                                                                                        aria-hidden={true}
+                                                                                        aria-labelledby={null}
+                                                                                        className="pf-c-dropdown__toggle-icon"
+                                                                                        fill="currentColor"
+                                                                                        height="1em"
+                                                                                        role="img"
+                                                                                        style={
+                                                                                          Object {
+                                                                                            "verticalAlign": "-0.125em",
+                                                                                          }
+                                                                                        }
+                                                                                        viewBox="0 0 320 512"
+                                                                                        width="1em"
+                                                                                      >
+                                                                                        <path
+                                                                                          d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+                                                                                          transform=""
+                                                                                        />
+                                                                                      </svg>
+                                                                                    </CaretDownIcon>
+                                                                                  </button>
+                                                                                </Toggle>
+                                                                              </DropdownToggle>
+                                                                            </div>
+                                                                          </DropdownWithContext>
+                                                                        </Dropdown>
+                                                                      </StyledComponent>
+                                                                    </Search__Dropdown>
+                                                                  </div>
+                                                                </FormGroup>
+                                                                <Search__InputFormGroup
+                                                                  fieldId="searchValueTextInput"
+                                                                  label={
+                                                                    <span
+                                                                      className="pf-screen-reader"
+                                                                    >
+                                                                      Search value text input
+                                                                    </span>
+                                                                  }
+                                                                  style={
+                                                                    Object {
+                                                                      "width": "100%",
+                                                                    }
+                                                                  }
+                                                                  suppressClassNameWarning={true}
+                                                                >
+                                                                  <StyledComponent
+                                                                    fieldId="searchValueTextInput"
+                                                                    forwardedComponent={
+                                                                      Object {
+                                                                        "$$typeof": Symbol(react.forward_ref),
+                                                                        "attrs": Array [],
+                                                                        "componentStyle": ComponentStyle {
+                                                                          "componentId": "Search__InputFormGroup-sc-1dwuww3-4",
+                                                                          "isStatic": true,
+                                                                          "lastClassName": "gITbPU",
+                                                                          "rules": Array [
+                                                                            "flex:1;",
+                                                                          ],
+                                                                        },
+                                                                        "displayName": "Search__InputFormGroup",
+                                                                        "foldedComponentIds": Array [],
+                                                                        "render": [Function],
+                                                                        "styledComponentId": "Search__InputFormGroup-sc-1dwuww3-4",
+                                                                        "target": [Function],
+                                                                        "toString": [Function],
+                                                                        "warnTooManyClasses": [Function],
+                                                                        "withComponent": [Function],
+                                                                      }
+                                                                    }
+                                                                    forwardedRef={null}
+                                                                    label={
+                                                                      <span
+                                                                        className="pf-screen-reader"
+                                                                      >
+                                                                        Search value text input
+                                                                      </span>
+                                                                    }
+                                                                    style={
+                                                                      Object {
+                                                                        "width": "100%",
+                                                                      }
+                                                                    }
+                                                                    suppressClassNameWarning={true}
+                                                                  >
+                                                                    <FormGroup
+                                                                      className="Search__InputFormGroup-sc-1dwuww3-4 gITbPU"
+                                                                      fieldId="searchValueTextInput"
+                                                                      label={
+                                                                        <span
+                                                                          className="pf-screen-reader"
+                                                                        >
+                                                                          Search value text input
+                                                                        </span>
+                                                                      }
+                                                                      style={
+                                                                        Object {
+                                                                          "width": "100%",
+                                                                        }
+                                                                      }
+                                                                    >
+                                                                      <div
+                                                                        className="pf-c-form__group"
+                                                                        style={
+                                                                          Object {
+                                                                            "width": "100%",
+                                                                          }
+                                                                        }
+                                                                      >
+                                                                        <label
+                                                                          className="pf-c-form__label"
+                                                                          htmlFor="searchValueTextInput"
+                                                                        >
+                                                                          <span
+                                                                            className="pf-c-form__label-text"
+                                                                          >
+                                                                            <span
+                                                                              className="pf-screen-reader"
+                                                                            >
+                                                                              Search value text input
+                                                                            </span>
+                                                                          </span>
+                                                                        </label>
+                                                                        <Search__TextInput
+                                                                          aria-label="Search text input"
+                                                                          onChange={[Function]}
+                                                                          style={
+                                                                            Object {
+                                                                              "height": "30px",
+                                                                            }
+                                                                          }
+                                                                          type="search"
+                                                                          value=""
+                                                                        >
+                                                                          <StyledComponent
+                                                                            aria-label="Search text input"
+                                                                            forwardedComponent={
+                                                                              Object {
+                                                                                "$$typeof": Symbol(react.forward_ref),
+                                                                                "attrs": Array [],
+                                                                                "componentStyle": ComponentStyle {
+                                                                                  "componentId": "Search__TextInput-sc-1dwuww3-0",
+                                                                                  "isStatic": true,
+                                                                                  "lastClassName": "kyQbZs",
+                                                                                  "rules": Array [
+                                                                                    "min-height:0px;height:30px;--pf-c-form-control--BorderTopColor:var(--pf-global--BorderColor--200);--pf-c-form-control--BorderLeftColor:var(--pf-global--BorderColor--200);",
+                                                                                  ],
+                                                                                },
+                                                                                "displayName": "Search__TextInput",
+                                                                                "foldedComponentIds": Array [],
+                                                                                "render": [Function],
+                                                                                "styledComponentId": "Search__TextInput-sc-1dwuww3-0",
+                                                                                "target": [Function],
+                                                                                "toString": [Function],
+                                                                                "warnTooManyClasses": [Function],
+                                                                                "withComponent": [Function],
+                                                                              }
+                                                                            }
+                                                                            forwardedRef={null}
+                                                                            onChange={[Function]}
+                                                                            style={
+                                                                              Object {
+                                                                                "height": "30px",
+                                                                              }
+                                                                            }
+                                                                            type="search"
+                                                                            value=""
+                                                                          >
+                                                                            <TextInput
+                                                                              aria-label="Search text input"
+                                                                              className="Search__TextInput-sc-1dwuww3-0 kyQbZs"
+                                                                              isDisabled={false}
+                                                                              isReadOnly={false}
+                                                                              isRequired={false}
+                                                                              isValid={true}
+                                                                              onChange={[Function]}
+                                                                              style={
+                                                                                Object {
+                                                                                  "height": "30px",
+                                                                                }
+                                                                              }
+                                                                              type="search"
+                                                                              value=""
+                                                                            >
+                                                                              <input
+                                                                                aria-invalid={false}
+                                                                                aria-label="Search text input"
+                                                                                className="pf-c-form-control Search__TextInput-sc-1dwuww3-0 kyQbZs"
+                                                                                disabled={false}
+                                                                                onChange={[Function]}
+                                                                                readOnly={false}
+                                                                                required={false}
+                                                                                style={
+                                                                                  Object {
+                                                                                    "height": "30px",
+                                                                                  }
+                                                                                }
+                                                                                type="search"
+                                                                                value=""
+                                                                              />
+                                                                            </TextInput>
+                                                                          </StyledComponent>
+                                                                        </Search__TextInput>
+                                                                      </div>
+                                                                    </FormGroup>
+                                                                  </StyledComponent>
+                                                                </Search__InputFormGroup>
+                                                                <Search__Button
+                                                                  aria-label="Search submit button"
+                                                                  onClick={[Function]}
+                                                                  type="submit"
+                                                                  variant="tertiary"
+                                                                >
+                                                                  <StyledComponent
+                                                                    aria-label="Search submit button"
+                                                                    forwardedComponent={
+                                                                      Object {
+                                                                        "$$typeof": Symbol(react.forward_ref),
+                                                                        "attrs": Array [],
+                                                                        "componentStyle": ComponentStyle {
+                                                                          "componentId": "Search__Button-sc-1dwuww3-1",
+                                                                          "isStatic": true,
+                                                                          "lastClassName": "bLlonv",
+                                                                          "rules": Array [
+                                                                            "width:34px;padding:0px;::after{border:var(--pf-c-button--BorderWidth) solid var(--pf-global--BorderColor--200);}",
+                                                                          ],
+                                                                        },
+                                                                        "displayName": "Search__Button",
+                                                                        "foldedComponentIds": Array [],
+                                                                        "render": [Function],
+                                                                        "styledComponentId": "Search__Button-sc-1dwuww3-1",
+                                                                        "target": [Function],
+                                                                        "toString": [Function],
+                                                                        "warnTooManyClasses": [Function],
+                                                                        "withComponent": [Function],
+                                                                      }
+                                                                    }
+                                                                    forwardedRef={null}
+                                                                    onClick={[Function]}
+                                                                    type="submit"
+                                                                    variant="tertiary"
+                                                                  >
+                                                                    <Button
+                                                                      aria-label="Search submit button"
+                                                                      className="Search__Button-sc-1dwuww3-1 bLlonv"
+                                                                      onClick={[Function]}
+                                                                      type="submit"
+                                                                      variant="tertiary"
+                                                                    >
+                                                                      <button
+                                                                        aria-disabled={null}
+                                                                        aria-label="Search submit button"
+                                                                        className="pf-c-button pf-m-tertiary Search__Button-sc-1dwuww3-1 bLlonv"
+                                                                        disabled={false}
+                                                                        onClick={[Function]}
+                                                                        tabIndex={null}
+                                                                        type="submit"
+                                                                      >
+                                                                        <SearchIcon
+                                                                          color="currentColor"
+                                                                          noVerticalAlign={false}
+                                                                          size="sm"
+                                                                          title={null}
+                                                                        >
+                                                                          <svg
+                                                                            aria-hidden={true}
+                                                                            aria-labelledby={null}
+                                                                            fill="currentColor"
+                                                                            height="1em"
+                                                                            role="img"
+                                                                            style={
+                                                                              Object {
+                                                                                "verticalAlign": "-0.125em",
+                                                                              }
+                                                                            }
+                                                                            viewBox="0 0 512 512"
+                                                                            width="1em"
+                                                                          >
+                                                                            <path
+                                                                              d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+                                                                              transform=""
+                                                                            />
+                                                                          </svg>
+                                                                        </SearchIcon>
+                                                                      </button>
+                                                                    </Button>
+                                                                  </StyledComponent>
+                                                                </Search__Button>
+                                                              </div>
+                                                            </form>
+                                                          </Form>
+                                                        </Search>
+                                                      </I18n>
+                                                    </WithI18n>
+                                                  </div>
+                                                </ToolbarItem>
+                                              </StyledComponent>
+                                            </Styled(ToolbarItem)>
+                                            <VerticalSeparator>
+                                              <div>
+                                                <VerticalSeparator__Separator>
+                                                  <StyledComponent
+                                                    forwardedComponent={
+                                                      Object {
+                                                        "$$typeof": Symbol(react.forward_ref),
+                                                        "attrs": Array [],
+                                                        "componentStyle": ComponentStyle {
+                                                          "componentId": "VerticalSeparator__Separator-sc-1256nz7-0",
+                                                          "isStatic": true,
+                                                          "lastClassName": "kgxyCB",
+                                                          "rules": Array [
+                                                            "display:inline-block;width:1px;height:30px;margin-right:20px;margin-left:20px;background-color:#d7d7d7;vertical-align:middle;",
+                                                          ],
+                                                        },
+                                                        "displayName": "VerticalSeparator__Separator",
+                                                        "foldedComponentIds": Array [],
+                                                        "render": [Function],
+                                                        "styledComponentId": "VerticalSeparator__Separator-sc-1256nz7-0",
+                                                        "target": "span",
+                                                        "toString": [Function],
+                                                        "warnTooManyClasses": [Function],
+                                                        "withComponent": [Function],
+                                                      }
+                                                    }
+                                                    forwardedRef={null}
+                                                  >
+                                                    <span
+                                                      className="VerticalSeparator__Separator-sc-1256nz7-0 kgxyCB"
+                                                    />
+                                                  </StyledComponent>
+                                                </VerticalSeparator__Separator>
+                                              </div>
+                                            </VerticalSeparator>
+                                          </div>
+                                        </StyledComponent>
+                                      </DataListToolbar__ColumnLeft>
+                                      <DataListToolbar__ColumnRight
+                                        fillWidth={false}
+                                      >
+                                        <StyledComponent
+                                          fillWidth={false}
+                                          forwardedComponent={
+                                            Object {
+                                              "$$typeof": Symbol(react.forward_ref),
+                                              "attrs": Array [],
+                                              "componentStyle": ComponentStyle {
+                                                "componentId": "DataListToolbar__ColumnRight-ajzso8-4",
+                                                "isStatic": false,
+                                                "lastClassName": "gTMHVz",
+                                                "rules": Array [
+                                                  "display:flex;flex-basis:",
+                                                  [Function],
+                                                  ";flex-grow:0;justify-content:flex-start;align-items:center;padding:8px 0 10px 0;@media screen and (min-width:980px){flex-basis:",
+                                                  [Function],
+                                                  ";}",
+                                                ],
+                                              },
+                                              "displayName": "DataListToolbar__ColumnRight",
+                                              "foldedComponentIds": Array [],
+                                              "render": [Function],
+                                              "styledComponentId": "DataListToolbar__ColumnRight-ajzso8-4",
+                                              "target": "div",
+                                              "toString": [Function],
+                                              "warnTooManyClasses": [Function],
+                                              "withComponent": [Function],
+                                            }
+                                          }
+                                          forwardedRef={null}
+                                        >
+                                          <div
+                                            className="DataListToolbar__ColumnRight-ajzso8-4 gTMHVz"
+                                          >
+                                            <ToolbarItem>
+                                              <div
+                                                className="pf-l-toolbar__item"
+                                              >
+                                                <WithI18n
+                                                  columns={
+                                                    Array [
+                                                      Object {
+                                                        "isSearchable": true,
+                                                        "isSortable": true,
+                                                        "key": "first_name",
+                                                        "name": "First Name",
+                                                      },
+                                                      Object {
+                                                        "isSearchable": true,
+                                                        "isSortable": true,
+                                                        "key": "username",
+                                                        "name": "Username",
+                                                      },
+                                                      Object {
+                                                        "isSearchable": true,
+                                                        "isSortable": true,
+                                                        "key": "last_name",
+                                                        "name": "Last Name",
+                                                      },
+                                                    ]
+                                                  }
+                                                  onSort={[Function]}
+                                                  sortOrder="ascending"
+                                                  sortedColumnKey="first_name"
+                                                >
+                                                  <I18n
+                                                    update={true}
+                                                    withHash={true}
+                                                  >
+                                                    <Sort
+                                                      columns={
+                                                        Array [
+                                                          Object {
+                                                            "isSearchable": true,
+                                                            "isSortable": true,
+                                                            "key": "first_name",
+                                                            "name": "First Name",
+                                                          },
+                                                          Object {
+                                                            "isSearchable": true,
+                                                            "isSortable": true,
+                                                            "key": "username",
+                                                            "name": "Username",
+                                                          },
+                                                          Object {
+                                                            "isSearchable": true,
+                                                            "isSortable": true,
+                                                            "key": "last_name",
+                                                            "name": "Last Name",
+                                                          },
+                                                        ]
+                                                      }
+                                                      i18n={"/i18n/"}
+                                                      onSort={[Function]}
+                                                      sortOrder="ascending"
+                                                      sortedColumnKey="first_name"
+                                                    >
+                                                      <Sort__SortBy>
+                                                        <StyledComponent
+                                                          forwardedComponent={
+                                                            Object {
+                                                              "$$typeof": Symbol(react.forward_ref),
+                                                              "attrs": Array [],
+                                                              "componentStyle": ComponentStyle {
+                                                                "componentId": "Sort__SortBy-sc-21g5aw-3",
+                                                                "isStatic": true,
+                                                                "lastClassName": "kxjfOq",
+                                                                "rules": Array [
+                                                                  "margin-right:15px;font-size:var(--pf-global--FontSize--md);",
+                                                                ],
+                                                              },
+                                                              "displayName": "Sort__SortBy",
+                                                              "foldedComponentIds": Array [],
+                                                              "render": [Function],
+                                                              "styledComponentId": "Sort__SortBy-sc-21g5aw-3",
+                                                              "target": "span",
+                                                              "toString": [Function],
+                                                              "warnTooManyClasses": [Function],
+                                                              "withComponent": [Function],
+                                                            }
+                                                          }
+                                                          forwardedRef={null}
+                                                        >
+                                                          <span
+                                                            className="Sort__SortBy-sc-21g5aw-3 kxjfOq"
+                                                          >
+                                                            Sort By
+                                                          </span>
+                                                        </StyledComponent>
+                                                      </Sort__SortBy>
+                                                      <Sort__Dropdown
+                                                        dropdownItems={
+                                                          Array [
+                                                            <DropdownItem
+                                                              component="button"
+                                                            >
+                                                              Username
+                                                            </DropdownItem>,
+                                                            <DropdownItem
+                                                              component="button"
+                                                            >
+                                                              Last Name
+                                                            </DropdownItem>,
+                                                          ]
+                                                        }
+                                                        isOpen={false}
+                                                        onSelect={[Function]}
+                                                        onToggle={[Function]}
+                                                        style={
+                                                          Object {
+                                                            "marginRight": "10px",
+                                                          }
+                                                        }
+                                                        toggle={
+                                                          <DropdownToggle
+                                                            id="awx-sort"
+                                                            onToggle={[Function]}
+                                                          >
+                                                            First Name
+                                                          </DropdownToggle>
+                                                        }
+                                                      >
+                                                        <StyledComponent
+                                                          dropdownItems={
+                                                            Array [
+                                                              <DropdownItem
+                                                                component="button"
+                                                              >
+                                                                Username
+                                                              </DropdownItem>,
+                                                              <DropdownItem
+                                                                component="button"
+                                                              >
+                                                                Last Name
+                                                              </DropdownItem>,
+                                                            ]
+                                                          }
+                                                          forwardedComponent={
+                                                            Object {
+                                                              "$$typeof": Symbol(react.forward_ref),
+                                                              "attrs": Array [],
+                                                              "componentStyle": ComponentStyle {
+                                                                "componentId": "Sort__Dropdown-sc-21g5aw-0",
+                                                                "isStatic": true,
+                                                                "lastClassName": "kdSQuN",
+                                                                "rules": Array [
+                                                                  "&&&{> button{min-height:30px;min-width:70px;height:30px;padding:0 10px;margin:0px;> span{width:auto;}> svg{margin:0px;padding-top:3px;padding-left:3px;}}}",
+                                                                ],
+                                                              },
+                                                              "displayName": "Sort__Dropdown",
+                                                              "foldedComponentIds": Array [],
+                                                              "render": [Function],
+                                                              "styledComponentId": "Sort__Dropdown-sc-21g5aw-0",
+                                                              "target": [Function],
+                                                              "toString": [Function],
+                                                              "warnTooManyClasses": [Function],
+                                                              "withComponent": [Function],
+                                                            }
+                                                          }
+                                                          forwardedRef={null}
+                                                          isOpen={false}
+                                                          onSelect={[Function]}
+                                                          onToggle={[Function]}
+                                                          style={
+                                                            Object {
+                                                              "marginRight": "10px",
+                                                            }
+                                                          }
+                                                          toggle={
+                                                            <DropdownToggle
+                                                              id="awx-sort"
+                                                              onToggle={[Function]}
+                                                            >
+                                                              First Name
+                                                            </DropdownToggle>
+                                                          }
+                                                        >
+                                                          <Dropdown
+                                                            className="Sort__Dropdown-sc-21g5aw-0 kdSQuN"
+                                                            dropdownItems={
+                                                              Array [
+                                                                <DropdownItem
+                                                                  component="button"
+                                                                >
+                                                                  Username
+                                                                </DropdownItem>,
+                                                                <DropdownItem
+                                                                  component="button"
+                                                                >
+                                                                  Last Name
+                                                                </DropdownItem>,
+                                                              ]
+                                                            }
+                                                            isOpen={false}
+                                                            onSelect={[Function]}
+                                                            onToggle={[Function]}
+                                                            style={
+                                                              Object {
+                                                                "marginRight": "10px",
+                                                              }
+                                                            }
+                                                            toggle={
+                                                              <DropdownToggle
+                                                                id="awx-sort"
+                                                                onToggle={[Function]}
+                                                              >
+                                                                First Name
+                                                              </DropdownToggle>
+                                                            }
+                                                          >
+                                                            <DropdownWithContext
+                                                              className="Sort__Dropdown-sc-21g5aw-0 kdSQuN"
+                                                              direction="down"
+                                                              dropdownItems={
+                                                                Array [
+                                                                  <DropdownItem
+                                                                    component="button"
+                                                                  >
+                                                                    Username
+                                                                  </DropdownItem>,
+                                                                  <DropdownItem
+                                                                    component="button"
+                                                                  >
+                                                                    Last Name
+                                                                  </DropdownItem>,
+                                                                ]
+                                                              }
+                                                              isGrouped={false}
+                                                              isOpen={false}
+                                                              isPlain={false}
+                                                              onSelect={[Function]}
+                                                              onToggle={[Function]}
+                                                              position="left"
+                                                              style={
+                                                                Object {
+                                                                  "marginRight": "10px",
+                                                                }
+                                                              }
+                                                              toggle={
+                                                                <DropdownToggle
+                                                                  id="awx-sort"
+                                                                  onToggle={[Function]}
+                                                                >
+                                                                  First Name
+                                                                </DropdownToggle>
+                                                              }
+                                                            >
+                                                              <div
+                                                                className="pf-c-dropdown Sort__Dropdown-sc-21g5aw-0 kdSQuN"
+                                                                onToggle={[Function]}
+                                                                style={
+                                                                  Object {
+                                                                    "marginRight": "10px",
+                                                                  }
+                                                                }
+                                                              >
+                                                                <DropdownToggle
+                                                                  ariaHasPopup={true}
+                                                                  id="awx-sort"
+                                                                  isOpen={false}
+                                                                  isPlain={false}
+                                                                  key=".0"
+                                                                  onEnter={[Function]}
+                                                                  onToggle={[Function]}
+                                                                  parentRef={
+                                                                    Object {
+                                                                      "current": <div
+                                                                        class="pf-c-dropdown Sort__Dropdown-sc-21g5aw-0 kdSQuN"
+                                                                        style="margin-right: 10px;"
+                                                                      >
+                                                                        <button
+                                                                          aria-expanded="false"
+                                                                          aria-haspopup="true"
+                                                                          class="pf-c-dropdown__toggle"
+                                                                          id="awx-sort"
+                                                                          type="button"
+                                                                        >
+                                                                          <span
+                                                                            class="pf-c-dropdown__toggle-text"
+                                                                          >
+                                                                            First Name
+                                                                          </span>
+                                                                          <svg
+                                                                            aria-hidden="true"
+                                                                            class="pf-c-dropdown__toggle-icon"
+                                                                            fill="currentColor"
+                                                                            height="1em"
+                                                                            role="img"
+                                                                            style="vertical-align: -0.125em;"
+                                                                            viewBox="0 0 320 512"
+                                                                            width="1em"
+                                                                          >
+                                                                            <path
+                                                                              d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+                                                                              transform=""
+                                                                            />
+                                                                          </svg>
+                                                                        </button>
+                                                                      </div>,
+                                                                    }
+                                                                  }
+                                                                >
+                                                                  <Toggle
+                                                                    ariaHasPopup={true}
+                                                                    className=""
+                                                                    id="awx-sort"
+                                                                    isActive={false}
+                                                                    isDisabled={false}
+                                                                    isFocused={false}
+                                                                    isHovered={false}
+                                                                    isOpen={false}
+                                                                    isPlain={false}
+                                                                    isSplitButton={false}
+                                                                    onEnter={[Function]}
+                                                                    onToggle={[Function]}
+                                                                    parentRef={
+                                                                      Object {
+                                                                        "current": <div
+                                                                          class="pf-c-dropdown Sort__Dropdown-sc-21g5aw-0 kdSQuN"
+                                                                          style="margin-right: 10px;"
+                                                                        >
+                                                                          <button
+                                                                            aria-expanded="false"
+                                                                            aria-haspopup="true"
+                                                                            class="pf-c-dropdown__toggle"
+                                                                            id="awx-sort"
+                                                                            type="button"
+                                                                          >
+                                                                            <span
+                                                                              class="pf-c-dropdown__toggle-text"
+                                                                            >
+                                                                              First Name
+                                                                            </span>
+                                                                            <svg
+                                                                              aria-hidden="true"
+                                                                              class="pf-c-dropdown__toggle-icon"
+                                                                              fill="currentColor"
+                                                                              height="1em"
+                                                                              role="img"
+                                                                              style="vertical-align: -0.125em;"
+                                                                              viewBox="0 0 320 512"
+                                                                              width="1em"
+                                                                            >
+                                                                              <path
+                                                                                d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+                                                                                transform=""
+                                                                              />
+                                                                            </svg>
+                                                                          </button>
+                                                                        </div>,
+                                                                      }
+                                                                    }
+                                                                  >
+                                                                    <button
+                                                                      aria-expanded={false}
+                                                                      aria-haspopup={true}
+                                                                      className="pf-c-dropdown__toggle"
+                                                                      disabled={false}
+                                                                      id="awx-sort"
+                                                                      onClick={[Function]}
+                                                                      onKeyDown={[Function]}
+                                                                      type="button"
+                                                                    >
+                                                                      <span
+                                                                        className="pf-c-dropdown__toggle-text"
+                                                                      >
+                                                                        First Name
+                                                                      </span>
+                                                                      <CaretDownIcon
+                                                                        className="pf-c-dropdown__toggle-icon"
+                                                                        color="currentColor"
+                                                                        noVerticalAlign={false}
+                                                                        size="sm"
+                                                                        title={null}
+                                                                      >
+                                                                        <svg
+                                                                          aria-hidden={true}
+                                                                          aria-labelledby={null}
+                                                                          className="pf-c-dropdown__toggle-icon"
+                                                                          fill="currentColor"
+                                                                          height="1em"
+                                                                          role="img"
+                                                                          style={
+                                                                            Object {
+                                                                              "verticalAlign": "-0.125em",
+                                                                            }
+                                                                          }
+                                                                          viewBox="0 0 320 512"
+                                                                          width="1em"
+                                                                        >
+                                                                          <path
+                                                                            d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
+                                                                            transform=""
+                                                                          />
+                                                                        </svg>
+                                                                      </CaretDownIcon>
+                                                                    </button>
+                                                                  </Toggle>
+                                                                </DropdownToggle>
+                                                              </div>
+                                                            </DropdownWithContext>
+                                                          </Dropdown>
+                                                        </StyledComponent>
+                                                      </Sort__Dropdown>
+                                                      <Tooltip
+                                                        appendTo={[Function]}
+                                                        aria="describedby"
+                                                        boundary="window"
+                                                        className=""
+                                                        content={
+                                                          <div>
+                                                            Reverse Sort Order
+                                                          </div>
+                                                        }
+                                                        distance={15}
+                                                        enableFlip={true}
+                                                        entryDelay={500}
+                                                        exitDelay={500}
+                                                        flipBehavior={
+                                                          Array [
+                                                            "top",
+                                                            "right",
+                                                            "bottom",
+                                                            "left",
+                                                            "top",
+                                                            "right",
+                                                            "bottom",
+                                                          ]
+                                                        }
+                                                        isAppLauncher={false}
+                                                        maxWidth="18.75rem"
+                                                        position="top"
+                                                        trigger="mouseenter focus"
+                                                        zIndex={9999}
+                                                      >
+                                                        <PopoverBase
+                                                          animateFill={false}
+                                                          appendTo={[Function]}
+                                                          aria="describedby"
+                                                          arrow={true}
+                                                          boundary="window"
+                                                          content={
+                                                            <div
+                                                              className=""
+                                                              role="tooltip"
+                                                            >
+                                                              <TooltipContent>
+                                                                <div>
+                                                                  Reverse Sort Order
+                                                                </div>
+                                                              </TooltipContent>
+                                                            </div>
+                                                          }
+                                                          delay={
+                                                            Array [
+                                                              500,
+                                                              500,
+                                                            ]
+                                                          }
+                                                          distance={15}
+                                                          flip={true}
+                                                          flipBehavior={
+                                                            Array [
+                                                              "top",
+                                                              "right",
+                                                              "bottom",
+                                                              "left",
+                                                              "top",
+                                                              "right",
+                                                              "bottom",
+                                                            ]
+                                                          }
+                                                          lazy={true}
+                                                          maxWidth="18.75rem"
+                                                          onCreate={[Function]}
+                                                          performance={true}
+                                                          placement="top"
+                                                          popperOptions={
+                                                            Object {
+                                                              "modifiers": Object {
+                                                                "hide": Object {
+                                                                  "enabled": true,
+                                                                },
+                                                                "preventOverflow": Object {
+                                                                  "enabled": true,
+                                                                },
+                                                              },
+                                                            }
+                                                          }
+                                                          theme="pf-tooltip"
+                                                          trigger="mouseenter focus"
+                                                          zIndex={9999}
+                                                        >
+                                                          <Sort__SortButton
+                                                            aria-label="Sort"
+                                                            onClick={[Function]}
+                                                            variant="plain"
+                                                          >
+                                                            <StyledComponent
+                                                              aria-label="Sort"
+                                                              forwardedComponent={
+                                                                Object {
+                                                                  "$$typeof": Symbol(react.forward_ref),
+                                                                  "attrs": Array [],
+                                                                  "componentStyle": ComponentStyle {
+                                                                    "componentId": "Sort__SortButton-sc-21g5aw-2",
+                                                                    "isStatic": true,
+                                                                    "lastClassName": "FZjfT",
+                                                                    "rules": Array [
+                                                                      "padding:5px 8px;margin-top:3px;&:hover{background-color:#0166cc;color:white;}",
+                                                                    ],
+                                                                  },
+                                                                  "displayName": "Sort__SortButton",
+                                                                  "foldedComponentIds": Array [],
+                                                                  "render": [Function],
+                                                                  "styledComponentId": "Sort__SortButton-sc-21g5aw-2",
+                                                                  "target": [Function],
+                                                                  "toString": [Function],
+                                                                  "warnTooManyClasses": [Function],
+                                                                  "withComponent": [Function],
+                                                                }
+                                                              }
+                                                              forwardedRef={null}
+                                                              onClick={[Function]}
+                                                              variant="plain"
+                                                            >
+                                                              <Button
+                                                                aria-label="Sort"
+                                                                className="Sort__SortButton-sc-21g5aw-2 FZjfT"
+                                                                onClick={[Function]}
+                                                                variant="plain"
+                                                              >
+                                                                <button
+                                                                  aria-disabled={null}
+                                                                  aria-label="Sort"
+                                                                  className="pf-c-button pf-m-plain Sort__SortButton-sc-21g5aw-2 FZjfT"
+                                                                  disabled={false}
+                                                                  onClick={[Function]}
+                                                                  tabIndex={null}
+                                                                  type="button"
+                                                                >
+                                                                  <Sort__IconWrapper>
+                                                                    <StyledComponent
+                                                                      forwardedComponent={
+                                                                        Object {
+                                                                          "$$typeof": Symbol(react.forward_ref),
+                                                                          "attrs": Array [],
+                                                                          "componentStyle": ComponentStyle {
+                                                                            "componentId": "Sort__IconWrapper-sc-21g5aw-1",
+                                                                            "isStatic": true,
+                                                                            "lastClassName": "fTwElO",
+                                                                            "rules": Array [
+                                                                              "> svg{font-size:18px;}",
+                                                                            ],
+                                                                          },
+                                                                          "displayName": "Sort__IconWrapper",
+                                                                          "foldedComponentIds": Array [],
+                                                                          "render": [Function],
+                                                                          "styledComponentId": "Sort__IconWrapper-sc-21g5aw-1",
+                                                                          "target": "span",
+                                                                          "toString": [Function],
+                                                                          "warnTooManyClasses": [Function],
+                                                                          "withComponent": [Function],
+                                                                        }
+                                                                      }
+                                                                      forwardedRef={null}
+                                                                    >
+                                                                      <span
+                                                                        className="Sort__IconWrapper-sc-21g5aw-1 fTwElO"
+                                                                      >
+                                                                        <SortAlphaUpIcon
+                                                                          color="currentColor"
+                                                                          noVerticalAlign={false}
+                                                                          size="sm"
+                                                                          style={
+                                                                            Object {
+                                                                              "verticalAlign": "-0.225em",
+                                                                            }
+                                                                          }
+                                                                          title={null}
+                                                                        >
+                                                                          <svg
+                                                                            aria-hidden={true}
+                                                                            aria-labelledby={null}
+                                                                            fill="currentColor"
+                                                                            height="1em"
+                                                                            role="img"
+                                                                            style={
+                                                                              Object {
+                                                                                "verticalAlign": "-0.225em",
+                                                                              }
+                                                                            }
+                                                                            viewBox="0 0 448 512"
+                                                                            width="1em"
+                                                                          >
+                                                                            <path
+                                                                              d="M107.3 36.7c-6.2-6.2-16.4-6.2-22.6 0l-80 80c-10 10-2.9 27.3 11.3 27.3h48v320c0 8.8 7.2 16 16 16h32c8.8 0 16-7.2 16-16V144h48c14.2 0 21.4-17.2 11.3-27.3zm293.4 390.4h-61.1c.7-1 1.5-2 2.3-3.1l67.5-95.7c1.4-2 2.2-4.4 2.2-6.9V300c0-6.6-5.4-12-12-12H274.5c-6.6 0-12 5.4-12 12v28.9c0 6.6 5.4 12 12 12H331c-.7 1-1.5 2-2.3 3.1l-67.2 95.2c-1.4 2-2.2 4.4-2.2 6.9V468c0 6.6 5.4 12 12 12h129.4c6.6 0 12-5.4 12-12v-28.9c0-6.7-5.4-12-12-12zm23.5-219l-57.1-168c-1.7-4.9-6.2-8.1-11.4-8.1h-39.6c-5.1 0-9.7 3.3-11.4 8.1l-57.1 168c-2.6 7.8 3.1 15.9 11.4 15.9h35.7c5.4 0 10.1-3.5 11.5-8.7l8.1-28.2h42.9l8.3 28.3A12 12 0 0 0 377 224h35.7c8.4 0 14.2-8.1 11.5-15.9zm-95-71.5l6.8-22.9 6.6 22.9z"
+                                                                              transform=""
+                                                                            />
+                                                                          </svg>
+                                                                        </SortAlphaUpIcon>
+                                                                      </span>
+                                                                    </StyledComponent>
+                                                                  </Sort__IconWrapper>
+                                                                </button>
+                                                              </Button>
+                                                            </StyledComponent>
+                                                          </Sort__SortButton>
+                                                          <Portal
+                                                            containerInfo={
+                                                              <div>
+                                                                <div
+                                                                  class=""
+                                                                  role="tooltip"
+                                                                >
+                                                                  <div
+                                                                    class="pf-c-tooltip__content"
+                                                                  >
+                                                                    <div>
+                                                                      Reverse Sort Order
+                                                                    </div>
+                                                                  </div>
+                                                                </div>
+                                                              </div>
+                                                            }
+                                                          >
+                                                            <div
+                                                              className=""
+                                                              role="tooltip"
+                                                            >
+                                                              <TooltipContent>
+                                                                <div
+                                                                  className="pf-c-tooltip__content"
+                                                                >
+                                                                  <div>
+                                                                    Reverse Sort Order
+                                                                  </div>
+                                                                </div>
+                                                              </TooltipContent>
+                                                            </div>
+                                                          </Portal>
+                                                        </PopoverBase>
+                                                      </Tooltip>
+                                                    </Sort>
+                                                  </I18n>
+                                                </WithI18n>
+                                              </div>
+                                            </ToolbarItem>
+                                            <DataListToolbar__AdditionalControlsWrapper>
+                                              <StyledComponent
+                                                forwardedComponent={
+                                                  Object {
+                                                    "$$typeof": Symbol(react.forward_ref),
+                                                    "attrs": Array [],
+                                                    "componentStyle": ComponentStyle {
+                                                      "componentId": "DataListToolbar__AdditionalControlsWrapper-ajzso8-5",
+                                                      "isStatic": true,
+                                                      "lastClassName": "bWuACV",
+                                                      "rules": Array [
+                                                        "display:flex;flex-grow:1;justify-content:flex-end;align-items:center;& >:not(:first-child){margin-left:20px;}",
+                                                      ],
+                                                    },
+                                                    "displayName": "DataListToolbar__AdditionalControlsWrapper",
+                                                    "foldedComponentIds": Array [],
+                                                    "render": [Function],
+                                                    "styledComponentId": "DataListToolbar__AdditionalControlsWrapper-ajzso8-5",
+                                                    "target": "div",
+                                                    "toString": [Function],
+                                                    "warnTooManyClasses": [Function],
+                                                    "withComponent": [Function],
+                                                  }
+                                                }
+                                                forwardedRef={null}
+                                              >
+                                                <div
+                                                  className="DataListToolbar__AdditionalControlsWrapper-ajzso8-5 bWuACV"
+                                                >
+                                                  <WithI18n
+                                                    key="add"
+                                                    onClick={[Function]}
+                                                  >
+                                                    <I18n
+                                                      update={true}
+                                                      withHash={true}
+                                                    >
+                                                      <ToolbarAddButton
+                                                        i18n={"/i18n/"}
+                                                        linkTo={null}
+                                                        onClick={[Function]}
+                                                      >
+                                                        <ToolbarAddButton__Button
+                                                          aria-label="Add"
+                                                          onClick={[Function]}
+                                                          variant="primary"
+                                                        >
+                                                          <StyledComponent
+                                                            aria-label="Add"
+                                                            forwardedComponent={
+                                                              Object {
+                                                                "$$typeof": Symbol(react.forward_ref),
+                                                                "attrs": Array [],
+                                                                "componentStyle": ComponentStyle {
+                                                                  "componentId": "ToolbarAddButton__Button-sc-1gmbna8-0",
+                                                                  "isStatic": true,
+                                                                  "lastClassName": "gsGQWy",
+                                                                  "rules": Array [
+                                                                    "&&{background-color:#5cb85c;padding:5px 8px;--pf-global--FontSize--md:14px;}",
+                                                                  ],
+                                                                },
+                                                                "displayName": "ToolbarAddButton__Button",
+                                                                "foldedComponentIds": Array [],
+                                                                "render": [Function],
+                                                                "styledComponentId": "ToolbarAddButton__Button-sc-1gmbna8-0",
+                                                                "target": [Function],
+                                                                "toString": [Function],
+                                                                "warnTooManyClasses": [Function],
+                                                                "withComponent": [Function],
+                                                              }
+                                                            }
+                                                            forwardedRef={null}
+                                                            onClick={[Function]}
+                                                            variant="primary"
+                                                          >
+                                                            <Button
+                                                              aria-label="Add"
+                                                              className="ToolbarAddButton__Button-sc-1gmbna8-0 gsGQWy"
+                                                              onClick={[Function]}
+                                                              variant="primary"
+                                                            >
+                                                              <button
+                                                                aria-disabled={null}
+                                                                aria-label="Add"
+                                                                className="pf-c-button pf-m-primary ToolbarAddButton__Button-sc-1gmbna8-0 gsGQWy"
+                                                                disabled={false}
+                                                                onClick={[Function]}
+                                                                tabIndex={null}
+                                                                type="button"
+                                                              >
+                                                                <PlusIcon
+                                                                  color="currentColor"
+                                                                  noVerticalAlign={false}
+                                                                  size="sm"
+                                                                  title={null}
+                                                                >
+                                                                  <svg
+                                                                    aria-hidden={true}
+                                                                    aria-labelledby={null}
+                                                                    fill="currentColor"
+                                                                    height="1em"
+                                                                    role="img"
+                                                                    style={
+                                                                      Object {
+                                                                        "verticalAlign": "-0.125em",
+                                                                      }
+                                                                    }
+                                                                    viewBox="0 0 448 512"
+                                                                    width="1em"
+                                                                  >
+                                                                    <path
+                                                                      d="M416 208H272V64c0-17.67-14.33-32-32-32h-32c-17.67 0-32 14.33-32 32v144H32c-17.67 0-32 14.33-32 32v32c0 17.67 14.33 32 32 32h144v144c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32V304h144c17.67 0 32-14.33 32-32v-32c0-17.67-14.33-32-32-32z"
+                                                                      transform=""
+                                                                    />
+                                                                  </svg>
+                                                                </PlusIcon>
+                                                              </button>
+                                                            </Button>
+                                                          </StyledComponent>
+                                                        </ToolbarAddButton__Button>
+                                                      </ToolbarAddButton>
+                                                    </I18n>
+                                                  </WithI18n>
+                                                </div>
+                                              </StyledComponent>
+                                            </DataListToolbar__AdditionalControlsWrapper>
+                                          </div>
+                                        </StyledComponent>
+                                      </DataListToolbar__ColumnRight>
+                                    </div>
+                                  </Toolbar>
+                                </StyledComponent>
+                              </Styled(DataListToolbar__Toolbar)>
+                            </div>
+                          </StyledComponent>
+                        </DataListToolbar__AWXToolbar>
+                      </DataListToolbar>
+                    </I18n>
+                  </WithI18n>
                   <WithI18n
                     itemCount={0}
                     onRemove={[Function]}
diff --git a/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.jsx b/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.jsx
index d0031cb30e..d21ff74a9f 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.jsx
@@ -142,7 +142,8 @@ class OrganizationsList extends Component {
 
     const canAdd =
       actions && Object.prototype.hasOwnProperty.call(actions, 'POST');
-    const isAllSelected = selected.length === organizations.length;
+    const isAllSelected =
+      selected.length === organizations.length && selected.length > 0;
 
     return (
       <Fragment>
diff --git a/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx b/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx
index 9993f58aa5..f4618956dc 100644
--- a/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx
+++ b/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx
@@ -184,7 +184,8 @@ class TemplatesList extends Component {
     const { match, i18n } = this.props;
     const canAdd =
       actions && Object.prototype.hasOwnProperty.call(actions, 'POST');
-    const isAllSelected = selected.length === templates.length;
+    const isAllSelected =
+      selected.length === templates.length && selected.length > 0;
     return (
       <PageSection>
         <Card>