diff --git a/frontend/app/components/chart/default_data_provider.ts b/frontend/app/components/chart/default_data_provider.ts
index 52c05fc53..33fc528a9 100644
--- a/frontend/app/components/chart/default_data_provider.ts
+++ b/frontend/app/components/chart/default_data_provider.ts
@@ -98,7 +98,7 @@ export class ReplicaGroupDataProvider extends DefaultDataProvider {
   communicationOps = new Set();
   // Column indexes
   opCategoryIndex?: number;  // 'category' column
-  hloOpNameIndex?: number;   // 'operation' column
+  hloOpNameIndex?: number;   // 'hlo_op_expression' column
   selfTimeIndex?: number;    // 'total_self_time' column
 
    parseData(data: SimpleDataTable) {
@@ -108,8 +108,10 @@ export class ReplicaGroupDataProvider extends DefaultDataProvider {
 
     // Set the column index member variables.
     for (let i = 0; i < data.cols.length; i++) {
+      // TODO(xprof) ids defined in hlo_stats.cc is also hard coded here and in
+      // hlo_stats.ts, try to decouple or add "if change then" lint
       if (data.cols[i].id === 'category') this.opCategoryIndex = i;
-      if (data.cols[i].id === 'operation') this.hloOpNameIndex = i;
+      if (data.cols[i].id === 'hlo_op_expression') this.hloOpNameIndex = i;
       if (data.cols[i].id === 'total_self_time') this.selfTimeIndex = i;
     }
 
diff --git a/frontend/app/components/controls/string_filter/string_filter.ts b/frontend/app/components/controls/string_filter/string_filter.ts
index a49501d7c..6c9e5b468 100644
--- a/frontend/app/components/controls/string_filter/string_filter.ts
+++ b/frontend/app/components/controls/string_filter/string_filter.ts
@@ -12,10 +12,10 @@ import {Component, EventEmitter, Input, OnChanges, Output, SimpleChanges} from '
 export class StringFilter implements OnChanges {
   @Input() dataTable?: google.visualization.DataTable;
   @Input() column: number|string = -1;
+  @Input() value = '';
 
   columnIndex = -1;
   columnLabel = '';
-  value = '';
 
   @Output()
   changed = new EventEmitter<google.visualization.DataTableCellFilter>();