diff --git a/app/javascript/vue/projects/list.vue b/app/javascript/vue/projects/list.vue
index 94d21eaeb..f21b409fe 100644
--- a/app/javascript/vue/projects/list.vue
+++ b/app/javascript/vue/projects/list.vue
@@ -245,7 +245,7 @@ export default {
               </a>`;
     },
     openComments(_params, rows) {
-      this.$refs.commentButton.dataset.objectId = rows[0].id;
+      $(this.$refs.commentButton).data('objectId', rows[0].id);
       this.$refs.commentButton.click();
     },
     access(event, rows) {
diff --git a/app/javascript/vue/shared/datatable/table.vue b/app/javascript/vue/shared/datatable/table.vue
index d914b7ae1..7cec2db3c 100644
--- a/app/javascript/vue/shared/datatable/table.vue
+++ b/app/javascript/vue/shared/datatable/table.vue
@@ -206,7 +206,7 @@ export default {
         suppressCellFocus: true,
         rowHeight: 40,
         headerHeight: 40,
-        getRowId: (params) => `e2e-TB-row-${params.data.id}`
+        getRowId: (params) => `e2e-TB-row-${params.data.code || params.data.id}`
       };
     },
     extendedColumnDefs() {
@@ -359,7 +359,9 @@ export default {
         state: this.tableState.columnsState,
         applyOrder: true
       });
+
       setTimeout(() => {
+        this.gridApi.refreshHeader();
         this.initializing = false;
       }, 200);
     },