diff --git a/common/constants/trace_analytics.ts b/common/constants/trace_analytics.ts
index bbf9a2c7d..def586916 100644
--- a/common/constants/trace_analytics.ts
+++ b/common/constants/trace_analytics.ts
@@ -24,3 +24,35 @@ export const TRACE_ANALYTICS_DSL_ROUTE = '/api/observability/trace_analytics/que
 
 export const TRACE_CUSTOM_SPAN_INDEX_SETTING = 'observability:traceAnalyticsSpanIndices';
 export const TRACE_CUSTOM_SERVICE_INDEX_SETTING = 'observability:traceAnalyticsServiceIndices';
+
+export enum TRACE_TABLE_TITLES {
+  all_spans = 'Spans',
+  trace_root_spans = 'Trace root spans',
+  service_entry_spans = 'Service entry spans',
+  traces = 'Traces',
+}
+
+export const TRACE_TABLE_OPTIONS = [
+  {
+    label: TRACE_TABLE_TITLES.all_spans,
+    key: 'all_spans',
+    'aria-describedby': 'All spans from all traces',
+  },
+  {
+    label: TRACE_TABLE_TITLES.trace_root_spans,
+    key: 'trace_root_spans',
+    'aria-describedby': 'The root spans which represent the starting point of a trace',
+  },
+  {
+    label: TRACE_TABLE_TITLES.service_entry_spans,
+    key: 'service_entry_spans',
+    'aria-describedby': 'The spans that mark start of server-side processing (SPAN_KIND_SERVER)',
+  },
+  {
+    label: TRACE_TABLE_TITLES.traces,
+    key: 'traces',
+    'aria-describedby': 'Aggregates all spans by traceId to show all traces',
+  },
+];
+
+export const TRACE_TABLE_TYPE_KEY = 'TraceAnalyticsTraceTableType';
diff --git a/common/types/trace_analytics.ts b/common/types/trace_analytics.ts
index 91fbcac41..6219520f9 100644
--- a/common/types/trace_analytics.ts
+++ b/common/types/trace_analytics.ts
@@ -54,3 +54,4 @@ export interface GraphVisEdge {
 }
 
 export type TraceAnalyticsMode = 'jaeger' | 'data_prepper' | 'custom_data_prepper';
+export type TraceQueryMode = 'trace_root_spans' | 'all_spans' | 'traces' | 'service_entry_spans';
diff --git a/public/components/application_analytics/components/application.tsx b/public/components/application_analytics/components/application.tsx
index ca40bf50c..140c15693 100644
--- a/public/components/application_analytics/components/application.tsx
+++ b/public/components/application_analytics/components/application.tsx
@@ -326,6 +326,9 @@ export function Application(props: AppDetailProps) {
           setStartTime={setStartTimeForApp}
           setEndTime={setEndTimeForApp}
           dataSourceMDSId={[{ id: '', label: '' }]}
+          setCurrentSelectedService={() => {}}
+          tracesTableMode="traces"
+          setTracesTableMode={() => {}}
         />
         <EuiPanel>
           <PanelTitle title="Spans" totalItems={totalSpans} />
diff --git a/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap
index ee51138f0..bbbaeb6cf 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap
@@ -907,10 +907,10 @@ exports[`Added Integration View Test Renders added integration view using dummy
                     </EuiFlexGroup>
                   </EuiSearchBar>
                   <EuiSpacer
-                    size="l"
+                    size="m"
                   >
                     <div
-                      className="euiSpacer euiSpacer--l"
+                      className="euiSpacer euiSpacer--m"
                     />
                   </EuiSpacer>
                   <EuiBasicTable
diff --git a/public/components/trace_analytics/components/traces/trace_table_helpers.tsx b/public/components/trace_analytics/components/traces/trace_table_helpers.tsx
new file mode 100644
index 000000000..2ff58d50d
--- /dev/null
+++ b/public/components/trace_analytics/components/traces/trace_table_helpers.tsx
@@ -0,0 +1,248 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  EuiButtonIcon,
+  EuiCopy,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiLink,
+  EuiTableFieldDataColumnType,
+  EuiText,
+  EuiToolTip,
+} from '@elastic/eui';
+import { round } from 'lodash';
+import moment from 'moment';
+import React from 'react';
+import { TRACE_ANALYTICS_DATE_FORMAT } from '../../../../../common/constants/trace_analytics';
+import { TraceAnalyticsMode, TraceQueryMode } from '../../../../../common/types/trace_analytics';
+import { nanoToMilliSec } from '../common/helper_functions';
+
+export const fetchDynamicColumns = (columnItems: string[]) => {
+  return columnItems
+    .filter((col) => col.includes('attributes') || col.includes('instrumentation'))
+    .map((col) => ({
+      className: 'attributes-column',
+      field: col,
+      name: (
+        <EuiText className="euiTableCellContent">
+          <EuiToolTip content={col}>
+            <p className="euiTableCellContent__text attributes-column-header">{col}</p>
+          </EuiToolTip>
+        </EuiText>
+      ),
+      align: 'right',
+      sortable: true,
+      truncateText: true,
+      render: (item) =>
+        item ? (
+          <EuiText>
+            <EuiToolTip content={item}>
+              <EuiText size="s" className="attributes-column" title={item}>
+                {item}
+              </EuiText>
+            </EuiToolTip>
+          </EuiText>
+        ) : (
+          '-'
+        ),
+    }));
+};
+
+export const getTableColumns = (
+  showAttributes: boolean,
+  columnItems: string[],
+  mode: TraceAnalyticsMode,
+  tracesTableMode: TraceQueryMode,
+  getTraceViewUri?: (traceId: string) => string,
+  openTraceFlyout?: (traceId: string) => void
+): Array<EuiTableFieldDataColumnType<any>> => {
+  // Helper functions for rendering table fields
+  const renderIdField = (item: string) =>
+    item ? (
+      <EuiText>
+        <EuiToolTip content={item}>
+          <EuiText size="s" className="traces-table traces-table-trace-id" title={item}>
+            {item}
+          </EuiText>
+        </EuiToolTip>
+      </EuiText>
+    ) : (
+      '-'
+    );
+
+  const renderTraceLinkField = (item: string) => (
+    <EuiFlexGroup gutterSize="s" alignItems="center">
+      <EuiFlexItem grow={false}>
+        <EuiLink
+          data-test-subj="trace-link"
+          {...(getTraceViewUri && { href: getTraceViewUri(item) })}
+          {...(openTraceFlyout && { onClick: () => openTraceFlyout(item) })}
+        >
+          <EuiText size="s" className="traces-table traces-table-trace-id" title={item}>
+            {item}
+          </EuiText>
+        </EuiLink>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiCopy textToCopy={item}>
+          {(copy) => (
+            <EuiButtonIcon aria-label="Copy trace id" iconType="copyClipboard" onClick={copy} />
+          )}
+        </EuiCopy>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+
+  const renderErrorsField = (item: number) =>
+    item == null ? (
+      '-'
+    ) : +item > 0 ? (
+      <EuiText color="danger" size="s">
+        Yes
+      </EuiText>
+    ) : (
+      'No'
+    );
+
+  const renderDurationField = (item: number) =>
+    item ? <EuiText size="s">{round(nanoToMilliSec(Math.max(0, item)), 2)}</EuiText> : '-';
+
+  const renderDateField = (item: number) =>
+    item === 0 || item ? moment(item).format(TRACE_ANALYTICS_DATE_FORMAT) : '-';
+
+  // Columns for custom_data_prepper mode
+  if (mode === 'custom_data_prepper' && tracesTableMode !== 'traces') {
+    return [
+      {
+        field: 'spanId',
+        name: 'Span Id',
+        align: 'left',
+        sortable: true,
+        render: renderIdField,
+        className: 'span-group-column',
+      },
+      {
+        field: 'traceId',
+        name: 'Trace Id',
+        align: 'left',
+        sortable: true,
+        render: renderTraceLinkField,
+      },
+      {
+        field: 'parentSpanId',
+        name: 'Parent Span Id',
+        align: 'left',
+        sortable: true,
+        render: renderIdField,
+        className: 'span-group-column',
+      },
+      {
+        field: 'traceGroup',
+        name: 'Trace group',
+        align: 'left',
+        sortable: true,
+        truncateText: true,
+      },
+      {
+        field: 'durationInNanos',
+        name: 'Duration (ms)',
+        align: 'right',
+        sortable: true,
+        render: renderDurationField,
+      },
+      {
+        field: 'status.code',
+        name: 'Errors',
+        align: 'right',
+        sortable: true,
+        render: renderErrorsField,
+      },
+      {
+        field: 'endTime',
+        name: 'Last updated',
+        align: 'right',
+        sortable: true,
+        render: renderDateField,
+        className: 'span-group-column',
+      },
+      ...(showAttributes ? fetchDynamicColumns(columnItems) : []),
+    ] as Array<EuiTableFieldDataColumnType<any>>;
+  }
+
+  // Columns for non-jaeger traces mode
+  if (mode !== 'jaeger' && tracesTableMode === 'traces') {
+    return [
+      {
+        field: 'trace_id',
+        name: 'Trace ID',
+        align: 'left',
+        sortable: true,
+        render: renderTraceLinkField,
+      },
+      {
+        field: 'trace_group',
+        name: 'Trace group',
+        align: 'left',
+        sortable: true,
+        truncateText: true,
+      },
+      {
+        field: 'latency',
+        name: 'Duration (ms)',
+        align: 'right',
+        sortable: true,
+        truncateText: true,
+      },
+      {
+        field: 'percentile_in_trace_group',
+        name: 'Percentile in trace group',
+        align: 'right',
+        sortable: true,
+        render: (item) => (item ? `${round(item, 2)}th` : '-'),
+      },
+      {
+        field: 'error_count',
+        name: 'Errors',
+        align: 'right',
+        sortable: true,
+        render: renderErrorsField,
+      },
+      {
+        field: 'last_updated',
+        name: 'Last updated',
+        align: 'left',
+        sortable: true,
+        className: 'span-group-column',
+      },
+    ] as Array<EuiTableFieldDataColumnType<any>>;
+  }
+
+  // Default columns for other modes
+  return [
+    {
+      field: 'trace_id',
+      name: 'Trace ID',
+      align: 'left',
+      sortable: true,
+      render: renderTraceLinkField,
+    },
+    { field: 'latency', name: 'Latency (ms)', align: 'right', sortable: true },
+    {
+      field: 'error_count',
+      name: 'Errors',
+      align: 'right',
+      sortable: true,
+      render: renderErrorsField,
+    },
+    {
+      field: 'last_updated',
+      name: 'Last updated',
+      align: 'left',
+      sortable: true,
+      className: 'span-group-column',
+    },
+  ] as Array<EuiTableFieldDataColumnType<any>>;
+};
diff --git a/public/components/trace_analytics/components/traces/traces.tsx b/public/components/trace_analytics/components/traces/traces.tsx
index eacfb050f..baa725f8b 100644
--- a/public/components/trace_analytics/components/traces/traces.tsx
+++ b/public/components/trace_analytics/components/traces/traces.tsx
@@ -7,6 +7,7 @@ import { EuiBreadcrumb } from '@elastic/eui';
 import { Toast } from '@elastic/eui/src/components/toast/global_toast_list';
 import React from 'react';
 import { DataSourceOption } from '../../../../../../../src/plugins/data_source_management/public/components/data_source_menu/types';
+import { TraceQueryMode } from '../../../../../common/types/trace_analytics';
 import { TraceAnalyticsComponentDeps } from '../../home';
 import { TracesContent } from './traces_content';
 
@@ -18,6 +19,8 @@ export interface TracesProps extends TraceAnalyticsComponentDeps {
   openTraceFlyout?: (traceId: string) => void;
   toasts: Toast[];
   dataSourceMDSId: DataSourceOption[];
+  tracesTableMode: TraceQueryMode;
+  setTracesTableMode: React.Dispatch<React.SetStateAction<TraceQueryMode>>;
 }
 
 export function Traces(props: TracesProps) {
diff --git a/public/components/trace_analytics/components/traces/traces_content.tsx b/public/components/trace_analytics/components/traces/traces_content.tsx
index 4ed479870..828c70058 100644
--- a/public/components/trace_analytics/components/traces/traces_content.tsx
+++ b/public/components/trace_analytics/components/traces/traces_content.tsx
@@ -4,6 +4,7 @@
  */
 /* eslint-disable react-hooks/exhaustive-deps */
 
+import datemath from '@elastic/datemath';
 import {
   EuiAccordion,
   EuiFlexGroup,
@@ -56,6 +57,8 @@ export function TracesContent(props: TracesProps) {
     jaegerIndicesExist,
     attributesFilterFields,
     setCurrentSelectedService,
+    tracesTableMode,
+    setTracesTableMode,
   } = props;
   const [tableItems, setTableItems] = useState([]);
   const [columns, setColumns] = useState([]);
@@ -109,6 +112,7 @@ export function TracesContent(props: TracesProps) {
     jaegerIndicesExist,
     dataPrepperIndicesExist,
     includeMetrics,
+    tracesTableMode,
   ]);
 
   const onToggle = (isOpen: boolean) => {
@@ -151,6 +155,7 @@ export function TracesContent(props: TracesProps) {
       processTimeStamp(endTime, mode),
       page
     );
+    const isUnderOneHour = datemath.parse(endTime)?.diff(datemath.parse(startTime), 'hours')! < 1;
 
     if (mode === 'custom_data_prepper') {
       // service map should not be filtered by service name
@@ -159,16 +164,32 @@ export function TracesContent(props: TracesProps) {
         (must: any) => must?.term?.serviceName == null
       );
 
-      await handleCustomIndicesTracesRequest(
-        http,
-        DSL,
-        tableItems,
-        setTableItems,
-        setColumns,
-        mode,
-        props.dataSourceMDSId[0].id,
-        sort
-      );
+      if (tracesTableMode !== 'traces')
+        await handleCustomIndicesTracesRequest(
+          http,
+          DSL,
+          tableItems,
+          setTableItems,
+          setColumns,
+          mode,
+          props.dataSourceMDSId[0].id,
+          sort,
+          tracesTableMode,
+          isUnderOneHour
+        );
+      else {
+        await handleTracesRequest(
+          http,
+          DSL,
+          timeFilterDSL,
+          tableItems,
+          setTableItems,
+          mode,
+          props.dataSourceMDSId[0].id,
+          sort,
+          isUnderOneHour
+        );
+      }
       await handleServiceMapRequest(
         http,
         serviceMapDSL,
@@ -187,7 +208,8 @@ export function TracesContent(props: TracesProps) {
         setTableItems,
         mode,
         props.dataSourceMDSId[0].id,
-        sort
+        sort,
+        isUnderOneHour
       );
     }
 
@@ -237,6 +259,8 @@ export function TracesContent(props: TracesProps) {
             attributesFilterFields={attributesFilterFields}
           />
           <EuiSpacer size="s" />
+
+          {/* Switch between custom data prepper and regular table */}
           {mode === 'custom_data_prepper' ? (
             <TracesCustomIndicesTable
               columnItems={columns}
@@ -248,6 +272,8 @@ export function TracesContent(props: TracesProps) {
               openTraceFlyout={openTraceFlyout}
               jaegerIndicesExist={jaegerIndicesExist}
               dataPrepperIndicesExist={dataPrepperIndicesExist}
+              tracesTableMode={tracesTableMode}
+              setTracesTableMode={setTracesTableMode}
             />
           ) : (
             <TracesTable
@@ -262,6 +288,7 @@ export function TracesContent(props: TracesProps) {
             />
           )}
 
+          {/* Show services list and graph when mode is custom data prepper */}
           {mode === 'custom_data_prepper' && (
             <>
               <EuiSpacer size="m" />
diff --git a/public/components/trace_analytics/components/traces/traces_custom_indices_table.tsx b/public/components/trace_analytics/components/traces/traces_custom_indices_table.tsx
index 5674b6f90..8a9669ab1 100644
--- a/public/components/trace_analytics/components/traces/traces_custom_indices_table.tsx
+++ b/public/components/trace_analytics/components/traces/traces_custom_indices_table.tsx
@@ -2,40 +2,38 @@
  * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
-/* eslint-disable react-hooks/exhaustive-deps */
 
 import {
-  EuiButtonEmpty,
-  EuiButtonIcon,
-  EuiCopy,
+  CriteriaWithPagination,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiHighlight,
   EuiHorizontalRule,
   EuiInMemoryTable,
-  EuiLink,
   EuiPanel,
+  EuiPopover,
+  EuiPopoverTitle,
+  EuiSelectable,
+  EuiSelectableOption,
+  EuiSmallButtonEmpty,
   EuiSpacer,
-  EuiTableFieldDataColumnType,
-  EuiText,
-  EuiToolTip,
+  EuiTextColor,
   PropertySort,
 } from '@elastic/eui';
-import { CriteriaWithPagination } from '@opensearch-project/oui/src/eui_components/basic_table';
-import round from 'lodash/round';
-import truncate from 'lodash/truncate';
-import moment from 'moment';
-import React, { useMemo, useState } from 'react';
+import React, { Fragment, useMemo, useState } from 'react';
 import {
-  TRACE_ANALYTICS_DATE_FORMAT,
+  TRACE_TABLE_OPTIONS,
+  TRACE_TABLE_TITLES,
+  TRACE_TABLE_TYPE_KEY,
   TRACES_MAX_NUM,
 } from '../../../../../common/constants/trace_analytics';
-import { TraceAnalyticsMode } from '../../../../../common/types/trace_analytics';
+import { TraceAnalyticsMode, TraceQueryMode } from '../../../../../common/types/trace_analytics';
 import {
   MissingConfigurationMessage,
-  nanoToMilliSec,
   NoMatchMessage,
   PanelTitle,
 } from '../common/helper_functions';
+import { getTableColumns } from './trace_table_helpers';
 
 interface TracesLandingTableProps {
   columnItems: string[];
@@ -47,218 +45,117 @@ interface TracesLandingTableProps {
   openTraceFlyout?: (traceId: string) => void;
   jaegerIndicesExist: boolean;
   dataPrepperIndicesExist: boolean;
+  tracesTableMode: TraceQueryMode;
+  setTracesTableMode: React.Dispatch<React.SetStateAction<TraceQueryMode>>;
 }
 
 export function TracesCustomIndicesTable(props: TracesLandingTableProps) {
   const { columnItems, items, refresh, mode, loading, getTraceViewUri, openTraceFlyout } = props;
   const [showAttributes, setShowAttributes] = useState(false);
+  const [isTitlePopoverOpen, setIsTitlePopoverOpen] = useState(false);
+  const [tableOptions, setTableOptions] = useState<EuiSelectableOption[]>(() =>
+    TRACE_TABLE_OPTIONS.map((obj) =>
+      obj.key === props.tracesTableMode ? { ...obj, checked: 'on' } : obj
+    )
+  );
+
+  const titlePopoverButton = (totalItems?: number) => (
+    <EuiSmallButtonEmpty
+      onClick={() => setIsTitlePopoverOpen(!isTitlePopoverOpen)}
+      iconType="arrowDown"
+      iconSide="right"
+    >
+      <PanelTitle title={TRACE_TABLE_TITLES[props.tracesTableMode]} totalItems={totalItems} />
+    </EuiSmallButtonEmpty>
+  );
+
+  const renderTableOptions = (option: EuiSelectableOption, searchValue: string) => {
+    return (
+      <>
+        <EuiHighlight search={searchValue}>{TRACE_TABLE_TITLES[option.key]}</EuiHighlight>
+        <br />
+        <EuiTextColor color="subdued" className="popOverSelectableItem">
+          <small>{option['aria-describedby']}</small>
+        </EuiTextColor>
+      </>
+    );
+  };
 
   const renderTitleBar = (totalItems?: number) => {
     return (
       <EuiFlexGroup justifyContent="spaceBetween" gutterSize="s">
         <EuiFlexItem grow={false}>
-          <PanelTitle title="Traces" totalItems={totalItems} />
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <EuiButtonEmpty onClick={() => setShowAttributes(!showAttributes)}>
-            {showAttributes ? 'Hide Attributes' : 'Show Attributes'}
-          </EuiButtonEmpty>
+          <EuiPopover
+            button={titlePopoverButton(totalItems)}
+            isOpen={isTitlePopoverOpen}
+            closePopover={() => setIsTitlePopoverOpen(false)}
+          >
+            <EuiPopoverTitle className="tableModePopover">
+              Select trace table filter
+            </EuiPopoverTitle>
+            <EuiSelectable
+              singleSelection="always"
+              aria-label="Searchable trace mode"
+              searchable
+              searchProps={{
+                'data-test-subj': 'traceTableMode',
+              }}
+              renderOption={renderTableOptions}
+              listProps={{ rowHeight: 75 }}
+              options={tableOptions}
+              onChange={(newOptions) => {
+                setTableOptions(newOptions);
+                const tableMode = newOptions.filter((option) => option.checked === 'on')[0]
+                  .key as TraceQueryMode;
+                props.setTracesTableMode(tableMode);
+                sessionStorage.setItem(TRACE_TABLE_TYPE_KEY, tableMode);
+                setIsTitlePopoverOpen(false);
+              }}
+            >
+              {(list, search) => (
+                <Fragment>
+                  {search}
+                  {list}
+                </Fragment>
+              )}
+            </EuiSelectable>
+          </EuiPopover>
         </EuiFlexItem>
+        {props.tracesTableMode !== 'traces' && (
+          <EuiFlexItem grow={false}>
+            <EuiSmallButtonEmpty onClick={() => setShowAttributes(!showAttributes)}>
+              {showAttributes ? 'Hide Attributes' : 'Show Attributes'}
+            </EuiSmallButtonEmpty>
+          </EuiFlexItem>
+        )}
       </EuiFlexGroup>
     );
   };
 
-  const dynamicColumns = columnItems
-    .filter((col) => col.includes('attributes') || col.includes('instrumentation'))
-    .map((col) => ({
-      className: 'attributes-column',
-      field: col,
-      name: (
-        <EuiText className="euiTableCellContent">
-          <EuiToolTip content={col}>
-            <p className="euiTableCellContent__text attributes-column-header">{col}</p>
-          </EuiToolTip>
-        </EuiText>
-      ),
-      align: 'right',
-      sortable: true,
-      truncateText: true,
-      render: (item) =>
-        item ? (
-          <EuiText>
-            <EuiToolTip content={item}>
-              <EuiText size="s">
-                {item.length < 36 ? item : <div title={item}>{truncate(item, { length: 36 })}</div>}
-              </EuiText>
-            </EuiToolTip>
-          </EuiText>
-        ) : (
-          '-'
-        ),
-    }));
-
   const columns = useMemo(() => {
-    if (mode === 'custom_data_prepper' || mode === 'data_prepper') {
-      return [
-        {
-          field: 'traceId',
-          name: 'Trace ID',
-          align: 'left',
-          sortable: true,
-          truncateText: false,
-          render: (item) => (
-            <EuiFlexGroup gutterSize="s" alignItems="center">
-              <EuiFlexItem grow={false}>
-                <EuiLink
-                  data-test-subj="trace-link"
-                  {...(getTraceViewUri && { href: getTraceViewUri(item) })}
-                  {...(openTraceFlyout && { onClick: () => openTraceFlyout(item) })}
-                >
-                  <EuiText size="s" className="traces-table traces-table-trace-id" title={item}>
-                    {item}
-                  </EuiText>
-                </EuiLink>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiCopy textToCopy={item}>
-                  {(copy) => (
-                    <EuiButtonIcon
-                      aria-label="Copy trace id"
-                      iconType="copyClipboard"
-                      onClick={copy}
-                    >
-                      Click to copy
-                    </EuiButtonIcon>
-                  )}
-                </EuiCopy>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          ),
-        },
-        {
-          field: 'traceGroup',
-          name: 'Trace group',
-          align: 'left',
-          sortable: true,
-          truncateText: true,
-          className: 'trace-group-column',
-          render: (item) =>
-            item ? (
-              <EuiText size="s">
-                {item.length < 36 ? item : <div title={item}>{truncate(item, { length: 36 })}</div>}
-              </EuiText>
-            ) : (
-              '-'
-            ),
-        },
-        {
-          field: 'durationInNanos',
-          name: 'Duration (ms)',
-          align: 'right',
-          sortable: true,
-          truncateText: true,
-          render: (item) =>
-            item ? <EuiText size="s">{round(nanoToMilliSec(Math.max(0, item)), 2)}</EuiText> : '-',
-        },
-        {
-          field: 'status.code',
-          name: 'Errors',
-          align: 'right',
-          sortable: true,
-          render: (item) =>
-            item == null ? (
-              '-'
-            ) : +item === 2 ? (
-              <EuiText color="danger" size="s">
-                Yes
-              </EuiText>
-            ) : (
-              'No'
-            ),
-        },
-        {
-          field: 'endTime',
-          name: 'Last updated',
-          align: 'right',
-          sortable: true,
-          className: 'trace-group-column',
-          render: (item) =>
-            item === 0 || item ? moment(item).format(TRACE_ANALYTICS_DATE_FORMAT) : '-',
-        },
-        ...(showAttributes ? dynamicColumns : []),
-      ] as Array<EuiTableFieldDataColumnType<any>>;
-    } else {
-      return [
-        {
-          field: 'trace_id',
-          name: 'Trace ID',
-          align: 'left',
-          sortable: true,
-          truncateText: true,
-          render: (item) => (
-            <EuiFlexGroup gutterSize="s" alignItems="center">
-              <EuiFlexItem grow={false}>
-                <EuiLink
-                  data-test-subj="trace-link"
-                  {...(getTraceViewUri && { href: getTraceViewUri(item) })}
-                  {...(openTraceFlyout && { onClick: () => openTraceFlyout(item) })}
-                >
-                  <EuiText size="s" className="traces-table traces-table-trace-id" title={item}>
-                    {item}
-                  </EuiText>
-                </EuiLink>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiCopy textToCopy={item}>
-                  {(copy) => (
-                    <EuiButtonIcon
-                      aria-label="Copy trace id"
-                      iconType="copyClipboard"
-                      onClick={copy}
-                    >
-                      Click to copy
-                    </EuiButtonIcon>
-                  )}
-                </EuiCopy>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          ),
-        },
-        {
-          field: 'latency',
-          name: 'Latency (ms)',
-          align: 'right',
-          sortable: true,
-          truncateText: true,
-        },
-        {
-          field: 'error_count',
-          name: 'Errors',
-          align: 'right',
-          sortable: true,
-          render: (item) =>
-            item == null ? (
-              '-'
-            ) : item > 0 ? (
-              <EuiText color="danger" size="s">
-                Yes
-              </EuiText>
-            ) : (
-              'No'
-            ),
-        },
-        {
-          field: 'last_updated',
-          name: 'Last updated',
-          align: 'left',
-          sortable: true,
-          render: (item) => (item === 0 || item ? item : '-'),
-        },
-      ] as Array<EuiTableFieldDataColumnType<any>>;
-    }
-  }, [showAttributes, items]);
+    return getTableColumns(
+      showAttributes,
+      columnItems,
+      mode,
+      props.tracesTableMode,
+      getTraceViewUri,
+      openTraceFlyout
+    );
+  }, [
+    showAttributes,
+    columnItems,
+    mode,
+    props.tracesTableMode,
+    getTraceViewUri,
+    openTraceFlyout,
+    items,
+  ]);
 
-  const titleBar = useMemo(() => renderTitleBar(items?.length), [showAttributes, items]);
+  const titleBar = useMemo(() => renderTitleBar(items?.length), [
+    showAttributes,
+    items,
+    isTitlePopoverOpen,
+  ]);
 
   const [sorting, setSorting] = useState<{ sort: PropertySort }>({
     sort: {
diff --git a/public/components/trace_analytics/home.tsx b/public/components/trace_analytics/home.tsx
index 042064020..268881c04 100644
--- a/public/components/trace_analytics/home.tsx
+++ b/public/components/trace_analytics/home.tsx
@@ -5,7 +5,7 @@
 
 import { EuiGlobalToastList } from '@elastic/eui';
 import { Toast } from '@elastic/eui/src/components/toast/global_toast_list';
-import React, { ReactChild, useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { HashRouter, Redirect, Route, RouteComponentProps } from 'react-router-dom';
 import {
   ChromeBreadcrumb,
@@ -19,7 +19,8 @@ import {
   DataSourceManagementPluginSetup,
   DataSourceSelectableConfig,
 } from '../../../../../src/plugins/data_source_management/public';
-import { TraceAnalyticsMode } from '../../../common/types/trace_analytics';
+import { TRACE_TABLE_TYPE_KEY } from '../../../common/constants/trace_analytics';
+import { TraceAnalyticsMode, TraceQueryMode } from '../../../common/types/trace_analytics';
 import { dataSourceFilterFn } from '../../../common/utils/shared';
 import { coreRefs } from '../../framework/core_refs';
 import { FilterType } from './components/common/filters/filters';
@@ -111,11 +112,9 @@ export const Home = (props: HomeProps) => {
   };
   const [toasts, setToasts] = useState<Toast[]>([]);
 
-  const _setToast = (title: string, color = 'success', text?: ReactChild, _side?: string) => {
-    if (!text) text = '';
-    setToasts([...toasts, { id: new Date().toISOString(), title, text, color } as Toast]);
-  };
-
+  const [tracesTableMode, setTracesTableMode] = useState<TraceQueryMode>(
+    (sessionStorage.getItem(TRACE_TABLE_TYPE_KEY) as TraceQueryMode) || 'all_spans'
+  );
   const [dataSourceMDSId, setDataSourceMDSId] = useState([{ id: '', label: '' }]);
   const [currentSelectedService, setCurrentSelectedService] = useState('');
 
@@ -230,7 +229,11 @@ export const Home = (props: HomeProps) => {
     },
   ];
 
-  const traceColumnAction = () => location.assign('#/traces');
+  const traceColumnAction = () => {
+    location.assign('#/traces');
+    setTracesTableMode('traces');
+    sessionStorage.setItem(TRACE_TABLE_TYPE_KEY, 'traces');
+  };
 
   const getTraceViewUri = (traceId: string) => `#/traces/${encodeURIComponent(traceId)}`;
 
@@ -329,6 +332,8 @@ export const Home = (props: HomeProps) => {
                   setCurrentSelectedService={setCurrentSelectedService}
                   toasts={toasts}
                   dataSourceMDSId={dataSourceMDSId}
+                  tracesTableMode={tracesTableMode}
+                  setTracesTableMode={setTracesTableMode}
                   {...commonProps}
                 />
               </TraceSideBar>
@@ -343,6 +348,8 @@ export const Home = (props: HomeProps) => {
                   setCurrentSelectedService={setCurrentSelectedService}
                   toasts={toasts}
                   dataSourceMDSId={dataSourceMDSId}
+                  tracesTableMode={tracesTableMode}
+                  setTracesTableMode={setTracesTableMode}
                   {...commonProps}
                 />
               </>
diff --git a/public/components/trace_analytics/index.scss b/public/components/trace_analytics/index.scss
index 9940f59df..779a47259 100644
--- a/public/components/trace_analytics/index.scss
+++ b/public/components/trace_analytics/index.scss
@@ -97,12 +97,28 @@ th[data-test-subj^='tableHeaderCell_dashboard_latency_variance'] {
 .attributes-column-header,
 .attributes-column {
   max-width: 200px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding-left: 8px;
 }
 
 .trace-group-column {
   min-width: 200px;
 }
 
+.span-group-column {
+  min-width: 150px;
+}
+
 .attributes-column-header {
   display: table-cell;
 }
+
+.tableModePopover {
+  width: 300px;
+}
+
+.popOverSelectableItem {
+  white-space: initial !important;
+}
diff --git a/public/components/trace_analytics/requests/queries/traces_queries.ts b/public/components/trace_analytics/requests/queries/traces_queries.ts
index 996995441..6db9c73f4 100644
--- a/public/components/trace_analytics/requests/queries/traces_queries.ts
+++ b/public/components/trace_analytics/requests/queries/traces_queries.ts
@@ -5,7 +5,7 @@
 
 import { PropertySort } from '@elastic/eui';
 import { TRACES_MAX_NUM } from '../../../../../common/constants/trace_analytics';
-import { TraceAnalyticsMode } from '../../../../../common/types/trace_analytics';
+import { TraceAnalyticsMode, TraceQueryMode } from '../../../../../common/types/trace_analytics';
 import { SpanSearchParams } from '../../components/traces/span_detail_table';
 
 export const getTraceGroupPercentilesQuery = () => {
@@ -50,7 +50,8 @@ export const getTraceGroupPercentilesQuery = () => {
 export const getTracesQuery = (
   mode: TraceAnalyticsMode,
   traceId: string = '',
-  sort?: PropertySort
+  sort?: PropertySort,
+  isUnderOneHour?: boolean
 ) => {
   const field = sort?.field || '_key';
   const direction = sort?.direction || 'asc';
@@ -72,7 +73,7 @@ export const getTracesQuery = (
           order: {
             [field]: direction,
           },
-          execution_hint: 'map',
+          ...(isUnderOneHour && { execution_hint: 'map' }),
         },
         aggs: {
           latency: {
@@ -139,7 +140,7 @@ export const getTracesQuery = (
           order: {
             [field]: direction,
           },
-          execution_hint: 'map',
+          ...(isUnderOneHour && { execution_hint: 'map' }),
         },
         aggs: {
           latency: {
@@ -471,7 +472,9 @@ export const getSpansQuery = (spanSearchParams: SpanSearchParams) => {
 export const getCustomIndicesTracesQuery = (
   mode: TraceAnalyticsMode,
   traceId: string = '',
-  sort?: PropertySort
+  sort?: PropertySort,
+  queryMode?: TraceQueryMode,
+  isUnderOneHour?: boolean
 ) => {
   const jaegerQuery: any = {
     size: 0,
@@ -491,7 +494,7 @@ export const getCustomIndicesTracesQuery = (
           order: {
             [sort?.field || '_key']: sort?.direction || 'asc',
           },
-          execution_hint: 'map',
+          ...(isUnderOneHour && { execution_hint: 'map' }),
         },
         aggs: {
           latency: {
@@ -545,7 +548,9 @@ export const getCustomIndicesTracesQuery = (
     size: TRACES_MAX_NUM,
     _source: {
       includes: [
+        'spanId',
         'traceId',
+        'parentSpanId',
         'traceGroup',
         'durationInNanos',
         'status.code',
@@ -557,13 +562,7 @@ export const getCustomIndicesTracesQuery = (
     query: {
       bool: {
         must: [],
-        filter: [
-          {
-            term: {
-              parentSpanId: '', // Data prepper root span doesn't have any parent.
-            },
-          },
-        ],
+        filter: [],
         should: [],
         must_not: [],
       },
@@ -571,6 +570,20 @@ export const getCustomIndicesTracesQuery = (
     ...(sort && { sort: [{ [sort.field]: { order: sort.direction } }] }),
     track_total_hits: false,
   };
+
+  if (queryMode === 'trace_root_spans') {
+    dataPrepperQuery.query.bool.filter.push({
+      term: {
+        parentSpanId: '', // Data prepper root span doesn't have any parent.
+      },
+    });
+  } else if (queryMode === 'service_entry_spans') {
+    dataPrepperQuery.query.bool.filter.push({
+      term: {
+        kind: 'SPAN_KIND_SERVER',
+      },
+    });
+  }
   if (traceId) {
     jaegerQuery.query.bool.filter.push({
       term: {
diff --git a/public/components/trace_analytics/requests/traces_request_handler.ts b/public/components/trace_analytics/requests/traces_request_handler.ts
index 44af86d58..883014afb 100644
--- a/public/components/trace_analytics/requests/traces_request_handler.ts
+++ b/public/components/trace_analytics/requests/traces_request_handler.ts
@@ -13,7 +13,7 @@ import { v1 as uuid } from 'uuid';
 import { HttpSetup } from '../../../../../../src/core/public';
 import { BarOrientation } from '../../../../common/constants/shared';
 import { TRACE_ANALYTICS_DATE_FORMAT } from '../../../../common/constants/trace_analytics';
-import { TraceAnalyticsMode } from '../../../../common/types/trace_analytics';
+import { TraceAnalyticsMode, TraceQueryMode } from '../../../../common/types/trace_analytics';
 import { microToMilliSec, nanoToMilliSec } from '../components/common/helper_functions';
 import { SpanSearchParams } from '../components/traces/span_detail_table';
 import {
@@ -36,12 +36,14 @@ export const handleCustomIndicesTracesRequest = async (
   setColumns: (items: any) => void,
   mode: TraceAnalyticsMode,
   dataSourceMDSId?: string,
-  sort?: PropertySort
+  sort?: PropertySort,
+  queryMode?: TraceQueryMode,
+  isUnderOneHour?: boolean
 ) => {
   const responsePromise = handleDslRequest(
     http,
     DSL,
-    getCustomIndicesTracesQuery(mode, undefined, sort),
+    getCustomIndicesTracesQuery(mode, undefined, sort, queryMode, isUnderOneHour),
     mode,
     dataSourceMDSId
   );
@@ -89,7 +91,8 @@ export const handleTracesRequest = async (
   setItems: (items: any) => void,
   mode: TraceAnalyticsMode,
   dataSourceMDSId?: string,
-  sort?: PropertySort
+  sort?: PropertySort,
+  isUnderOneHour?: boolean
 ) => {
   const binarySearch = (arr: number[], target: number) => {
     if (!arr) return Number.NaN;
@@ -107,7 +110,7 @@ export const handleTracesRequest = async (
   const responsePromise = handleDslRequest(
     http,
     DSL,
-    getTracesQuery(mode, undefined, sort),
+    getTracesQuery(mode, undefined, sort, isUnderOneHour),
     mode,
     dataSourceMDSId
   );