diff --git a/awx/ui_next/src/components/AddRole/AddResourceRole.jsx b/awx/ui_next/src/components/AddRole/AddResourceRole.jsx
index 9861bc5c24..a7668f92b3 100644
--- a/awx/ui_next/src/components/AddRole/AddResourceRole.jsx
+++ b/awx/ui_next/src/components/AddRole/AddResourceRole.jsx
@@ -149,11 +149,11 @@ class AddResourceRole extends React.Component {
         isDefault: true
       },
       {
-        name: i18n._(t`First name`),
+        name: i18n._(t`First Name`),
         key: 'first_name',
       },
       {
-        name: i18n._(t`Last name`),
+        name: i18n._(t`Last Name`),
         key: 'last_name',
       }
     ];
@@ -164,11 +164,11 @@ class AddResourceRole extends React.Component {
         key: 'username',
       },
       {
-        name: i18n._(t`First name`),
+        name: i18n._(t`First Name`),
         key: 'first_name',
       },
       {
-        name: i18n._(t`Last name`),
+        name: i18n._(t`Last Name`),
         key: 'last_name',
       }
     ];
@@ -180,11 +180,11 @@ class AddResourceRole extends React.Component {
         isDefault: true
       },
       {
-        name: i18n._(t`Created by (username)`),
+        name: i18n._(t`Created By (Username)`),
         key: 'created_by__username',
       },
       {
-        name: i18n._(t`Modified by (username)`),
+        name: i18n._(t`Modified By (Username)`),
         key: 'modified_by__username',
       },
     ];
diff --git a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.test.jsx b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.test.jsx
index 402ee08d0b..cc3852f764 100644
--- a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.test.jsx
+++ b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.test.jsx
@@ -190,11 +190,11 @@ describe('<DataListToolbar />', () => {
     const upAlphaIconSelector = 'SortAlphaUpIcon';
 
     const numericColumns = [
-      { name: 'ID', key: 'id', isDefault: true },
+      { name: 'ID', key: 'id' },
     ];
 
     const alphaColumns = [
-      { name: 'Name', key: 'name', isDefault: true },
+      { name: 'Name', key: 'name' },
     ];
 
     const searchColumns = [
@@ -252,7 +252,7 @@ describe('<DataListToolbar />', () => {
       { name: 'Name', key: 'name', isDefault: true }
     ];
     const sortColumns = [
-      { name: 'Name', key: 'name', isDefault: true }
+      { name: 'Name', key: 'name' }
     ];
 
     toolbar = mountWithContexts(
diff --git a/awx/ui_next/src/components/ListHeader/ListHeader.jsx b/awx/ui_next/src/components/ListHeader/ListHeader.jsx
index 6adc6ccfd5..43f77337a9 100644
--- a/awx/ui_next/src/components/ListHeader/ListHeader.jsx
+++ b/awx/ui_next/src/components/ListHeader/ListHeader.jsx
@@ -38,8 +38,10 @@ class ListHeader extends React.Component {
 
   handleSearch(key, value) {
     const { location, qsConfig } = this.props;
-    const oldParams = parseQueryString(qsConfig, location.search);
-    this.pushHistoryState(mergeParams(oldParams, { [key]: value }));
+    let params = parseQueryString(qsConfig, location.search);
+    params = mergeParams(params, { [key]: value });
+    params = replaceParams(params, { 'page' : 1 })
+    this.pushHistoryState(params);
   }
 
   handleReplaceSearch(key, value) {
diff --git a/awx/ui_next/src/components/Lookup/CredentialLookup.jsx b/awx/ui_next/src/components/Lookup/CredentialLookup.jsx
index 7596a8a5a1..6b59c54aec 100644
--- a/awx/ui_next/src/components/Lookup/CredentialLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/CredentialLookup.jsx
@@ -82,11 +82,11 @@ function CredentialLookup({
                 isDefault: true
               },
               {
-                name: i18n._(t`Created by (username)`),
+                name: i18n._(t`Created By (Username)`),
                 key: 'created_by__username',
               },
               {
-                name: i18n._(t`Modified by (username)`),
+                name: i18n._(t`Modified By (Username)`),
                 key: 'modified_by__username',
               }
             ]}
diff --git a/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx b/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx
index 87e59099c9..08ab47d12b 100644
--- a/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/InstanceGroupsLookup.jsx
@@ -71,15 +71,15 @@ function InstanceGroupsLookup(props) {
                 isDefault: true
               },
               {
-                name: i18n._(t`Credential name`),
+                name: i18n._(t`Credential Name`),
                 key: 'credential__name'
               },
               {
-                name: i18n._(t`Created by (username)`),
+                name: i18n._(t`Created By (Username)`),
                 key: 'created_by__username',
               },
               {
-                name: i18n._(t`Modified by (username)`),
+                name: i18n._(t`Modified By (Username)`),
                 key: 'modified_by__username',
               },
             ]}
diff --git a/awx/ui_next/src/components/Lookup/InventoryLookup.jsx b/awx/ui_next/src/components/Lookup/InventoryLookup.jsx
index 3e7f4e0be4..0cef3b1c25 100644
--- a/awx/ui_next/src/components/Lookup/InventoryLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/InventoryLookup.jsx
@@ -75,11 +75,11 @@ function InventoryLookup({
                 isDefault: true
               },
               {
-                name: i18n._(t`Created by (username)`),
+                name: i18n._(t`Created By (Username)`),
                 key: 'created_by__username',
               },
               {
-                name: i18n._(t`Modified by (username)`),
+                name: i18n._(t`Modified By (Username)`),
                 key: 'modified_by__username',
               },
             ]}
diff --git a/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx b/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx
index c7d360cc4e..8d5cf0f8e8 100644
--- a/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx
@@ -129,11 +129,11 @@ function MultiCredentialsLookup(props) {
                     isDefault: true
                   },
                   {
-                    name: i18n._(t`Created by (username)`),
+                    name: i18n._(t`Created By (Username)`),
                     key: 'created_by__username',
                   },
                   {
-                    name: i18n._(t`Modified by (username)`),
+                    name: i18n._(t`Modified By (Username)`),
                     key: 'modified_by__username',
                   },
                 ]}
diff --git a/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx b/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx
index 1d747f88b1..d787c133db 100644
--- a/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/OrganizationLookup.jsx
@@ -77,11 +77,11 @@ function OrganizationLookup({
                 isDefault: true
               },
               {
-                name: i18n._(t`Created by (username)`),
+                name: i18n._(t`Created By (Username)`),
                 key: 'created_by__username',
               },
               {
-                name: i18n._(t`Modified by (username)`),
+                name: i18n._(t`Modified By (Username)`),
                 key: 'modified_by__username',
               },
             ]}
diff --git a/awx/ui_next/src/components/Lookup/ProjectLookup.jsx b/awx/ui_next/src/components/Lookup/ProjectLookup.jsx
index e2577ab29f..17da912ed9 100644
--- a/awx/ui_next/src/components/Lookup/ProjectLookup.jsx
+++ b/awx/ui_next/src/components/Lookup/ProjectLookup.jsx
@@ -106,11 +106,11 @@ function ProjectLookup({
                 key: 'scm_url',
               },
               {
-                name: i18n._(t`Modified by (username)`),
+                name: i18n._(t`Modified By (Username)`),
                 key: 'modified_by__username',
               },
               {
-                name: i18n._(t`Created by (username)`),
+                name: i18n._(t`Created By (Username)`),
                 key: 'created_by__username',
               },
             ]}
diff --git a/awx/ui_next/src/components/NotificationList/NotificationList.jsx b/awx/ui_next/src/components/NotificationList/NotificationList.jsx
index bd6d090dfd..ee6498566b 100644
--- a/awx/ui_next/src/components/NotificationList/NotificationList.jsx
+++ b/awx/ui_next/src/components/NotificationList/NotificationList.jsx
@@ -11,7 +11,6 @@ import PaginatedDataList from '@components/PaginatedDataList';
 import { getQSConfig, parseQueryString } from '@util/qs';
 
 import { NotificationTemplatesAPI } from '@api';
-import { type } from 'os';
 
 const QS_CONFIG = getQSConfig('notification', {
   page: 1,
@@ -222,11 +221,11 @@ class NotificationList extends Component {
               ]
             },
             {
-              name: i18n._(t`Created by (username)`),
+              name: i18n._(t`Created By (Username)`),
               key: 'created_by__username',
             },
             {
-              name: i18n._(t`Modified by (username)`),
+              name: i18n._(t`Modified By (Username)`),
               key: 'modified_by__username',
             },
           ]}
diff --git a/awx/ui_next/src/screens/Host/HostList/HostList.jsx b/awx/ui_next/src/screens/Host/HostList/HostList.jsx
index 3d20448a07..7169f9274c 100644
--- a/awx/ui_next/src/screens/Host/HostList/HostList.jsx
+++ b/awx/ui_next/src/screens/Host/HostList/HostList.jsx
@@ -197,11 +197,11 @@ class HostsList extends Component {
                   isDefault: true
                 },
                 {
-                  name: i18n._(t`Created by (username)`),
+                  name: i18n._(t`Created By (Username)`),
                   key: 'created_by__username',
                 },
                 {
-                  name: i18n._(t`Modified by (username)`),
+                  name: i18n._(t`Modified By (Username)`),
                   key: 'modified_by__username',
                 },
               ]}
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx
index 7b4a17ef67..ebcd0eff01 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx
@@ -184,16 +184,16 @@ function InventoryGroupsList({ i18n, location, match }) {
             isDefault: true
           },
           {
-            name: i18n._(t`Is root group`),
+            name: i18n._(t`Is Root Group`),
             key: 'parents__isnull',
             isBoolean: true
           },
           {
-            name: i18n._(t`Created by (username)`),
+            name: i18n._(t`Created By (Username)`),
             key: 'created_by__username',
           },
           {
-            name: i18n._(t`Modified by (username)`),
+            name: i18n._(t`Modified By (Username)`),
             key: 'modified_by__username',
           },
         ]}
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHosts.jsx b/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHosts.jsx
index 306e8dc51f..af74079e95 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHosts.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHosts.jsx
@@ -131,7 +131,7 @@ function InventoryHosts({ i18n, location, match }) {
         itemCount={hostCount}
         pluralizedItemName={i18n._(t`Hosts`)}
         qsConfig={QS_CONFIG}
-        onRowClick={this.handleSelect}
+        onRowClick={handleSelect}
         toolbarSearchColumns={[
           {
             name: i18n._(t`Name`),
@@ -139,11 +139,11 @@ function InventoryHosts({ i18n, location, match }) {
             isDefault: true
           },
           {
-            name: i18n._(t`Created by (username)`),
+            name: i18n._(t`Created By (Username)`),
             key: 'created_by__username',
           },
           {
-            name: i18n._(t`Modified by (username)`),
+            name: i18n._(t`Modified By (Username)`),
             key: 'modified_by__username',
           },
         ]}
diff --git a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
index 9895d6ec6b..ef6e067597 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
@@ -181,11 +181,11 @@ class InventoriesList extends Component {
                 isDefault: true
               },
               {
-                name: i18n._(t`Created by (username)`),
+                name: i18n._(t`Created By (Username)`),
                 key: 'created_by__username',
               },
               {
-                name: i18n._(t`Modified by (username)`),
+                name: i18n._(t`Modified By (Username)`),
                 key: 'modified_by__username',
               },
             ]}
diff --git a/awx/ui_next/src/screens/Job/JobList/JobList.jsx b/awx/ui_next/src/screens/Job/JobList/JobList.jsx
index 68b26d5a6e..9f878e137f 100644
--- a/awx/ui_next/src/screens/Job/JobList/JobList.jsx
+++ b/awx/ui_next/src/screens/Job/JobList/JobList.jsx
@@ -174,11 +174,11 @@ class JobList extends Component {
                 key: 'id'
               },
               {
-                name: i18n._(t`Label name`),
-                key: 'label__name'
+                name: i18n._(t`Label Name`),
+                key: 'labels__name'
               },
               {
-                name: i18n._(t`Job type`),
+                name: i18n._(t`Job Type`),
                 key: `type`,
                 options: [
                   [
@@ -208,7 +208,7 @@ class JobList extends Component {
                 ]
               },
               {
-                name: i18n._(t`Created by (username)`),
+                name: i18n._(t`Created By (Username)`),
                 key: 'created_by__username'
               },
               {
diff --git a/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.jsx b/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.jsx
index 5b1b5b27bd..e1cae140cd 100644
--- a/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.jsx
+++ b/awx/ui_next/src/screens/Organization/OrganizationList/OrganizationList.jsx
@@ -126,11 +126,11 @@ function OrganizationsList({ i18n }) {
                 isDefault: true
               },
               {
-                name: i18n._(t`Created by (username)`),
+                name: i18n._(t`Created By (Username)`),
                 key: 'created_by__username',
               },
               {
-                name: i18n._(t`Modified by (username)`),
+                name: i18n._(t`Modified By (Username)`),
                 key: 'modified_by__username',
               },
             ]}
diff --git a/awx/ui_next/src/screens/Project/ProjectList/ProjectList.jsx b/awx/ui_next/src/screens/Project/ProjectList/ProjectList.jsx
index 145c473a15..45f6bc0086 100644
--- a/awx/ui_next/src/screens/Project/ProjectList/ProjectList.jsx
+++ b/awx/ui_next/src/screens/Project/ProjectList/ProjectList.jsx
@@ -192,11 +192,11 @@ class ProjectsList extends Component {
                   key: 'scm_url',
                 },
                 {
-                  name: i18n._(t`Modified by (username)`),
+                  name: i18n._(t`Modified By (Username)`),
                   key: 'modified_by__username',
                 },
                 {
-                  name: i18n._(t`Created by (username)`),
+                  name: i18n._(t`Created By (Username)`),
                   key: 'created_by__username',
                 },
               ]}
diff --git a/awx/ui_next/src/screens/Team/TeamList/TeamList.jsx b/awx/ui_next/src/screens/Team/TeamList/TeamList.jsx
index 8048e82c63..ee3546f4be 100644
--- a/awx/ui_next/src/screens/Team/TeamList/TeamList.jsx
+++ b/awx/ui_next/src/screens/Team/TeamList/TeamList.jsx
@@ -161,15 +161,15 @@ class TeamsList extends Component {
                   isDefault: true
                 },
                 {
-                  name: i18n._(t`Organization name`),
+                  name: i18n._(t`Organization Name`),
                   key: 'organization__name',
                 },
                 {
-                  name: i18n._(t`Created by (username)`),
+                  name: i18n._(t`Created By (Username)`),
                   key: 'created_by__username',
                 },
                 {
-                  name: i18n._(t`Modified by (username)`),
+                  name: i18n._(t`Modified By (Username)`),
                   key: 'modified_by__username',
                 },
               ]}
diff --git a/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx b/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx
index 6a3900208c..7fa6572356 100644
--- a/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx
+++ b/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx
@@ -239,11 +239,11 @@ class TemplatesList extends Component {
                 key: 'job_template__playbook',
               },
               {
-                name: i18n._(t`Created by (username)`),
+                name: i18n._(t`Created By (Username)`),
                 key: 'created_by__username',
               },
               {
-                name: i18n._(t`Modified by (username)`),
+                name: i18n._(t`Modified By (Username)`),
                 key: 'modified_by__username',
               },
             ]}
diff --git a/awx/ui_next/src/screens/User/UserList/UserList.jsx b/awx/ui_next/src/screens/User/UserList/UserList.jsx
index 9ca6400742..cb808dbcef 100644
--- a/awx/ui_next/src/screens/User/UserList/UserList.jsx
+++ b/awx/ui_next/src/screens/User/UserList/UserList.jsx
@@ -161,11 +161,11 @@ class UsersList extends Component {
                   isDefault: true
                 },
                 {
-                  name: i18n._(t`First name`),
+                  name: i18n._(t`First Name`),
                   key: 'first_name',
                 },
                 {
-                  name: i18n._(t`Last name`),
+                  name: i18n._(t`Last Name`),
                   key: 'last_name',
                 }
               ]}
@@ -175,11 +175,11 @@ class UsersList extends Component {
                   key: 'username',
                 },
                 {
-                  name: i18n._(t`First name`),
+                  name: i18n._(t`First Name`),
                   key: 'first_name',
                 },
                 {
-                  name: i18n._(t`Last name`),
+                  name: i18n._(t`Last Name`),
                   key: 'last_name',
                 },
               ]}
diff --git a/awx/ui_next/src/util/qs.js b/awx/ui_next/src/util/qs.js
index b029e62ecc..f16855857f 100644
--- a/awx/ui_next/src/util/qs.js
+++ b/awx/ui_next/src/util/qs.js
@@ -193,6 +193,7 @@ function removeParam(oldVal, deleteVal) {
  * @return {object} merged namespaced params object
  */
 export function mergeParams(oldParams, newParams) {
+  debugger;
   const merged = {};
   Object.keys(oldParams).forEach(key => {
     merged[key] = mergeParam(oldParams[key], newParams[key]);