Merge "Accept non zero-terminated strings in ftrace fields"
diff --git a/ui/src/frontend/publish.ts b/ui/src/frontend/publish.ts
index eb2d5fe..1edcc76 100644
--- a/ui/src/frontend/publish.ts
+++ b/ui/src/frontend/publish.ts
@@ -144,6 +144,7 @@
 
 export function publishQueryResult(args: {id: string, data?: {}}) {
   globals.queryResults.set(args.id, args.data);
+  globals.dispatch(Actions.setCurrentTab({tab: 'query_result'}));
   globals.publishRedraw();
 }
 
diff --git a/ui/src/frontend/track.ts b/ui/src/frontend/track.ts
index f319614..5cd1e9b 100644
--- a/ui/src/frontend/track.ts
+++ b/ui/src/frontend/track.ts
@@ -197,7 +197,7 @@
       const yOffsetPx = textMetrics.fontBoundingBoxAscent +
           textMetrics.fontBoundingBoxDescent +
           text2Metrics.fontBoundingBoxAscent;
-      ctx.fillText(text, x + paddingPx, y + paddingPx + yOffsetPx);
+      ctx.fillText(text2, x + paddingPx, y + paddingPx + yOffsetPx);
     }
   }