diff --git a/projects/aca-testing-shared/src/components/data-table/data-table.ts b/projects/aca-testing-shared/src/components/data-table/data-table.ts
index d7605e158..2c99f1817 100755
--- a/projects/aca-testing-shared/src/components/data-table/data-table.ts
+++ b/projects/aca-testing-shared/src/components/data-table/data-table.ts
@@ -37,7 +37,7 @@ export class DataTable extends Component {
       .adf-datatable__header--sorted-asc .adf-datatable-cell-value,
       .adf-datatable__header--sorted-desc .adf-datatable-cell-value
     `,
-    row: '.adf-datatable-row[role]',
+    row: '.adf-datatable-row[data-automation-id^="datatable-row"]',
     cell: '.adf-datatable-cell-container',
     lockOwner: '.aca-locked-by',
     searchResultsRow: 'aca-search-results-row',
diff --git a/src/app/components/page.component.ts b/src/app/components/page.component.ts
index d1ebab85f..b89cf24f7 100644
--- a/src/app/components/page.component.ts
+++ b/src/app/components/page.component.ts
@@ -65,7 +65,7 @@ export abstract class PageComponent implements OnInit, OnDestroy, OnChanges {
   canUpdateNode = false;
   canUpload = false;
   nodeResult: NodePaging;
-  showHeader = ShowHeaderMode.Always;
+  showHeader = ShowHeaderMode.Data;
   filterSorting = 'name-asc';
 
   protected subscriptions: Subscription[] = [];