diff --git a/src/lib/components/event/event-detail-pills.svelte b/src/lib/components/event/event-detail-pills.svelte
deleted file mode 100644
index 988b25fbb..000000000
--- a/src/lib/components/event/event-detail-pills.svelte
+++ /dev/null
@@ -1,40 +0,0 @@
-<script lang="ts">
-  import { createEventDispatcher } from 'svelte';
-
-  import PillContainer from '$lib/holocene/pill-container/pill-container.svelte';
-  import Pill from '$lib/holocene/pill-container/pill.svelte';
-  import { translate } from '$lib/i18n/translate';
-  import type { AttributeGrouping } from '$lib/utilities/format-event-attributes';
-  import { attributeGroupingProperties } from '$lib/utilities/format-event-attributes';
-
-  export let attributeGrouping: AttributeGrouping;
-
-  const dispatch = createEventDispatcher();
-
-  $: pillCount = Object.values(attributeGrouping).reduce((count, value) => {
-    if (value.length) {
-      count += 1;
-    }
-    return count;
-  }, 0);
-</script>
-
-{#if pillCount > 1}
-  <div class="p-2 text-center xl:text-left">
-    <PillContainer>
-      {#each Object.entries(attributeGrouping) as [key, value] (key)}
-        {#if value.length}
-          <Pill id={key} onClick={() => dispatch('pillChange', { key })}
-            >{translate(attributeGroupingProperties[key].label)}</Pill
-          >
-        {/if}
-      {/each}
-    </PillContainer>
-  </div>
-{/if}
-
-<style lang="postcss">
-  .pill-container {
-    @apply surface-subtle inline-flex flex-col items-center justify-start gap-2 rounded-md px-2 py-2 md:flex-row md:rounded-full;
-  }
-</style>
diff --git a/src/lib/components/event/event-empty-row.svelte b/src/lib/components/event/event-empty-row.svelte
index 6dca4620c..2bced3ab2 100644
--- a/src/lib/components/event/event-empty-row.svelte
+++ b/src/lib/components/event/event-empty-row.svelte
@@ -13,9 +13,3 @@
 {:else}
   <EmptyState {title} {content} />
 {/if}
-
-<style lang="postcss">
-  .row {
-    @apply flex grow p-2 text-center text-sm;
-  }
-</style>
diff --git a/src/lib/components/event/event-summary-row.svelte b/src/lib/components/event/event-summary-row.svelte
index 3bbf9e47e..e0590a74f 100644
--- a/src/lib/components/event/event-summary-row.svelte
+++ b/src/lib/components/event/event-summary-row.svelte
@@ -136,7 +136,7 @@
     <div class="flex w-full items-center gap-2">
       <Icon name={icon} />
       <p
-        class="max-w-fit whitespace-nowrap pr-4 text-sm font-semibold md:text-base"
+        class="event-name max-w-fit whitespace-nowrap pr-4 text-sm font-semibold md:text-base"
       >
         {displayName}
       </p>
diff --git a/src/lib/components/lines-and-dots/svg/event-detail-row.svelte b/src/lib/components/lines-and-dots/svg/event-detail-row.svelte
deleted file mode 100644
index 5e4018bda..000000000
--- a/src/lib/components/lines-and-dots/svg/event-detail-row.svelte
+++ /dev/null
@@ -1,142 +0,0 @@
-<script lang="ts">
-  import Icon from '$lib/holocene/icon/icon.svelte';
-  import { translate } from '$lib/i18n/translate';
-  import type { EventGroup } from '$lib/models/event-groups/event-groups';
-  import { setActiveEvent } from '$lib/stores/active-events';
-  import { relativeTime, timeFormat } from '$lib/stores/time-format';
-  import type { WorkflowEvent } from '$lib/types/events';
-  import {
-    format,
-    spaceBetweenCapitalLetters,
-  } from '$lib/utilities/format-camel-case';
-  import { formatDate } from '$lib/utilities/format-date';
-  import { formatAttributes } from '$lib/utilities/format-event-attributes';
-
-  import {
-    DetailsConfig,
-    getEventDetailsBoxHeight,
-    staticCodeBlockHeight,
-  } from '../constants';
-
-  import Box from './box.svelte';
-  import GroupDetailsText from './group-details-text.svelte';
-  import Line from './line.svelte';
-  import Text from './text.svelte';
-
-  export let event: WorkflowEvent;
-  export let group: EventGroup | undefined = undefined;
-  export let index: number = 0;
-  export let x = 0;
-  export let y: number;
-  export let canvasWidth: number;
-  export let width: number;
-  export let active = false;
-
-  const { gutter, fontSizeRatio } = DetailsConfig;
-
-  $: attributes = formatAttributes(event);
-  $: codeBlockAttributes = Object.entries(attributes).filter(
-    ([, value]) => typeof value === 'object',
-  );
-  $: textAttributes = Object.entries(attributes).filter(
-    ([, value]) => typeof value !== 'object',
-  );
-
-  $: showTimestamp = canvasWidth > 800;
-  $: eventY =
-    index === 0
-      ? y
-      : index === 1
-      ? y + getEventDetailsBoxHeight(group.eventList[0], group.pendingActivity)
-      : y +
-        getEventDetailsBoxHeight(group.eventList[0], group.pendingActivity) +
-        getEventDetailsBoxHeight(group.eventList[1], group.pendingActivity);
-  $: textStartingY = eventY + 1.5 * fontSizeRatio;
-</script>
-
-{#if active && !group?.pendingActivity}
-  <foreignObject {x} y={y - 20} {width} height={fontSizeRatio}>
-    <button
-      class="flex items-center gap-0.5 rounded-t bg-white pl-1.5 pr-0.5 text-sm text-black"
-      on:click|stopPropagation={() => setActiveEvent(event, group)}
-    >
-      {translate('common.close')}<Icon name="close" />
-    </button>
-  </foreignObject>
-{/if}
-<Box
-  point={[x, eventY]}
-  {width}
-  height={1.25 * fontSizeRatio}
-  fill={active ? '#444CE7' : ''}
-/>
-<Line
-  startPoint={[x, eventY + 1.25 * fontSizeRatio]}
-  endPoint={[x + width, eventY + 1.25 * fontSizeRatio]}
-  strokeWidth={2}
-/>
-<foreignObject {x} y={eventY} {width} height={fontSizeRatio}>
-  <div class="flex items-center justify-between px-2 py-1 text-sm text-white">
-    <div class="flex items-center gap-2">
-      {event.id}
-      {spaceBetweenCapitalLetters(event?.name)}
-    </div>
-    {#if showTimestamp}
-      <div class="text-xs">
-        {formatDate(event?.eventTime, $timeFormat, {
-          relative: $relativeTime,
-        })}
-      </div>
-    {/if}
-  </div>
-</foreignObject>
-{#each textAttributes as [key, value], index (key)}
-  <foreignObject
-    x={x + gutter}
-    y={textStartingY + index * fontSizeRatio}
-    width={width - gutter}
-    height={fontSizeRatio}
-  >
-    <div
-      class="flex items-center gap-2 text-xs text-white md:text-sm"
-      style="height: {fontSizeRatio}px;"
-    >
-      <div class="font-medium leading-3 text-[#C9D9F0]">
-        {format(key)}
-      </div>
-      <div class="text-wrap break-all leading-3">
-        <GroupDetailsText {key} {value} {attributes} {width} />
-      </div>
-    </div>
-  </foreignObject>
-{/each}
-{#each codeBlockAttributes as [key, value], index (key)}
-  {@const blockX = x + gutter}
-  {@const blockY =
-    textStartingY +
-    (textAttributes.length + 1) * fontSizeRatio +
-    index * staticCodeBlockHeight}
-  <Text point={[blockX, blockY]} label>{format(key)}</Text>
-  <GroupDetailsText
-    point={[blockX, blockY + 1.5 * fontSizeRatio]}
-    {key}
-    {value}
-    {attributes}
-    width={width - 2 * gutter}
-  />
-{/each}
-<Line
-  startPoint={[x - 1, eventY]}
-  endPoint={[x + width, eventY]}
-  strokeWidth={2}
-/>
-<Line
-  startPoint={[x, eventY + getEventDetailsBoxHeight(event)]}
-  endPoint={[x + width, eventY + getEventDetailsBoxHeight(event)]}
-  strokeWidth={2}
-/>
-<Line
-  startPoint={[x, eventY]}
-  endPoint={[x, eventY + getEventDetailsBoxHeight(event)]}
-  strokeWidth={2}
-/>
diff --git a/src/lib/components/lines-and-dots/svg/event-details-row.svelte b/src/lib/components/lines-and-dots/svg/event-details-row.svelte
deleted file mode 100644
index f2b9dab3f..000000000
--- a/src/lib/components/lines-and-dots/svg/event-details-row.svelte
+++ /dev/null
@@ -1,73 +0,0 @@
-<script lang="ts">
-  import type { EventGroup } from '$lib/models/event-groups/event-groups';
-  import type { WorkflowEvent } from '$lib/types/events';
-  import { isAssociatedPendingActivity } from '$lib/utilities/pending-activities';
-
-  import {
-    getEventDetailsBoxHeight,
-    getPendingEventDetailHeight,
-  } from '../constants';
-
-  import Box from './box.svelte';
-  import EventDetailRow from './event-detail-row.svelte';
-  import PendingDetailRow from './pending-detail-row.svelte';
-
-  export let event: WorkflowEvent;
-  export let group: EventGroup;
-  export let canvasWidth: number;
-  export let x = 0;
-  export let y: number;
-  export let width: number;
-  export let primary = true;
-
-  $: boxHeight = group
-    ? group.eventList.reduce(
-        (sum, event) =>
-          (sum += getEventDetailsBoxHeight(event, group.pendingActivity)),
-        0,
-      )
-    : getEventDetailsBoxHeight(event);
-</script>
-
-<g
-  role="button"
-  tabindex="0"
-  class="relative cursor-pointer {!primary && 'brightness-50'}"
->
-  <Box point={[x, y]} {width} height={boxHeight} classification="active" />
-  {#if group}
-    {#if group.pendingActivity}
-      <PendingDetailRow
-        event={group.pendingActivity}
-        {group}
-        {width}
-        {x}
-        {y}
-        active={isAssociatedPendingActivity(event, group.pendingActivity)}
-      />
-    {/if}
-    {#each group.eventList as e, index}
-      <EventDetailRow
-        event={e}
-        {group}
-        {index}
-        {canvasWidth}
-        {width}
-        {x}
-        y={group.pendingActivity
-          ? y + getPendingEventDetailHeight(group.pendingActivity)
-          : y}
-        active={event.id === e.id}
-      />
-    {/each}
-  {:else}
-    <EventDetailRow active {event} {canvasWidth} {width} {x} {y} />
-  {/if}
-</g>
-
-<style lang="postcss">
-  g {
-    pointer-events: bounding-box;
-    outline: none;
-  }
-</style>
diff --git a/src/lib/components/lines-and-dots/svg/history-graph-row.svelte b/src/lib/components/lines-and-dots/svg/history-graph-row.svelte
deleted file mode 100644
index fd47acc86..000000000
--- a/src/lib/components/lines-and-dots/svg/history-graph-row.svelte
+++ /dev/null
@@ -1,90 +0,0 @@
-<script lang="ts">
-  import Icon from '$lib/holocene/icon/icon.svelte';
-  import type { EventGroup } from '$lib/models/event-groups/event-groups';
-  import { setActiveEvent } from '$lib/stores/active-events';
-  import { relativeTime, timeFormat } from '$lib/stores/time-format';
-  import type { WorkflowEvent } from '$lib/types/events';
-  import { spaceBetweenCapitalLetters } from '$lib/utilities/format-camel-case';
-  import { formatDate } from '$lib/utilities/format-date';
-  import { isLocalActivityMarkerEvent } from '$lib/utilities/is-event-type';
-
-  import { CategoryIcon, getCategoryColor, HistoryConfig } from '../constants';
-
-  import Box from './box.svelte';
-
-  export let event: WorkflowEvent;
-  export let group: EventGroup;
-  export let activeEvents: string[] = [];
-
-  export let canvasWidth: number;
-  export let visualWidth: number;
-  export let index: number;
-
-  const { height, radius } = HistoryConfig;
-
-  $: y = index * height + height / 2;
-  $: isActiveEvent = activeEvents.includes(event.id);
-  $: showTimestamp = canvasWidth > 1200;
-  $: showDetails = canvasWidth > 800;
-  $: classification = group?.pendingActivity
-    ? group.pendingActivity.attempt > 1
-      ? 'retry'
-      : 'pending'
-    : event.classification;
-  $: detailsWidth = canvasWidth - visualWidth;
-  $: icon = isLocalActivityMarkerEvent(event)
-    ? CategoryIcon['local-activity']
-    : CategoryIcon[event.category];
-</script>
-
-<g
-  role="button"
-  tabindex="0"
-  on:click|preventDefault={() => setActiveEvent(event, group)}
-  on:keypress={() => setActiveEvent(event, group)}
-  class="relative cursor-pointer"
->
-  <Box
-    point={[visualWidth + 2, y - height / 2]}
-    width={detailsWidth}
-    {height}
-    {classification}
-    fill={isActiveEvent ? '#444CE7' : index % 2 === 1 && '#1E293B'}
-  />
-  <foreignObject
-    x={visualWidth + 2 * radius}
-    y={y - height / 2}
-    width={detailsWidth}
-    {height}
-  >
-    <div
-      class="flex items-center justify-between px-2 text-sm text-white"
-      style="height: {height}px;"
-    >
-      <div class="flex gap-4">
-        {event.id}
-        <div class="flex items-center gap-1">
-          <Icon name={icon} class="text-white" />
-          {spaceBetweenCapitalLetters(event?.name)}
-          {#if group && group.displayName && showDetails}<span
-              style="color: {getCategoryColor(group.category)}"
-              >{group.displayName}</span
-            >{/if}
-        </div>
-      </div>
-      {#if showTimestamp}
-        <span class="px-3 text-xs text-slate-100"
-          >{formatDate(event?.eventTime, $timeFormat, {
-            relative: $relativeTime,
-          })}</span
-        >
-      {/if}
-    </div>
-  </foreignObject>
-</g>
-
-<style lang="postcss">
-  g {
-    outline: none;
-  }
-</style>
diff --git a/src/lib/components/lines-and-dots/svg/history-row-payload-detail.svelte b/src/lib/components/lines-and-dots/svg/history-row-payload-detail.svelte
deleted file mode 100644
index 71290b93e..000000000
--- a/src/lib/components/lines-and-dots/svg/history-row-payload-detail.svelte
+++ /dev/null
@@ -1,37 +0,0 @@
-<script lang="ts">
-  import PayloadDecoder from '$lib/components/event/payload-decoder.svelte';
-  import type { Payloads } from '$lib/types';
-  import { getCodeBlockValue } from '$lib/utilities/get-single-attribute-for-event';
-
-  export let key: string;
-  export let value: string | Record<string, unknown> | Payloads;
-
-  $: codeBlockValue = getCodeBlockValue(value);
-  // $: stackTrace = getStackTrace(codeBlockValue);
-</script>
-
-{#if typeof value === 'object'}
-  {#if value?.payloads}
-    <PayloadDecoder {value} key="payloads" let:decodedValue>
-      {#key decodedValue}
-        {decodedValue.slice(1, 20)}
-      {/key}
-    </PayloadDecoder>
-  {:else if key === 'searchAttributes'}
-    <PayloadDecoder
-      key="searchAttributes"
-      value={{ searchAttributes: codeBlockValue }}
-      let:decodedValue
-    >
-      {#key decodedValue}
-        {decodedValue.slice(1, 20)}
-      {/key}
-    </PayloadDecoder>
-  {:else}
-    <PayloadDecoder value={codeBlockValue} let:decodedValue>
-      {#key decodedValue}
-        {decodedValue.slice(1, 20)}
-      {/key}
-    </PayloadDecoder>
-  {/if}
-{/if}
diff --git a/src/lib/models/__snapshots__/workflow-execution.test.ts.snap b/src/lib/models/__snapshots__/workflow-execution.test.ts.snap
index 983253c55..5a6883206 100644
--- a/src/lib/models/__snapshots__/workflow-execution.test.ts.snap
+++ b/src/lib/models/__snapshots__/workflow-execution.test.ts.snap
@@ -25,6 +25,7 @@ exports[`toWorkflowExecution > should match the snapshot for Canceled workflows
   "pendingActivities": [],
   "pendingChildren": [],
   "pendingNexusOperations": [],
+  "pendingWorkflowTask": null,
   "runId": "346e7a24-c660-4f91-a777-ffe3274d8144",
   "searchAttributes": {
     "indexedFields": {
@@ -70,6 +71,7 @@ exports[`toWorkflowExecution > should match the snapshot for Completed workflows
   "pendingActivities": [],
   "pendingChildren": [],
   "pendingNexusOperations": [],
+  "pendingWorkflowTask": null,
   "runId": "202dcff6-7f35-4c65-995c-bcadce524fb1",
   "searchAttributes": {
     "indexedFields": {
@@ -112,6 +114,7 @@ exports[`toWorkflowExecution > should match the snapshot for Failed workflows 1`
   "pendingActivities": [],
   "pendingChildren": [],
   "pendingNexusOperations": [],
+  "pendingWorkflowTask": null,
   "runId": "7e00b341-c579-4bb5-9e28-810d34ef4329",
   "searchAttributes": {
     "indexedFields": {
@@ -179,6 +182,7 @@ exports[`toWorkflowExecution > should match the snapshot for Running workflows 1
   ],
   "pendingChildren": [],
   "pendingNexusOperations": [],
+  "pendingWorkflowTask": null,
   "runId": "2a7ba421-f74b-4b8b-b9d8-e6e30e4caac7",
   "searchAttributes": {
     "indexedFields": {
@@ -255,6 +259,7 @@ exports[`toWorkflowExecution > should match the snapshot for Terminated workflow
   ],
   "pendingChildren": [],
   "pendingNexusOperations": [],
+  "pendingWorkflowTask": null,
   "runId": "16c5fbe5-f82d-43c1-acbc-18c65c449ace",
   "searchAttributes": {
     "indexedFields": {
@@ -300,6 +305,13 @@ exports[`toWorkflowExecution > should match the snapshot for TimedOut workflows
   "pendingActivities": [],
   "pendingChildren": [],
   "pendingNexusOperations": [],
+  "pendingWorkflowTask": {
+    "attempt": 1,
+    "originalScheduledTime": "2022-07-01T14:00:34.963148219Z",
+    "scheduledTime": "2022-07-01T14:00:34.963148844Z",
+    "startedTime": null,
+    "state": "Scheduled",
+  },
   "runId": "445a17cb-6cb4-4508-bc59-187d08c6c6e2",
   "searchAttributes": {
     "indexedFields": {
@@ -343,6 +355,7 @@ exports[`toWorkflowExecutions > should match the snapshot 1`] = `
     "pendingActivities": [],
     "pendingChildren": [],
     "pendingNexusOperations": [],
+    "pendingWorkflowTask": undefined,
     "runId": "346e7a24-c660-4f91-a777-ffe3274d8144",
     "searchAttributes": {
       "indexedFields": {
@@ -382,6 +395,7 @@ exports[`toWorkflowExecutions > should match the snapshot 1`] = `
     "pendingActivities": [],
     "pendingChildren": [],
     "pendingNexusOperations": [],
+    "pendingWorkflowTask": undefined,
     "runId": "202dcff6-7f35-4c65-995c-bcadce524fb1",
     "searchAttributes": {
       "indexedFields": {
@@ -421,6 +435,7 @@ exports[`toWorkflowExecutions > should match the snapshot 1`] = `
     "pendingActivities": [],
     "pendingChildren": [],
     "pendingNexusOperations": [],
+    "pendingWorkflowTask": undefined,
     "runId": "7e00b341-c579-4bb5-9e28-810d34ef4329",
     "searchAttributes": {
       "indexedFields": {
@@ -456,6 +471,7 @@ exports[`toWorkflowExecutions > should match the snapshot 1`] = `
     "pendingActivities": [],
     "pendingChildren": [],
     "pendingNexusOperations": [],
+    "pendingWorkflowTask": undefined,
     "runId": "2a7ba421-f74b-4b8b-b9d8-e6e30e4caac7",
     "searchAttributes": {
       "indexedFields": {
@@ -495,6 +511,7 @@ exports[`toWorkflowExecutions > should match the snapshot 1`] = `
     "pendingActivities": [],
     "pendingChildren": [],
     "pendingNexusOperations": [],
+    "pendingWorkflowTask": undefined,
     "runId": "dfd4039d-4bc0-4864-9a24-85d136814977",
     "searchAttributes": {
       "indexedFields": {
@@ -534,6 +551,7 @@ exports[`toWorkflowExecutions > should match the snapshot 1`] = `
     "pendingActivities": [],
     "pendingChildren": [],
     "pendingNexusOperations": [],
+    "pendingWorkflowTask": undefined,
     "runId": "16c5fbe5-f82d-43c1-acbc-18c65c449ace",
     "searchAttributes": {
       "indexedFields": {
@@ -573,6 +591,7 @@ exports[`toWorkflowExecutions > should match the snapshot 1`] = `
     "pendingActivities": [],
     "pendingChildren": [],
     "pendingNexusOperations": [],
+    "pendingWorkflowTask": undefined,
     "runId": "445a17cb-6cb4-4508-bc59-187d08c6c6e2",
     "searchAttributes": {
       "indexedFields": {
diff --git a/src/lib/models/__snapshots__/workflow-execution.write-disabled.test.ts.snap b/src/lib/models/__snapshots__/workflow-execution.write-disabled.test.ts.snap
index bf3942470..0ce90f6b5 100644
--- a/src/lib/models/__snapshots__/workflow-execution.write-disabled.test.ts.snap
+++ b/src/lib/models/__snapshots__/workflow-execution.write-disabled.test.ts.snap
@@ -25,6 +25,7 @@ exports[`toWorkflowExecution > should match the snapshot for Canceled workflows
   "pendingActivities": [],
   "pendingChildren": [],
   "pendingNexusOperations": [],
+  "pendingWorkflowTask": null,
   "runId": "346e7a24-c660-4f91-a777-ffe3274d8144",
   "searchAttributes": {
     "indexedFields": {
@@ -70,6 +71,7 @@ exports[`toWorkflowExecution > should match the snapshot for Completed workflows
   "pendingActivities": [],
   "pendingChildren": [],
   "pendingNexusOperations": [],
+  "pendingWorkflowTask": null,
   "runId": "202dcff6-7f35-4c65-995c-bcadce524fb1",
   "searchAttributes": {
     "indexedFields": {
@@ -112,6 +114,7 @@ exports[`toWorkflowExecution > should match the snapshot for Failed workflows 1`
   "pendingActivities": [],
   "pendingChildren": [],
   "pendingNexusOperations": [],
+  "pendingWorkflowTask": null,
   "runId": "7e00b341-c579-4bb5-9e28-810d34ef4329",
   "searchAttributes": {
     "indexedFields": {
@@ -179,6 +182,7 @@ exports[`toWorkflowExecution > should match the snapshot for Running workflows 1
   ],
   "pendingChildren": [],
   "pendingNexusOperations": [],
+  "pendingWorkflowTask": null,
   "runId": "2a7ba421-f74b-4b8b-b9d8-e6e30e4caac7",
   "searchAttributes": {
     "indexedFields": {
@@ -255,6 +259,7 @@ exports[`toWorkflowExecution > should match the snapshot for Terminated workflow
   ],
   "pendingChildren": [],
   "pendingNexusOperations": [],
+  "pendingWorkflowTask": null,
   "runId": "16c5fbe5-f82d-43c1-acbc-18c65c449ace",
   "searchAttributes": {
     "indexedFields": {
@@ -300,6 +305,13 @@ exports[`toWorkflowExecution > should match the snapshot for TimedOut workflows
   "pendingActivities": [],
   "pendingChildren": [],
   "pendingNexusOperations": [],
+  "pendingWorkflowTask": {
+    "attempt": 1,
+    "originalScheduledTime": "2022-07-01T14:00:34.963148219Z",
+    "scheduledTime": "2022-07-01T14:00:34.963148844Z",
+    "startedTime": null,
+    "state": "Scheduled",
+  },
   "runId": "445a17cb-6cb4-4508-bc59-187d08c6c6e2",
   "searchAttributes": {
     "indexedFields": {
@@ -343,6 +355,7 @@ exports[`toWorkflowExecutions > should match the snapshot 1`] = `
     "pendingActivities": [],
     "pendingChildren": [],
     "pendingNexusOperations": [],
+    "pendingWorkflowTask": undefined,
     "runId": "346e7a24-c660-4f91-a777-ffe3274d8144",
     "searchAttributes": {
       "indexedFields": {
@@ -382,6 +395,7 @@ exports[`toWorkflowExecutions > should match the snapshot 1`] = `
     "pendingActivities": [],
     "pendingChildren": [],
     "pendingNexusOperations": [],
+    "pendingWorkflowTask": undefined,
     "runId": "202dcff6-7f35-4c65-995c-bcadce524fb1",
     "searchAttributes": {
       "indexedFields": {
@@ -421,6 +435,7 @@ exports[`toWorkflowExecutions > should match the snapshot 1`] = `
     "pendingActivities": [],
     "pendingChildren": [],
     "pendingNexusOperations": [],
+    "pendingWorkflowTask": undefined,
     "runId": "7e00b341-c579-4bb5-9e28-810d34ef4329",
     "searchAttributes": {
       "indexedFields": {
@@ -456,6 +471,7 @@ exports[`toWorkflowExecutions > should match the snapshot 1`] = `
     "pendingActivities": [],
     "pendingChildren": [],
     "pendingNexusOperations": [],
+    "pendingWorkflowTask": undefined,
     "runId": "2a7ba421-f74b-4b8b-b9d8-e6e30e4caac7",
     "searchAttributes": {
       "indexedFields": {
@@ -495,6 +511,7 @@ exports[`toWorkflowExecutions > should match the snapshot 1`] = `
     "pendingActivities": [],
     "pendingChildren": [],
     "pendingNexusOperations": [],
+    "pendingWorkflowTask": undefined,
     "runId": "dfd4039d-4bc0-4864-9a24-85d136814977",
     "searchAttributes": {
       "indexedFields": {
@@ -534,6 +551,7 @@ exports[`toWorkflowExecutions > should match the snapshot 1`] = `
     "pendingActivities": [],
     "pendingChildren": [],
     "pendingNexusOperations": [],
+    "pendingWorkflowTask": undefined,
     "runId": "16c5fbe5-f82d-43c1-acbc-18c65c449ace",
     "searchAttributes": {
       "indexedFields": {
@@ -573,6 +591,7 @@ exports[`toWorkflowExecutions > should match the snapshot 1`] = `
     "pendingActivities": [],
     "pendingChildren": [],
     "pendingNexusOperations": [],
+    "pendingWorkflowTask": undefined,
     "runId": "445a17cb-6cb4-4508-bc59-187d08c6c6e2",
     "searchAttributes": {
       "indexedFields": {
diff --git a/src/lib/models/event-groups/group-events.test.ts b/src/lib/models/event-groups/group-events.test.ts
index 48fd701b3..f5829ecc9 100644
--- a/src/lib/models/event-groups/group-events.test.ts
+++ b/src/lib/models/event-groups/group-events.test.ts
@@ -261,6 +261,7 @@ describe('getEventGroupDisplayName', () => {
     };
 
     const localActivityEvent = {
+      eventType: 'MarkerRecorded',
       markerRecordedEventAttributes: {
         markerName: 'core_local_activity',
         details: {
diff --git a/src/lib/utilities/get-single-attribute-for-event.test.ts b/src/lib/utilities/get-single-attribute-for-event.test.ts
index be7dd24b1..5e8ff5fe9 100644
--- a/src/lib/utilities/get-single-attribute-for-event.test.ts
+++ b/src/lib/utilities/get-single-attribute-for-event.test.ts
@@ -128,29 +128,32 @@ describe('getPrimaryAttributeForEvent', () => {
     });
   });
 
-  it('should return "taskqueue.name" if the workflow type does not exists', async () => {
+  it('should return "input" if the workflow type does not exists', async () => {
     const event = { ...workflowEvent };
     event.attributes.workflowType = null;
     expect(await getPrimaryAttributeForEvent(event)).toStrictEqual({
-      key: 'taskQueueName',
-      value: 'rainbow-statuses',
+      key: 'input',
+      value: {
+        payloads: [
+          {
+            At: '2022-04-04T11:50:28.151785-05:00',
+            Hey: 'from Mars',
+          },
+        ],
+      },
     });
   });
 
-  it('should return "parentInitiatedEventId" if the workflow type and task queue does not exist', async () => {
+  it('should return "taskQueue" if the workflow type and input does not exist', async () => {
     const event = { ...workflowEvent };
     event.attributes.workflowType = null as unknown as {
       name: string;
     };
-
-    event.attributes.taskQueue = null as unknown as {
-      name: string;
-      kind: string;
-    };
+    event.attributes.input = null;
 
     expect(await getPrimaryAttributeForEvent(event)).toStrictEqual({
-      key: 'parentInitiatedEventId',
-      value: '0',
+      key: 'taskQueueName',
+      value: 'rainbow-statuses',
     });
   });
 
diff --git a/src/lib/utilities/get-single-attribute-for-event.ts b/src/lib/utilities/get-single-attribute-for-event.ts
index 4d3a93352..7544f4a17 100644
--- a/src/lib/utilities/get-single-attribute-for-event.ts
+++ b/src/lib/utilities/get-single-attribute-for-event.ts
@@ -212,7 +212,7 @@ const preferredSummaryKeys = [
   'input',
   'outcome',
   'workflowExecution',
-  'taskQueueName',
+  'taskQueue',
   'startToFireTimeout',
   'identity',
   'parentInitiatedEventId',
diff --git a/tests/integration/workflow-event-history.spec.ts b/tests/integration/workflow-event-history.spec.ts
index 62962dffa..90e55834e 100644
--- a/tests/integration/workflow-event-history.spec.ts
+++ b/tests/integration/workflow-event-history.spec.ts
@@ -95,32 +95,4 @@ test.describe('Workflow History', () => {
     await expect(page.getByTestId('json')).toBeVisible();
     await expect(page.getByTestId('event-summary-table')).toBeVisible();
   });
-
-  test('Workflow Execution shows WorkflowId and all sections and event history with Labs Mode on', async ({
-    page,
-  }) => {
-    await mockWorkflowApis(page);
-    await expect(page.getByTestId('workflow-id-heading')).toHaveText(
-      '09db15_Running Click to copy content',
-    );
-
-    await expect(page.getByTestId('labs-mode-button')).toBeVisible();
-    await page.getByTestId('labs-mode-button').click();
-
-    await expect(page.getByTestId('history-tab')).toBeVisible();
-    await expect(page.getByTestId('workers-tab')).toBeVisible();
-    await expect(page.getByTestId('relationships-tab')).toBeVisible();
-    await expect(page.getByTestId('pending-activities-tab')).toBeHidden();
-    await expect(page.getByTestId('call-stack-tab')).toBeVisible();
-    await expect(page.getByTestId('queries-tab')).toBeVisible();
-    await expect(page.getByTestId('summary-accordion')).toBeHidden();
-    await expect(page.getByTestId('pending-activities')).toBeHidden();
-    await expect(page.getByTestId('input-and-results')).toBeHidden();
-    await expect(page.getByTestId('timeline-accordion')).toBeHidden();
-    await expect(page.getByTestId('feed')).toBeVisible();
-    await expect(page.getByTestId('timeline')).toBeVisible();
-    await expect(page.getByTestId('compact')).toBeVisible();
-    await expect(page.getByTestId('json')).toBeHidden();
-    await expect(page.getByTestId('event-summary-table')).toBeHidden();
-  });
 });