diff --git a/frontend/src/lib/OutputArtifactLoader.ts b/frontend/src/lib/OutputArtifactLoader.ts
index c29a349fd7b..a2bdf850e5b 100644
--- a/frontend/src/lib/OutputArtifactLoader.ts
+++ b/frontend/src/lib/OutputArtifactLoader.ts
@@ -272,6 +272,7 @@ export class OutputArtifactLoader {
 
     // Since artifact types don't change per run, this can be optimized further so
     // that we don't fetch them on every page load.
+    console.log('enter TFX for execution ' + execution.getId() + ' namespace ' + namespace);
     reportProgress(10);
     const [artifactTypes, artifacts] = await Promise.all([
       getArtifactTypes(),
diff --git a/frontend/src/mlmd/MlmdUtils.ts b/frontend/src/mlmd/MlmdUtils.ts
index 1f60b4f06bc..58f6ea96fe7 100644
--- a/frontend/src/mlmd/MlmdUtils.ts
+++ b/frontend/src/mlmd/MlmdUtils.ts
@@ -70,17 +70,9 @@ async function getContext({ type, name }: { type: string; name: string }): Promi
  * @throws error when network error, or not found
  */
 async function getTfxRunContext(argoWorkflowName: string): Promise<Context> {
-  // argoPodName has the general form "pipelineName-workflowId-executionId".
-  // All components of a pipeline within a single run will have the same
-  // "pipelineName-workflowId" prefix.
-  const pipelineName = argoWorkflowName
-    .split('-')
-    .slice(0, -1)
-    .join('_');
-  const runID = argoWorkflowName;
-  // An example run context name is parameterized_tfx_oss.parameterized-tfx-oss-4rq5v.
-  const tfxRunContextName = `${pipelineName}.${runID}`;
-  return await getContext({ name: tfxRunContextName, type: 'run' });
+  // Context: https://github.com/kubeflow/pipelines/issues/6138
+  // Require TFX version to be > 1.2.0.
+  return await getContext({ name: argoWorkflowName, type: 'pipeline_run' });
 }
 
 /**
diff --git a/frontend/src/pages/RunDetails.tsx b/frontend/src/pages/RunDetails.tsx
index 00a00bf5dd3..8427cf43fec 100644
--- a/frontend/src/pages/RunDetails.tsx
+++ b/frontend/src/pages/RunDetails.tsx
@@ -267,6 +267,7 @@ class RunDetails extends Page<RunDetailsInternalProps, RunDetailsState> {
       workflow,
       selectedNodeId,
     );
+    console.log('selectedNodeId ' + selectedNodeId);
     const selectedExecution = mlmdExecutions?.find(
       execution => ExecutionHelpers.getKfpPod(execution) === selectedNodeId,
     );