From e69815f189316b179960b2d25520c61fad5d3598 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:02:05 +0000
Subject: [PATCH] Explorer minor UI updates (#1096)

* explorer ui updates

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* bug fixes and snapshot update

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update app analytics tests

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update view test snapshots

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit 34068f125f5b4a3aa12c130327191ddbb25532a0)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../__snapshots__/create.test.tsx.snap        |    16 +
 .../__snapshots__/log_config.test.tsx.snap    |    28 +
 .../components/common/search/autocomplete.tsx |    11 +-
 public/components/common/search/search.scss   |    16 +-
 public/components/common/search/search.tsx    |    90 +-
 .../components/common/search/sql_search.tsx   |    93 +-
 .../custom_panel_view.test.tsx.snap           |    28 +
 .../datasources/datasources_selection.tsx     |    12 +-
 .../event_analytics/explorer/explorer.scss    |     2 +-
 .../event_analytics/explorer/explorer.tsx     |   149 +-
 .../__snapshots__/sidebar.test.tsx.snap       | 16430 ++++++++--------
 .../explorer/sidebar/sidebar.tsx              |    57 +-
 .../visualizations/direct_query_vis.tsx       |    20 +-
 .../redux/slices/query_slice.ts               |     2 +-
 14 files changed, 8432 insertions(+), 8522 deletions(-)

diff --git a/public/components/application_analytics/__tests__/__snapshots__/create.test.tsx.snap b/public/components/application_analytics/__tests__/__snapshots__/create.test.tsx.snap
index 7eb808caea..48a65f4ac6 100644
--- a/public/components/application_analytics/__tests__/__snapshots__/create.test.tsx.snap
+++ b/public/components/application_analytics/__tests__/__snapshots__/create.test.tsx.snap
@@ -311,6 +311,7 @@ Object {
                                       placeholder="Enter PPL query"
                                       rows="6"
                                       spellcheck="false"
+                                      style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
                                     >
                                       source = openserach_dashboard_sample_logs
@@ -1564,6 +1565,7 @@ Object {
                                     placeholder="Enter PPL query"
                                     rows="6"
                                     spellcheck="false"
+                                    style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
                                   >
                                     source = openserach_dashboard_sample_logs
@@ -2758,6 +2760,7 @@ Object {
                                       placeholder="Enter PPL query"
                                       rows="6"
                                       spellcheck="false"
+                                      style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
                                     />
                                   </div>
@@ -3925,6 +3928,7 @@ Object {
                                     placeholder="Enter PPL query"
                                     rows="6"
                                     spellcheck="false"
+                                    style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
                                   />
                                 </div>
@@ -5151,6 +5155,7 @@ Object {
                                       placeholder="Enter PPL query"
                                       rows="6"
                                       spellcheck="false"
+                                      style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
                                     />
                                   </div>
@@ -6318,6 +6323,7 @@ Object {
                                     placeholder="Enter PPL query"
                                     rows="6"
                                     spellcheck="false"
+                                    style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
                                   />
                                 </div>
@@ -7537,6 +7543,7 @@ Object {
                                       placeholder="Enter PPL query"
                                       rows="6"
                                       spellcheck="false"
+                                      style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
                                     />
                                   </div>
@@ -8641,6 +8648,7 @@ Object {
                                     placeholder="Enter PPL query"
                                     rows="6"
                                     spellcheck="false"
+                                    style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
                                   />
                                 </div>
@@ -9807,6 +9815,7 @@ Object {
                                       placeholder="Enter PPL query"
                                       rows="6"
                                       spellcheck="false"
+                                      style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
                                     >
                                       source = openserach_dashboard_sample_logs
@@ -10940,6 +10949,7 @@ Object {
                                     placeholder="Enter PPL query"
                                     rows="6"
                                     spellcheck="false"
+                                    style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
                                   >
                                     source = openserach_dashboard_sample_logs
@@ -12132,6 +12142,7 @@ Object {
                                       placeholder="Enter PPL query"
                                       rows="6"
                                       spellcheck="false"
+                                      style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
                                     />
                                   </div>
@@ -13299,6 +13310,7 @@ Object {
                                     placeholder="Enter PPL query"
                                     rows="6"
                                     spellcheck="false"
+                                    style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
                                   />
                                 </div>
@@ -14525,6 +14537,7 @@ Object {
                                       placeholder="Enter PPL query"
                                       rows="6"
                                       spellcheck="false"
+                                      style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
                                     />
                                   </div>
@@ -15692,6 +15705,7 @@ Object {
                                     placeholder="Enter PPL query"
                                     rows="6"
                                     spellcheck="false"
+                                    style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
                                   />
                                 </div>
@@ -16920,6 +16934,7 @@ Object {
                                       placeholder="Enter PPL query"
                                       rows="6"
                                       spellcheck="false"
+                                      style="margin-top: 0px; height: 18px; padding: 8px;"
                                       type="search"
                                     >
                                       source = openserach_dashboard_sample_logs
@@ -18169,6 +18184,7 @@ Object {
                                     placeholder="Enter PPL query"
                                     rows="6"
                                     spellcheck="false"
+                                    style="margin-top: 0px; height: 18px; padding: 8px;"
                                     type="search"
                                   >
                                     source = openserach_dashboard_sample_logs
diff --git a/public/components/application_analytics/__tests__/__snapshots__/log_config.test.tsx.snap b/public/components/application_analytics/__tests__/__snapshots__/log_config.test.tsx.snap
index b958bdaf36..7a96c78913 100644
--- a/public/components/application_analytics/__tests__/__snapshots__/log_config.test.tsx.snap
+++ b/public/components/application_analytics/__tests__/__snapshots__/log_config.test.tsx.snap
@@ -516,6 +516,13 @@ exports[`Log Config component renders empty log config 1`] = `
                                         onKeyDown={[Function]}
                                         placeholder="Enter PPL query"
                                         spellCheck="false"
+                                        style={
+                                          Object {
+                                            "height": "18px",
+                                            "marginTop": "0px",
+                                            "padding": "8px",
+                                          }
+                                        }
                                         type="search"
                                         value=""
                                       >
@@ -541,6 +548,13 @@ exports[`Log Config component renders empty log config 1`] = `
                                             placeholder="Enter PPL query"
                                             rows={6}
                                             spellCheck="false"
+                                            style={
+                                              Object {
+                                                "height": "18px",
+                                                "marginTop": "0px",
+                                                "padding": "8px",
+                                              }
+                                            }
                                             type="search"
                                             value=""
                                           />
@@ -1126,6 +1140,13 @@ exports[`Log Config component renders with query 1`] = `
                                         onKeyDown={[Function]}
                                         placeholder="Enter PPL query"
                                         spellCheck="false"
+                                        style={
+                                          Object {
+                                            "height": "18px",
+                                            "marginTop": "0px",
+                                            "padding": "8px",
+                                          }
+                                        }
                                         type="search"
                                         value="source = openserach_dashboard_sample_logs"
                                       >
@@ -1151,6 +1172,13 @@ exports[`Log Config component renders with query 1`] = `
                                             placeholder="Enter PPL query"
                                             rows={6}
                                             spellCheck="false"
+                                            style={
+                                              Object {
+                                                "height": "18px",
+                                                "marginTop": "0px",
+                                                "padding": "8px",
+                                              }
+                                            }
                                             type="search"
                                             value="source = openserach_dashboard_sample_logs"
                                           />
diff --git a/public/components/common/search/autocomplete.tsx b/public/components/common/search/autocomplete.tsx
index 4b9ab22cb9..8272d329f1 100644
--- a/public/components/common/search/autocomplete.tsx
+++ b/public/components/common/search/autocomplete.tsx
@@ -4,15 +4,15 @@
  */
 /* eslint-disable react-hooks/exhaustive-deps */
 
-import './search.scss';
-import $ from 'jquery';
-import React, { useEffect, useMemo, useState } from 'react';
 import { AutocompleteState, createAutocomplete } from '@algolia/autocomplete-core';
 import { EuiFieldText, EuiTextArea } from '@elastic/eui';
+import $ from 'jquery';
 import DSLService from 'public/services/requests/dsl';
-import { IQueryBarProps } from './search';
-import { uiSettingsService } from '../../../../common/utils';
+import React, { useEffect, useMemo, useState } from 'react';
 import { AutocompleteItem } from '../../../../common/constants/autocomplete';
+import { uiSettingsService } from '../../../../common/utils';
+import { IQueryBarProps } from './search';
+import './search.scss';
 
 interface AutocompleteProps extends IQueryBarProps {
   getSuggestions: (
@@ -136,6 +136,7 @@ export const Autocomplete = (props: AutocompleteProps) => {
   return (
     <div className="aa-Autocomplete" {...autocomplete.getRootProps({ id: 'autocomplete-root' })}>
       <TextArea
+        style={{ marginTop: '0px', height: '18px', padding: '8px' }}
         {...autocomplete.getInputProps({
           id: 'autocomplete-textarea',
           'data-test-subj': 'searchAutocompleteTextArea',
diff --git a/public/components/common/search/search.scss b/public/components/common/search/search.scss
index 681a7f0b92..c60fb58db7 100644
--- a/public/components/common/search/search.scss
+++ b/public/components/common/search/search.scss
@@ -5,14 +5,14 @@
 
 .globalQueryBar {
   margin: 0;
-  padding: .5rem;
+  padding: 0.5rem;
 }
 .aa-Autocomplete {
   width: 100%;
   position: relative;
   --aa-search-input-height: 38px;
-  --aa-panel-border-color-rgb: rgba(227,230,238,255);
-  --aa-input-background-color-rbg: rgba(250,251,253,255);
+  --aa-panel-border-color-rgb: rgba(227, 230, 238, 255);
+  --aa-input-background-color-rbg: rgba(250, 251, 253, 255);
 }
 .styling {
   font-weight: bold;
@@ -26,7 +26,7 @@
 #autocomplete-textarea {
   width: 100%;
   outline: none;
-  min-height: 48px;
+  min-height: 40px;
   max-width: unset;
   height: 45px;
   resize: vertical;
@@ -40,12 +40,12 @@
 }
 
 .aa-Panel--scrollable-dark {
-  background-color: #1D1E24;
+  background-color: #1d1e24;
   border: 2px groove #383444;
 }
 
 .aa-Item-dark {
-  color: #DFE5EF;
+  color: #dfe5ef;
 }
 
 .event-date-picker {
@@ -60,11 +60,11 @@
   background-color: transparent;
 }
 .ppl-link-light {
-  color: #006BB4;
+  color: #006bb4;
 }
 
 .ppl-link-dark {
-  color: #1BA9F5;
+  color: #1ba9f5;
 }
 
 .base-query-popover {
diff --git a/public/components/common/search/search.tsx b/public/components/common/search/search.tsx
index 5f3ba6aff0..604575850b 100644
--- a/public/components/common/search/search.tsx
+++ b/public/components/common/search/search.tsx
@@ -5,39 +5,39 @@
 
 import './search.scss';
 
-import React, { useState, useEffect } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { isEqual, lowerCase } from 'lodash';
+import '@algolia/autocomplete-theme-classic';
 import {
-  EuiFlexGroup,
+  EuiBadge,
   EuiButton,
+  EuiButtonEmpty,
+  EuiContextMenuItem,
+  EuiContextMenuPanel,
+  EuiFlexGroup,
   EuiFlexItem,
   EuiPopover,
-  EuiButtonEmpty,
   EuiPopoverFooter,
-  EuiBadge,
-  EuiContextMenuPanel,
   EuiToolTip,
-  EuiComboBox,
 } from '@elastic/eui';
-import { DatePicker } from './date_picker';
-import '@algolia/autocomplete-theme-classic';
-import { Autocomplete } from './autocomplete';
-import { SavePanel } from '../../event_analytics/explorer/save_panel';
-import { PPLReferenceFlyout } from '../helpers';
-import { uiSettingsService } from '../../../../common/utils';
+import { isEqual } from 'lodash';
+import React, { useEffect, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import { APP_ANALYTICS_TAB_ID_REGEX, RAW_QUERY } from '../../../../common/constants/explorer';
-import { LiveTailButton, StopLiveButton } from '../live_tail/live_tail_button';
 import { PPL_SPAN_REGEX } from '../../../../common/constants/shared';
-import { coreRefs } from '../../../framework/core_refs';
+import { uiSettingsService } from '../../../../common/utils';
 import { useFetchEvents } from '../../../components/event_analytics/hooks';
+import { changeQuery } from '../../../components/event_analytics/redux/slices/query_slice';
+import { usePolling } from '../../../components/hooks/use_polling';
+import { coreRefs } from '../../../framework/core_refs';
 import { SQLService } from '../../../services/requests/sql';
+import { SavePanel } from '../../event_analytics/explorer/save_panel';
 import {
   selectSearchMetaData,
   update as updateSearchMetaData,
 } from '../../event_analytics/redux/slices/search_meta_data_slice';
-import { usePolling } from '../../../components/hooks/use_polling';
-import { changeQuery } from '../../../components/event_analytics/redux/slices/query_slice';
+import { PPLReferenceFlyout } from '../helpers';
+import { LiveTailButton, StopLiveButton } from '../live_tail/live_tail_button';
+import { Autocomplete } from './autocomplete';
+import { DatePicker } from './date_picker';
 export interface IQueryBarProps {
   query: string;
   tempQuery: string;
@@ -101,8 +101,9 @@ export const Search = (props: any) => {
   const dispatch = useDispatch();
   const appLogEvents = tabId.match(APP_ANALYTICS_TAB_ID_REGEX);
   const [isSavePanelOpen, setIsSavePanelOpen] = useState(false);
+  const [isLanguagePopoverOpen, setLanguagePopoverOpen] = useState(false);
   const [isFlyoutVisible, setIsFlyoutVisible] = useState(false);
-  const [queryLang, setQueryLang] = useState([]);
+  const [queryLang, setQueryLang] = useState('PPL');
   const [jobId, setJobId] = useState('');
   const sqlService = new SQLService(coreRefs.http);
   const { application } = coreRefs;
@@ -161,21 +162,45 @@ export const Search = (props: any) => {
     />
   );
 
-  const handleQueryLanguageChange = (lang) => {
-    if (lang[0].label === 'DQL') {
-      return application.navigateToUrl(
+  const handleQueryLanguageChange = (lang: string) => {
+    if (lang === 'DQL') {
+      return application!.navigateToUrl(
         `../app/data-explorer/discover#?_a=(discover:(columns:!(_source),isDirty:!f,sort:!()),metadata:(indexPattern:'${explorerSearchMetadata.datasources[0].value}',view:discover))&_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))&_q=(filters:!(),query:(language:kuery,query:''))`
       );
     }
     dispatch(
       updateSearchMetaData({
         tabId,
-        data: { lang: lang[0].label },
+        data: { lang },
       })
     );
     setQueryLang(lang);
+    closeLanguagePopover();
   };
 
+  const onLanguagePopoverClick = () => {
+    setLanguagePopoverOpen(!isLanguagePopoverOpen);
+  };
+
+  const closeLanguagePopover = () => {
+    setLanguagePopoverOpen(false);
+  };
+
+  const languagePopOverItems = [
+    <EuiContextMenuItem key="PPL" onClick={() => handleQueryLanguageChange('PPL')}>
+      PPL
+    </EuiContextMenuItem>,
+    <EuiContextMenuItem key="DQL" onClick={() => handleQueryLanguageChange('DQL')}>
+      DQL
+    </EuiContextMenuItem>,
+  ];
+
+  const languagePopOverButton = (
+    <EuiButton iconType="arrowDown" iconSide="right" onClick={onLanguagePopoverClick} color="text">
+      {queryLang}
+    </EuiButton>
+  );
+
   const onQuerySearch = (lang) => {
     handleTimeRangePickerRefresh();
   };
@@ -217,14 +242,17 @@ export const Search = (props: any) => {
             </EuiToolTip>
           </EuiFlexItem>
         )}
-        <EuiFlexItem key="lang-selector" className="search-area" grow={1}>
-          <EuiComboBox
-            placeholder="No language selected yet"
-            options={[{ label: 'PPL' }, { label: 'DQL' }]}
-            selectedOptions={queryLang}
-            onChange={handleQueryLanguageChange}
-            singleSelection={{ asPlainText: true }}
-          />
+        <EuiFlexItem key="lang-selector" className="search-area lang-selector" grow={false}>
+          <EuiPopover
+            id="smallContextMenuExample"
+            button={languagePopOverButton}
+            isOpen={isLanguagePopoverOpen}
+            closePopover={closeLanguagePopover}
+            panelPaddingSize="none"
+            anchorPosition="downLeft"
+          >
+            <EuiContextMenuPanel size="s" items={languagePopOverItems} />
+          </EuiPopover>
         </EuiFlexItem>
         <EuiFlexItem key="search-bar" className="search-area" grow={5}>
           <Autocomplete
diff --git a/public/components/common/search/sql_search.tsx b/public/components/common/search/sql_search.tsx
index 14e57def3b..aea336d7cf 100644
--- a/public/components/common/search/sql_search.tsx
+++ b/public/components/common/search/sql_search.tsx
@@ -5,37 +5,36 @@
 
 import './search.scss';
 
-import React, { useState, useEffect } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { isEqual, lowerCase } from 'lodash';
+import '@algolia/autocomplete-theme-classic';
 import {
-  EuiFlexGroup,
+  EuiBadge,
   EuiButton,
+  EuiButtonEmpty,
+  EuiContextMenuItem,
+  EuiContextMenuPanel,
+  EuiFlexGroup,
   EuiFlexItem,
   EuiPopover,
-  EuiButtonEmpty,
   EuiPopoverFooter,
-  EuiBadge,
   EuiToolTip,
-  EuiComboBox,
-  EuiTextArea,
 } from '@elastic/eui';
-import { DatePicker } from './date_picker';
-import '@algolia/autocomplete-theme-classic';
-import { Autocomplete } from './autocomplete';
-import { SavePanel } from '../../event_analytics/explorer/save_panel';
-import { PPLReferenceFlyout } from '../helpers';
-import { uiSettingsService } from '../../../../common/utils';
-import { APP_ANALYTICS_TAB_ID_REGEX, RAW_QUERY } from '../../../../common/constants/explorer';
+import { isEqual, lowerCase } from 'lodash';
+import React, { useEffect, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { APP_ANALYTICS_TAB_ID_REGEX } from '../../../../common/constants/explorer';
 import { PPL_SPAN_REGEX } from '../../../../common/constants/shared';
-import { coreRefs } from '../../../framework/core_refs';
+import { uiSettingsService } from '../../../../common/utils';
 import { useFetchEvents } from '../../../components/event_analytics/hooks';
-import { SQLService } from '../../../services/requests/sql';
 import { usePolling } from '../../../components/hooks/use_polling';
+import { coreRefs } from '../../../framework/core_refs';
+import { SQLService } from '../../../services/requests/sql';
+import { SavePanel } from '../../event_analytics/explorer/save_panel';
 import {
   selectSearchMetaData,
   update as updateSearchMetaData,
 } from '../../event_analytics/redux/slices/search_meta_data_slice';
+import { PPLReferenceFlyout } from '../helpers';
+import { Autocomplete } from './autocomplete';
 export interface IQueryBarProps {
   query: string;
   tempQuery: string;
@@ -100,7 +99,8 @@ export const DirectSearch = (props: any) => {
   const appLogEvents = tabId.match(APP_ANALYTICS_TAB_ID_REGEX);
   const [isSavePanelOpen, setIsSavePanelOpen] = useState(false);
   const [isFlyoutVisible, setIsFlyoutVisible] = useState(false);
-  const [queryLang, setQueryLang] = useState([]);
+  const [isLanguagePopoverOpen, setLanguagePopoverOpen] = useState(false);
+  const [queryLang, setQueryLang] = useState('SQL');
   const [jobId, setJobId] = useState('');
   const sqlService = new SQLService(coreRefs.http);
   const { application } = coreRefs;
@@ -149,21 +149,45 @@ export const DirectSearch = (props: any) => {
     </EuiButton>
   );
 
-  const handleQueryLanguageChange = (lang) => {
-    if (lang[0].label === 'DQL') {
-      return application.navigateToUrl(
+  const handleQueryLanguageChange = (lang: string) => {
+    if (lang === 'DQL') {
+      return application!.navigateToUrl(
         `../app/data-explorer/discover#?_a=(discover:(columns:!(_source),isDirty:!f,sort:!()),metadata:(indexPattern:'${explorerSearchMetadata.datasources[0].value}',view:discover))&_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))&_q=(filters:!(),query:(language:kuery,query:''))`
       );
     }
     dispatch(
       updateSearchMetaData({
         tabId,
-        data: { lang: lang[0].label },
+        data: { lang },
       })
     );
     setQueryLang(lang);
+    closeLanguagePopover();
+  };
+
+  const onLanguagePopoverClick = () => {
+    setLanguagePopoverOpen(!isLanguagePopoverOpen);
   };
 
+  const closeLanguagePopover = () => {
+    setLanguagePopoverOpen(false);
+  };
+
+  const languagePopOverItems = [
+    <EuiContextMenuItem key="SQL" onClick={() => handleQueryLanguageChange('SQL')}>
+      SQL
+    </EuiContextMenuItem>,
+    <EuiContextMenuItem key="PPL" onClick={() => handleQueryLanguageChange('PPL')}>
+      PPL
+    </EuiContextMenuItem>,
+  ];
+
+  const languagePopOverButton = (
+    <EuiButton iconType="arrowDown" iconSide="right" onClick={onLanguagePopoverClick} color="text">
+      {queryLang}
+    </EuiButton>
+  );
+
   const onQuerySearch = (lang) => {
     setIsQueryRunning(true);
     dispatch(
@@ -176,7 +200,7 @@ export const DirectSearch = (props: any) => {
     );
     sqlService
       .fetch({
-        lang: lowerCase(lang[0].label),
+        lang: lowerCase(lang),
         query: tempQuery || query,
         datasource: explorerSearchMetadata.datasources[0].name,
       })
@@ -235,14 +259,17 @@ export const DirectSearch = (props: any) => {
             </EuiToolTip>
           </EuiFlexItem>
         )}
-        <EuiFlexItem key="lang-selector" className="search-area" grow={1}>
-          <EuiComboBox
-            placeholder="No language selected yet"
-            options={[{ label: 'SQL' }, { label: 'PPL' }]}
-            selectedOptions={queryLang}
-            onChange={handleQueryLanguageChange}
-            singleSelection={{ asPlainText: true }}
-          />
+        <EuiFlexItem key="lang-selector" className="search-area" grow={false}>
+          <EuiPopover
+            id="smallContextMenuExample"
+            button={languagePopOverButton}
+            isOpen={isLanguagePopoverOpen}
+            closePopover={closeLanguagePopover}
+            panelPaddingSize="none"
+            anchorPosition="downLeft"
+          >
+            <EuiContextMenuPanel size="s" items={languagePopOverItems} />
+          </EuiPopover>
         </EuiFlexItem>
         <EuiFlexItem key="search-bar" className="search-area" grow={5}>
           <Autocomplete
@@ -258,9 +285,9 @@ export const DirectSearch = (props: any) => {
             getSuggestions={getSuggestions}
             onItemSelect={onItemSelect}
             tabId={tabId}
-            isSuggestionDisabled={queryLang[0]?.label === 'SQL'}
+            isSuggestionDisabled={queryLang === 'SQL'}
           />
-          {queryLang[0]?.label && (
+          {queryLang === 'PPL' && (
             <EuiBadge
               className={`ppl-link ${
                 uiSettingsService.get('theme:darkMode') ? 'ppl-link-dark' : 'ppl-link-light'
diff --git a/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap b/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap
index feba777fae..019a73b7a3 100644
--- a/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap
+++ b/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap
@@ -954,6 +954,13 @@ exports[`Panels View Component renders panel view container with visualizations
                                 onKeyDown={[Function]}
                                 placeholder="Use PPL 'where' clauses to add filters on all visualizations [where Carrier = 'OpenSearch-Air']"
                                 spellCheck="false"
+                                style={
+                                  Object {
+                                    "height": "18px",
+                                    "marginTop": "0px",
+                                    "padding": "8px",
+                                  }
+                                }
                                 type="search"
                                 value=""
                               >
@@ -1001,6 +1008,13 @@ exports[`Panels View Component renders panel view container with visualizations
                                           onKeyDown={[Function]}
                                           placeholder="Use PPL 'where' clauses to add filters on all visualizations [where Carrier = 'OpenSearch-Air']"
                                           spellCheck="false"
+                                          style={
+                                            Object {
+                                              "height": "18px",
+                                              "marginTop": "0px",
+                                              "padding": "8px",
+                                            }
+                                          }
                                           type="search"
                                           value=""
                                         />
@@ -3157,6 +3171,13 @@ exports[`Panels View Component renders panel view container without visualizatio
                                 onKeyDown={[Function]}
                                 placeholder="Use PPL 'where' clauses to add filters on all visualizations [where Carrier = 'OpenSearch-Air']"
                                 spellCheck="false"
+                                style={
+                                  Object {
+                                    "height": "18px",
+                                    "marginTop": "0px",
+                                    "padding": "8px",
+                                  }
+                                }
                                 type="search"
                                 value=""
                               >
@@ -3204,6 +3225,13 @@ exports[`Panels View Component renders panel view container without visualizatio
                                           onKeyDown={[Function]}
                                           placeholder="Use PPL 'where' clauses to add filters on all visualizations [where Carrier = 'OpenSearch-Air']"
                                           spellCheck="false"
+                                          style={
+                                            Object {
+                                              "height": "18px",
+                                              "marginTop": "0px",
+                                              "padding": "8px",
+                                            }
+                                          }
                                           type="search"
                                           value=""
                                         />
diff --git a/public/components/event_analytics/explorer/datasources/datasources_selection.tsx b/public/components/event_analytics/explorer/datasources/datasources_selection.tsx
index 86b0fcf1a8..5d4fe5f9a7 100644
--- a/public/components/event_analytics/explorer/datasources/datasources_selection.tsx
+++ b/public/components/event_analytics/explorer/datasources/datasources_selection.tsx
@@ -2,21 +2,22 @@
  * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
-import React, { useCallback, useEffect, useState, useContext } from 'react';
+
+import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { batch, useDispatch, useSelector } from 'react-redux';
+import { LogExplorerRouterContext } from '../..';
 import { DataSourceSelectable } from '../../../../../../../src/plugins/data/public';
+import { coreRefs } from '../../../../framework/core_refs';
 import {
   selectSearchMetaData,
   update as updateSearchMetaData,
 } from '../../../event_analytics/redux/slices/search_meta_data_slice';
-import { coreRefs } from '../../../../framework/core_refs';
+import { reset as resetCountDistribution } from '../../redux/slices/count_distribution_slice';
 import { reset as resetFields } from '../../redux/slices/field_slice';
 import { reset as resetPatterns } from '../../redux/slices/patterns_slice';
 import { reset as resetQueryResults } from '../../redux/slices/query_result_slice';
-import { reset as resetVisConfig } from '../../redux/slices/viualization_config_slice';
 import { reset as resetVisualization } from '../../redux/slices/visualization_slice';
-import { reset as resetCountDistribution } from '../../redux/slices/count_distribution_slice';
-import { LogExplorerRouterContext } from '../..';
+import { reset as resetVisConfig } from '../../redux/slices/viualization_config_slice';
 
 export const DataSourceSelection = ({ tabId }) => {
   const { dataSources } = coreRefs;
@@ -117,6 +118,7 @@ export const DataSourceSelection = ({ tabId }) => {
 
   return (
     <DataSourceSelectable
+      className="dsc-selector"
       dataSources={activeDataSources}
       dataSourceOptionList={dataSourceOptionList}
       setDataSourceOptionList={setDataSourceOptionList}
diff --git a/public/components/event_analytics/explorer/explorer.scss b/public/components/event_analytics/explorer/explorer.scss
index 8617e26dfe..70a79a3a57 100644
--- a/public/components/event_analytics/explorer/explorer.scss
+++ b/public/components/event_analytics/explorer/explorer.scss
@@ -4,7 +4,7 @@
  */
 
 .liveStream {
-  margin : 8px;
+  margin: 8px;
   height: 40px;
   align-items: center;
   justify-content: center;
diff --git a/public/components/event_analytics/explorer/explorer.tsx b/public/components/event_analytics/explorer/explorer.tsx
index aae1a2de47..e20f288fa4 100644
--- a/public/components/event_analytics/explorer/explorer.tsx
+++ b/public/components/event_analytics/explorer/explorer.tsx
@@ -10,9 +10,6 @@ import {
   EuiFlexItem,
   EuiLink,
   EuiLoadingSpinner,
-  EuiPage,
-  EuiPageBody,
-  EuiPageSideBar,
   EuiPanel,
   EuiSpacer,
   EuiTabbedContent,
@@ -20,8 +17,7 @@ import {
   EuiText,
 } from '@elastic/eui';
 import { FormattedMessage } from '@osd/i18n/react';
-import classNames from 'classnames';
-import { isEmpty, isEqual, reduce } from 'lodash';
+import _, { isEmpty, isEqual, reduce } from 'lodash';
 import React, {
   ReactElement,
   useCallback,
@@ -32,14 +28,15 @@ import React, {
   useState,
 } from 'react';
 import { batch, useDispatch, useSelector } from 'react-redux';
-import _ from 'lodash';
 import { LogExplorerRouterContext } from '..';
 import {
   CREATE_TAB_PARAM,
   CREATE_TAB_PARAM_KEY,
   DATE_PICKER_FORMAT,
   DEFAULT_AVAILABILITY_QUERY,
+  DEFAULT_EMPTY_EXPLORER_FIELDS,
   EVENT_ANALYTICS_DOCUMENTATION_URL,
+  FINAL_QUERY,
   PATTERNS_EXTRACTOR_REGEX,
   PATTERNS_REGEX,
   RAW_QUERY,
@@ -56,7 +53,6 @@ import {
   TAB_EVENT_ID,
   TAB_EVENT_TITLE,
   TIME_INTERVAL_OPTIONS,
-  DEFAULT_EMPTY_EXPLORER_FIELDS,
 } from '../../../../common/constants/explorer';
 import {
   LIVE_END_TIME,
@@ -83,8 +79,8 @@ import { PPLDataFetcher } from '../../../services/data_fetchers/ppl/ppl_data_fet
 import { getSavedObjectsClient } from '../../../services/saved_objects/saved_object_client/client_factory';
 import { OSDSavedVisualizationClient } from '../../../services/saved_objects/saved_object_client/osd_saved_objects/saved_visualization';
 import {
-  PanelSavedObjectClient,
   PPLSavedQueryClient,
+  PanelSavedObjectClient,
 } from '../../../services/saved_objects/saved_object_client/ppl';
 import { PPLSavedObjectLoader } from '../../../services/saved_objects/saved_object_loaders/ppl/ppl_loader';
 import {
@@ -96,6 +92,7 @@ import { SaveAsNewQuery } from '../../../services/saved_objects/saved_object_sav
 import { sleep } from '../../common/live_tail/live_tail_button';
 import { onItemSelect, parseGetSuggestions } from '../../common/search/autocomplete_logic';
 import { Search } from '../../common/search/search';
+import { selectSearchMetaData } from '../../event_analytics/redux/slices/search_meta_data_slice';
 import { getVizContainerProps } from '../../visualizations/charts/helpers';
 import { TabContext, useFetchEvents, useFetchPatterns, useFetchVisualizations } from '../hooks';
 import { selectCountDistribution } from '../redux/slices/count_distribution_slice';
@@ -107,15 +104,13 @@ import { selectExplorerVisualization } from '../redux/slices/visualization_slice
 import {
   change as changeVisualizationConfig,
   change as changeVizConfig,
-  change as updateVizConfig,
   selectVisualizationConfig,
+  change as updateVizConfig,
 } from '../redux/slices/viualization_config_slice';
-import {
-  update as updateSearchMetaData,
-  selectSearchMetaData,
-} from '../../event_analytics/redux/slices/search_meta_data_slice';
 import { formatError, getDefaultVisConfig } from '../utils';
 import { getContentTabTitle, getDateRange } from '../utils/utils';
+import { DataSourceSelection } from './datasources/datasources_selection';
+import { DirectQueryRunning } from './direct_query_running';
 import { DataGrid } from './events_views/data_grid';
 import { HitsCounter } from './hits_counter/hits_counter';
 import { LogPatterns } from './log_patterns/log_patterns';
@@ -124,8 +119,6 @@ import { Sidebar } from './sidebar';
 import { TimechartHeader } from './timechart_header';
 import { ExplorerVisualizations } from './visualizations';
 import { CountDistribution } from './visualizations/count_distribution';
-import { DataSourceSelection } from './datasources/datasources_selection';
-import { DirectQueryRunning } from './direct_query_running';
 import { DirectQueryVisualization } from './visualizations/direct_query_vis';
 
 export const Explorer = ({
@@ -430,10 +423,19 @@ export const Explorer = ({
     }
   };
 
-  const mainSectionClassName = classNames({
-    'col-md-8': !isSidebarClosed,
-    'col-md-12': isSidebarClosed,
-  });
+  useEffect(() => {
+    if (explorerSearchMeta.datasources?.[0]?.type !== 'DEFAULT_INDEX_PATTERNS') {
+      dispatch(
+        changeQuery({
+          tabId,
+          query: {
+            [RAW_QUERY]: '',
+            [FINAL_QUERY]: '',
+          },
+        })
+      );
+    }
+  }, [explorerSearchMeta.datasources]);
 
   const handleOverrideTimestamp = async (timestamp: IField) => {
     setIsOverridingTimestamp(true);
@@ -484,56 +486,58 @@ export const Explorer = ({
 
   const mainContent = useMemo(() => {
     return (
-      <div className={`dscWrapper ${mainSectionClassName}`}>
+      <div className="dscWrapper col-md-12">
         {explorerData && !isEmpty(explorerData.jsonData) ? (
           <EuiFlexGroup direction="column" gutterSize="none">
-            <EuiFlexItem grow={false}>
-              <EuiPanel hasBorder={false} hasShadow={false} paddingSize="s" color="transparent">
-                {/* <EuiPanel paddingSize="s" style={{ height: '100%' }}> */}
-                {countDistribution?.data && !isLiveTailOnRef.current && (
-                  <>
-                    <HitsCounter
-                      hits={_.sum(countDistribution.data['count()'])}
-                      showResetButton={false}
-                      onResetQuery={() => {}}
-                    />
-                    <TimechartHeader
-                      options={timeIntervalOptions}
-                      onChangeInterval={(selectedIntrv) => {
-                        const intervalOptionsIndex = timeIntervalOptions.findIndex(
-                          (item) => item.value === selectedIntrv
-                        );
-                        const intrv = selectedIntrv.replace(/^auto_/, '');
-                        getCountVisualizations(intrv);
-                        selectedIntervalRef.current = timeIntervalOptions[intervalOptionsIndex];
-                        getPatterns(intrv, getErrorHandler('Error fetching patterns'));
-                      }}
-                      stateInterval={selectedIntervalRef.current?.value}
-                      startTime={appLogEvents ? startTime : dateRange[0]}
-                      endTime={appLogEvents ? endTime : dateRange[1]}
-                    />
-                    <CountDistribution
-                      countDistribution={countDistribution}
-                      selectedInterval={selectedIntervalRef.current?.value}
-                      startTime={appLogEvents ? startTime : dateRange[0]}
-                      endTime={appLogEvents ? endTime : dateRange[1]}
+            {explorerSearchMeta.datasources?.[0]?.type === 'DEFAULT_INDEX_PATTERNS' && (
+              <EuiFlexItem grow={false}>
+                <EuiPanel hasBorder={false} hasShadow={false} paddingSize="s" color="transparent">
+                  {/* <EuiPanel paddingSize="s" style={{ height: '100%' }}> */}
+                  {countDistribution?.data && !isLiveTailOnRef.current && (
+                    <>
+                      <HitsCounter
+                        hits={_.sum(countDistribution.data['count()'])}
+                        showResetButton={false}
+                        onResetQuery={() => {}}
+                      />
+                      <TimechartHeader
+                        options={timeIntervalOptions}
+                        onChangeInterval={(selectedIntrv) => {
+                          const intervalOptionsIndex = timeIntervalOptions.findIndex(
+                            (item) => item.value === selectedIntrv
+                          );
+                          const intrv = selectedIntrv.replace(/^auto_/, '');
+                          getCountVisualizations(intrv);
+                          selectedIntervalRef.current = timeIntervalOptions[intervalOptionsIndex];
+                          getPatterns(intrv, getErrorHandler('Error fetching patterns'));
+                        }}
+                        stateInterval={selectedIntervalRef.current?.value}
+                        startTime={appLogEvents ? startTime : dateRange[0]}
+                        endTime={appLogEvents ? endTime : dateRange[1]}
+                      />
+                      <CountDistribution
+                        countDistribution={countDistribution}
+                        selectedInterval={selectedIntervalRef.current?.value}
+                        startTime={appLogEvents ? startTime : dateRange[0]}
+                        endTime={appLogEvents ? endTime : dateRange[1]}
+                      />
+                    </>
+                  )}
+                </EuiPanel>
+              </EuiFlexItem>
+            )}
+            {explorerSearchMeta.datasources?.[0]?.type === 'DEFAULT_INDEX_PATTERNS' && (
+              <EuiFlexItem grow={false}>
+                <EuiPanel hasBorder={false} hasShadow={false} paddingSize="s" color="transparent">
+                  <EuiPanel paddingSize="s" style={{ height: '100%' }}>
+                    <LogPatterns
+                      selectedIntervalUnit={selectedIntervalRef.current}
+                      handleTimeRangePickerRefresh={handleTimeRangePickerRefresh}
                     />
-                  </>
-                )}
-              </EuiPanel>
-            </EuiFlexItem>
-
-            <EuiFlexItem grow={false}>
-              <EuiPanel hasBorder={false} hasShadow={false} paddingSize="s" color="transparent">
-                <EuiPanel paddingSize="s" style={{ height: '100%' }}>
-                  <LogPatterns
-                    selectedIntervalUnit={selectedIntervalRef.current}
-                    handleTimeRangePickerRefresh={handleTimeRangePickerRefresh}
-                  />
+                  </EuiPanel>
                 </EuiPanel>
-              </EuiPanel>
-            </EuiFlexItem>
-
+              </EuiFlexItem>
+            )}
             <EuiFlexItem grow={false}>
               <EuiPanel hasBorder={false} hasShadow={false} paddingSize="s" color="transparent">
                 <section
@@ -648,7 +652,11 @@ export const Explorer = ({
         queryManager={queryManager}
       />
     ) : (
-      <DirectQueryVisualization />
+      <DirectQueryVisualization
+        currentDataSource={
+          explorerSearchMeta.datasources ? explorerSearchMeta.datasources?.[0]?.label : ''
+        }
+      />
     );
   }, [
     query,
@@ -912,9 +920,14 @@ export const Explorer = ({
       >
         <EuiFlexGroup direction="row">
           <EuiFlexItem grow={false}>
-            <EuiFlexGroup direction="column">
+            <EuiFlexGroup direction="column" gutterSize="s">
               <EuiFlexItem grow={false}>
-                <DataSourceSelection tabId={tabId} />
+                <div
+                  className="dscSelector"
+                  style={{ width: '300px', marginTop: '8px', marginLeft: '10px' }}
+                >
+                  <DataSourceSelection tabId={tabId} />
+                </div>
               </EuiFlexItem>
               <EuiFlexItem>
                 <div className="explorerFieldSelector">
diff --git a/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap b/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap
index f42787fa55..cfb42b7aa8 100644
--- a/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap
+++ b/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap
@@ -4351,188 +4351,255 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="agent"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "agent",
+                                                              "type": "string",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="agent"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "agent",
-                                                                  "type": "string",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-agent-showDetails"
-                                                                    fieldAction={
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-agent-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
                                                                       <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-labelledby="override_pattern"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="text"
-                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                              iconType="inputOutput"
-                                                                              onClick={[Function]}
-                                                                              size="s"
-                                                                            >
-                                                                              Override
-                                                                            </EuiButtonIcon>
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
+                                                                        <EuiButtonIcon
+                                                                          aria-labelledby="override_pattern"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="text"
+                                                                          data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                          iconType="inputOutput"
+                                                                          onClick={[Function]}
+                                                                          size="s"
                                                                         >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add agent to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-agent"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
+                                                                          Override
+                                                                        </EuiButtonIcon>
                                                                       </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="string"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-agent"
-                                                                        title="agent"
-                                                                      >
-                                                                        <EuiText
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add agent to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-agent"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
                                                                           size="xs"
-                                                                        >
-                                                                          agent
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="string"
                                                                   />
                                                                 }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-agent"
+                                                                    title="agent"
+                                                                  >
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      agent
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
                                                               >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-agent-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            Override
+                                                                          </EuiButtonIcon>
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add agent to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-agent"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="string"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-agent"
+                                                                      title="agent"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        agent
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
                                                                 >
                                                                   <div
-                                                                    className="euiPopover__anchor"
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-agent-showDetails"
-                                                                      fieldAction={
-                                                                        <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                Override
-                                                                              </EuiButtonIcon>
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add agent to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-agent"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                        </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-agent-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
                                                                         <FieldIcon
                                                                           type="string"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
+                                                                        >
+                                                                          <EuiToken
+                                                                            aria-label="string"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="string"
+                                                                          >
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-label="string"
+                                                                                size="l"
+                                                                                title="string"
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="string"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="string"
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="string"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </span>
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
                                                                         <span
                                                                           className="dscSidebarField__name"
                                                                           data-test-subj="field-agent"
@@ -4541,273 +4608,194 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                           <EuiText
                                                                             size="xs"
                                                                           >
-                                                                            agent
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
+                                                                            >
+                                                                              agent
+                                                                            </div>
                                                                           </EuiText>
                                                                         </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-agent-showDetails"
-                                                                          onClick={[Function]}
-                                                                        >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
-                                                                          >
-                                                                            <FieldIcon
-                                                                              type="string"
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            <button
+                                                                              aria-labelledby="override_pattern"
+                                                                              className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
+                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiToken
-                                                                                aria-label="string"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
-                                                                                size="l"
-                                                                                title="string"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inputOutput"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-label="string"
-                                                                                    size="l"
-                                                                                    title="string"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="string"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="string"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="string"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-agent"
-                                                                              title="agent"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add agent to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-agent"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add agent to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-agent"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  agent
-                                                                                </div>
-                                                                              </EuiText>
-                                                                            </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
-                                                                        >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            >
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                <button
-                                                                                  aria-labelledby="override_pattern"
-                                                                                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
-                                                                                  data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inputOutput"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add agent to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-agent"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add agent to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-agent"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -4900,164 +4888,231 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="bytes"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "bytes",
+                                                              "type": "long",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="bytes"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "bytes",
-                                                                  "type": "long",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-bytes-showDetails"
-                                                                    fieldAction={
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-bytes-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
                                                                       <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add bytes to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-bytes"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                      </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="long"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-bytes"
-                                                                        title="bytes"
-                                                                      >
-                                                                        <EuiText
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add bytes to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-bytes"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
                                                                           size="xs"
-                                                                        >
-                                                                          bytes
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="long"
                                                                   />
                                                                 }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
-                                                              >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
-                                                                >
-                                                                  <div
-                                                                    className="euiPopover__anchor"
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-bytes"
+                                                                    title="bytes"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-bytes-showDetails"
-                                                                      fieldAction={
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      bytes
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
+                                                              >
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-bytes-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
                                                                         <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add bytes to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-bytes"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add bytes to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-bytes"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
                                                                         </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="long"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-bytes"
+                                                                      title="bytes"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        bytes
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
+                                                                >
+                                                                  <div
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  >
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-bytes-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
                                                                         <FieldIcon
                                                                           type="long"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
+                                                                        >
+                                                                          <EuiToken
+                                                                            aria-label="long"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="long"
+                                                                          >
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-label="long"
+                                                                                size="l"
+                                                                                title="long"
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="long"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="long"
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="long"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </span>
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
                                                                         <span
                                                                           className="dscSidebarField__name"
                                                                           data-test-subj="field-bytes"
@@ -5066,226 +5121,613 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                           <EuiText
                                                                             size="xs"
                                                                           >
-                                                                            bytes
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
+                                                                            >
+                                                                              bytes
+                                                                            </div>
                                                                           </EuiText>
                                                                         </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-bytes-showDetails"
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add bytes to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-bytes"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add bytes to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-bytes"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          >
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
+                                                                  </div>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
+                                                      </div>
+                                                    </Draggable>
+                                                  </Connect(Draggable)>
+                                                </PrivateDraggable>
+                                              </PublicDraggable>
+                                            </EuiDraggable>
+                                            <EuiDraggable
+                                              className="dscSidebar__item sidebar_content"
+                                              data-attr-field="clientip"
+                                              draggableId=""
+                                              index={2}
+                                              key="fieldclientip"
+                                              spacing="m"
+                                            >
+                                              <PublicDraggable
+                                                data-attr-field="clientip"
+                                                draggableId=""
+                                                index={2}
+                                                isDragDisabled={false}
+                                              >
+                                                <PrivateDraggable
+                                                  canDragInteractiveElements={false}
+                                                  data-attr-field="clientip"
+                                                  draggableId=""
+                                                  index={2}
+                                                  isClone={false}
+                                                  isDragDisabled={false}
+                                                  isEnabled={true}
+                                                  shouldRespectForcePress={false}
+                                                >
+                                                  <Connect(Draggable)
+                                                    canDragInteractiveElements={false}
+                                                    data-attr-field="clientip"
+                                                    draggableId=""
+                                                    index={2}
+                                                    isClone={false}
+                                                    isDragDisabled={false}
+                                                    isEnabled={true}
+                                                    shouldRespectForcePress={false}
+                                                  >
+                                                    <Draggable
+                                                      canDragInteractiveElements={false}
+                                                      data-attr-field="clientip"
+                                                      draggableId=""
+                                                      dropAnimationFinished={[Function]}
+                                                      index={2}
+                                                      isClone={false}
+                                                      isDragDisabled={false}
+                                                      isEnabled={true}
+                                                      mapped={
+                                                        Object {
+                                                          "combineTargetFor": null,
+                                                          "offset": Object {
+                                                            "x": 0,
+                                                            "y": 0,
+                                                          },
+                                                          "shouldAnimateDisplacement": true,
+                                                          "snapshot": Object {
+                                                            "combineTargetFor": null,
+                                                            "combineWith": null,
+                                                            "draggingOver": null,
+                                                            "dropAnimation": null,
+                                                            "isClone": false,
+                                                            "isDragging": false,
+                                                            "isDropAnimating": false,
+                                                            "mode": null,
+                                                          },
+                                                          "type": "SECONDARY",
+                                                        }
+                                                      }
+                                                      shouldRespectForcePress={false}
+                                                    >
+                                                      <div
+                                                        aria-describedby="rbd-hidden-text-1-hidden-text-1"
+                                                        className="euiDraggable euiDraggable--m dscSidebar__item sidebar_content"
+                                                        data-rbd-drag-handle-context-id="1"
+                                                        data-rbd-drag-handle-draggable-id=""
+                                                        data-rbd-draggable-context-id="1"
+                                                        data-rbd-draggable-id=""
+                                                        data-test-subj="draggable"
+                                                        draggable={false}
+                                                        onDragStart={[Function]}
+                                                        onTransitionEnd={null}
+                                                        role="button"
+                                                        style={
+                                                          Object {
+                                                            "transform": null,
+                                                            "transition": null,
+                                                          }
+                                                        }
+                                                        tabIndex={0}
+                                                      >
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "clientip",
+                                                              "type": "ip",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
+                                                        >
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-clientip-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add clientip to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-clientip"
+                                                                          iconType="plusInCircleFilled"
                                                                           onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
+                                                                          size="xs"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="ip"
+                                                                  />
+                                                                }
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-clientip"
+                                                                    title="clientip"
+                                                                  >
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      clientip
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
+                                                              >
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-clientip-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add clientip to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-clientip"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="ip"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-clientip"
+                                                                      title="clientip"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        clientip
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
+                                                                >
+                                                                  <div
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  >
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-clientip-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
+                                                                        <FieldIcon
+                                                                          type="ip"
                                                                         >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
+                                                                          <EuiToken
+                                                                            aria-label="ip"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenIP"
+                                                                            size="l"
+                                                                            title="ip"
                                                                           >
-                                                                            <FieldIcon
-                                                                              type="long"
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis9 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
                                                                             >
-                                                                              <EuiToken
-                                                                                aria-label="long"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
+                                                                              <EuiIcon
+                                                                                aria-label="ip"
                                                                                 size="l"
-                                                                                title="long"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
+                                                                                title="ip"
+                                                                                type="tokenIP"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="ip"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="ip"
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-label="long"
-                                                                                    size="l"
-                                                                                    title="long"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="long"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="long"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="long"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-bytes"
-                                                                              title="bytes"
-                                                                            >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
-                                                                                >
-                                                                                  bytes
-                                                                                </div>
-                                                                              </EuiText>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="ip"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
                                                                             </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
+                                                                        <span
+                                                                          className="dscSidebarField__name"
+                                                                          data-test-subj="field-clientip"
+                                                                          title="clientip"
                                                                         >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
+                                                                          <EuiText
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add bytes to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-bytes"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add bytes to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-bytes"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
+                                                                              clientip
+                                                                            </div>
+                                                                          </EuiText>
+                                                                        </span>
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
+                                                                    >
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add clientip to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-clientip"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add clientip to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-clientip"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          >
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -5294,23 +5736,23 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                             </EuiDraggable>
                                             <EuiDraggable
                                               className="dscSidebar__item sidebar_content"
-                                              data-attr-field="clientip"
+                                              data-attr-field="event"
                                               draggableId=""
-                                              index={2}
-                                              key="fieldclientip"
+                                              index={3}
+                                              key="fieldevent"
                                               spacing="m"
                                             >
                                               <PublicDraggable
-                                                data-attr-field="clientip"
+                                                data-attr-field="event"
                                                 draggableId=""
-                                                index={2}
+                                                index={3}
                                                 isDragDisabled={false}
                                               >
                                                 <PrivateDraggable
                                                   canDragInteractiveElements={false}
-                                                  data-attr-field="clientip"
+                                                  data-attr-field="event"
                                                   draggableId=""
-                                                  index={2}
+                                                  index={3}
                                                   isClone={false}
                                                   isDragDisabled={false}
                                                   isEnabled={true}
@@ -5318,9 +5760,9 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                 >
                                                   <Connect(Draggable)
                                                     canDragInteractiveElements={false}
-                                                    data-attr-field="clientip"
+                                                    data-attr-field="event"
                                                     draggableId=""
-                                                    index={2}
+                                                    index={3}
                                                     isClone={false}
                                                     isDragDisabled={false}
                                                     isEnabled={true}
@@ -5328,10 +5770,10 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                   >
                                                     <Draggable
                                                       canDragInteractiveElements={false}
-                                                      data-attr-field="clientip"
+                                                      data-attr-field="event"
                                                       draggableId=""
                                                       dropAnimationFinished={[Function]}
-                                                      index={2}
+                                                      index={3}
                                                       isClone={false}
                                                       isDragDisabled={false}
                                                       isEnabled={true}
@@ -5378,392 +5820,380 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="clientip"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "event",
+                                                              "type": "struct",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="clientip"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "clientip",
-                                                                  "type": "ip",
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-event-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add event to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-event"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
+                                                                          size="xs"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
                                                                 }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="struct"
+                                                                  />
+                                                                }
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-event"
+                                                                    title="event"
+                                                                  >
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      event
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
                                                             >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-clientip-showDetails"
-                                                                    fieldAction={
-                                                                      <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add clientip to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-clientip"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                      </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="ip"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-clientip"
-                                                                        title="clientip"
-                                                                      >
-                                                                        <EuiText
-                                                                          size="xs"
-                                                                        >
-                                                                          clientip
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
-                                                                  />
-                                                                }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
+                                                              <div
+                                                                className="euiPopover__anchor"
                                                               >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-event-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add event to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-event"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="struct"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-event"
+                                                                      title="event"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        event
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
                                                                 >
                                                                   <div
-                                                                    className="euiPopover__anchor"
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-clientip-showDetails"
-                                                                      fieldAction={
-                                                                        <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add clientip to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-clientip"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                        </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-event-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
                                                                         <FieldIcon
-                                                                          type="ip"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
+                                                                          type="struct"
+                                                                        >
+                                                                          <EuiToken
+                                                                            aria-label="struct"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="struct"
+                                                                          >
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-label="struct"
+                                                                                size="l"
+                                                                                title="struct"
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="struct"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="struct"
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="struct"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </span>
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
                                                                         <span
                                                                           className="dscSidebarField__name"
-                                                                          data-test-subj="field-clientip"
-                                                                          title="clientip"
+                                                                          data-test-subj="field-event"
+                                                                          title="event"
                                                                         >
                                                                           <EuiText
                                                                             size="xs"
                                                                           >
-                                                                            clientip
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
+                                                                            >
+                                                                              event
+                                                                            </div>
                                                                           </EuiText>
                                                                         </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-clientip-showDetails"
-                                                                          onClick={[Function]}
-                                                                        >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
-                                                                          >
-                                                                            <FieldIcon
-                                                                              type="ip"
-                                                                            >
-                                                                              <EuiToken
-                                                                                aria-label="ip"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenIP"
-                                                                                size="l"
-                                                                                title="ip"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis9 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-label="ip"
-                                                                                    size="l"
-                                                                                    title="ip"
-                                                                                    type="tokenIP"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="ip"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="ip"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="ip"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-clientip"
-                                                                              title="clientip"
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add event to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-event"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add event to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-event"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  clientip
-                                                                                </div>
-                                                                              </EuiText>
-                                                                            </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
-                                                                        >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add clientip to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-clientip"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add clientip to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-clientip"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -5772,23 +6202,23 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                             </EuiDraggable>
                                             <EuiDraggable
                                               className="dscSidebar__item sidebar_content"
-                                              data-attr-field="event"
+                                              data-attr-field="extension"
                                               draggableId=""
-                                              index={3}
-                                              key="fieldevent"
+                                              index={4}
+                                              key="fieldextension"
                                               spacing="m"
                                             >
                                               <PublicDraggable
-                                                data-attr-field="event"
+                                                data-attr-field="extension"
                                                 draggableId=""
-                                                index={3}
+                                                index={4}
                                                 isDragDisabled={false}
                                               >
                                                 <PrivateDraggable
                                                   canDragInteractiveElements={false}
-                                                  data-attr-field="event"
+                                                  data-attr-field="extension"
                                                   draggableId=""
-                                                  index={3}
+                                                  index={4}
                                                   isClone={false}
                                                   isDragDisabled={false}
                                                   isEnabled={true}
@@ -5796,9 +6226,9 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                 >
                                                   <Connect(Draggable)
                                                     canDragInteractiveElements={false}
-                                                    data-attr-field="event"
+                                                    data-attr-field="extension"
                                                     draggableId=""
-                                                    index={3}
+                                                    index={4}
                                                     isClone={false}
                                                     isDragDisabled={false}
                                                     isEnabled={true}
@@ -5806,10 +6236,10 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                   >
                                                     <Draggable
                                                       canDragInteractiveElements={false}
-                                                      data-attr-field="event"
+                                                      data-attr-field="extension"
                                                       draggableId=""
                                                       dropAnimationFinished={[Function]}
-                                                      index={3}
+                                                      index={4}
                                                       isClone={false}
                                                       isDragDisabled={false}
                                                       isEnabled={true}
@@ -5856,392 +6286,451 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="event"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "extension",
+                                                              "type": "string",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="event"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "event",
-                                                                  "type": "struct",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-event-showDetails"
-                                                                    fieldAction={
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-extension-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
                                                                       <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
+                                                                        <EuiButtonIcon
+                                                                          aria-labelledby="override_pattern"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="text"
+                                                                          data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                          iconType="inputOutput"
+                                                                          onClick={[Function]}
+                                                                          size="s"
                                                                         >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add event to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-event"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
+                                                                          Override
+                                                                        </EuiButtonIcon>
                                                                       </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="struct"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-event"
-                                                                        title="event"
-                                                                      >
-                                                                        <EuiText
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add extension to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-extension"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
                                                                           size="xs"
-                                                                        >
-                                                                          event
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="string"
                                                                   />
                                                                 }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-extension"
+                                                                    title="extension"
+                                                                  >
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      extension
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
                                                               >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-extension-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            Override
+                                                                          </EuiButtonIcon>
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add extension to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-extension"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="string"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-extension"
+                                                                      title="extension"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        extension
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
                                                                 >
                                                                   <div
-                                                                    className="euiPopover__anchor"
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-event-showDetails"
-                                                                      fieldAction={
-                                                                        <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add event to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-event"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                        </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-extension-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
                                                                         <FieldIcon
-                                                                          type="struct"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
-                                                                        <span
-                                                                          className="dscSidebarField__name"
-                                                                          data-test-subj="field-event"
-                                                                          title="event"
+                                                                          type="string"
                                                                         >
-                                                                          <EuiText
-                                                                            size="xs"
+                                                                          <EuiToken
+                                                                            aria-label="string"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="string"
                                                                           >
-                                                                            event
-                                                                          </EuiText>
-                                                                        </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
-                                                                    >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-label="string"
+                                                                                size="l"
+                                                                                title="string"
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="string"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="string"
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="string"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </span>
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-event-showDetails"
-                                                                          onClick={[Function]}
+                                                                        <span
+                                                                          className="dscSidebarField__name"
+                                                                          data-test-subj="field-extension"
+                                                                          title="extension"
                                                                         >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
+                                                                          <EuiText
+                                                                            size="xs"
                                                                           >
-                                                                            <FieldIcon
-                                                                              type="struct"
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
                                                                             >
-                                                                              <EuiToken
-                                                                                aria-label="struct"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
-                                                                                size="l"
-                                                                                title="struct"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
+                                                                              extension
+                                                                            </div>
+                                                                          </EuiText>
+                                                                        </span>
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
+                                                                    >
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            <button
+                                                                              aria-labelledby="override_pattern"
+                                                                              className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
+                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inputOutput"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-label="struct"
-                                                                                    size="l"
-                                                                                    title="struct"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="struct"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="struct"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="struct"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-event"
-                                                                              title="event"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add extension to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-extension"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add extension to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-extension"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  event
-                                                                                </div>
-                                                                              </EuiText>
-                                                                            </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
-                                                                        >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add event to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-event"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add event to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-event"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -6250,23 +6739,23 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                             </EuiDraggable>
                                             <EuiDraggable
                                               className="dscSidebar__item sidebar_content"
-                                              data-attr-field="extension"
+                                              data-attr-field="geo"
                                               draggableId=""
-                                              index={4}
-                                              key="fieldextension"
+                                              index={5}
+                                              key="fieldgeo"
                                               spacing="m"
                                             >
                                               <PublicDraggable
-                                                data-attr-field="extension"
+                                                data-attr-field="geo"
                                                 draggableId=""
-                                                index={4}
+                                                index={5}
                                                 isDragDisabled={false}
                                               >
                                                 <PrivateDraggable
                                                   canDragInteractiveElements={false}
-                                                  data-attr-field="extension"
+                                                  data-attr-field="geo"
                                                   draggableId=""
-                                                  index={4}
+                                                  index={5}
                                                   isClone={false}
                                                   isDragDisabled={false}
                                                   isEnabled={true}
@@ -6274,9 +6763,9 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                 >
                                                   <Connect(Draggable)
                                                     canDragInteractiveElements={false}
-                                                    data-attr-field="extension"
+                                                    data-attr-field="geo"
                                                     draggableId=""
-                                                    index={4}
+                                                    index={5}
                                                     isClone={false}
                                                     isDragDisabled={false}
                                                     isEnabled={true}
@@ -6284,10 +6773,10 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                   >
                                                     <Draggable
                                                       canDragInteractiveElements={false}
-                                                      data-attr-field="extension"
+                                                      data-attr-field="geo"
                                                       draggableId=""
                                                       dropAnimationFinished={[Function]}
-                                                      index={4}
+                                                      index={5}
                                                       isClone={false}
                                                       isDragDisabled={false}
                                                       isEnabled={true}
@@ -6334,463 +6823,380 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="extension"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "geo",
+                                                              "type": "struct",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="extension"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "extension",
-                                                                  "type": "string",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-extension-showDetails"
-                                                                    fieldAction={
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-geo-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
                                                                       <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-labelledby="override_pattern"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="text"
-                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                              iconType="inputOutput"
-                                                                              onClick={[Function]}
-                                                                              size="s"
-                                                                            >
-                                                                              Override
-                                                                            </EuiButtonIcon>
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add extension to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-extension"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                      </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="string"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-extension"
-                                                                        title="extension"
-                                                                      >
-                                                                        <EuiText
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add geo to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-geo"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
                                                                           size="xs"
-                                                                        >
-                                                                          extension
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="struct"
                                                                   />
                                                                 }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-geo"
+                                                                    title="geo"
+                                                                  >
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      geo
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
                                                               >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-geo-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add geo to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-geo"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="struct"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-geo"
+                                                                      title="geo"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        geo
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
                                                                 >
                                                                   <div
-                                                                    className="euiPopover__anchor"
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-extension-showDetails"
-                                                                      fieldAction={
-                                                                        <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                Override
-                                                                              </EuiButtonIcon>
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add extension to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-extension"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                        </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-geo-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
                                                                         <FieldIcon
-                                                                          type="string"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
+                                                                          type="struct"
+                                                                        >
+                                                                          <EuiToken
+                                                                            aria-label="struct"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="struct"
+                                                                          >
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-label="struct"
+                                                                                size="l"
+                                                                                title="struct"
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="struct"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="struct"
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="struct"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </span>
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
                                                                         <span
                                                                           className="dscSidebarField__name"
-                                                                          data-test-subj="field-extension"
-                                                                          title="extension"
+                                                                          data-test-subj="field-geo"
+                                                                          title="geo"
                                                                         >
                                                                           <EuiText
                                                                             size="xs"
                                                                           >
-                                                                            extension
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
+                                                                            >
+                                                                              geo
+                                                                            </div>
                                                                           </EuiText>
                                                                         </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-extension-showDetails"
-                                                                          onClick={[Function]}
-                                                                        >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
-                                                                          >
-                                                                            <FieldIcon
-                                                                              type="string"
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add geo to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-geo"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add geo to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-geo"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiToken
-                                                                                aria-label="string"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
-                                                                                size="l"
-                                                                                title="string"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-label="string"
-                                                                                    size="l"
-                                                                                    title="string"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="string"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="string"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="string"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-extension"
-                                                                              title="extension"
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  extension
-                                                                                </div>
-                                                                              </EuiText>
-                                                                            </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
-                                                                        >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            >
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                <button
-                                                                                  aria-labelledby="override_pattern"
-                                                                                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
-                                                                                  data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inputOutput"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add extension to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-extension"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add extension to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-extension"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -6799,23 +7205,23 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                             </EuiDraggable>
                                             <EuiDraggable
                                               className="dscSidebar__item sidebar_content"
-                                              data-attr-field="geo"
+                                              data-attr-field="host"
                                               draggableId=""
-                                              index={5}
-                                              key="fieldgeo"
+                                              index={6}
+                                              key="fieldhost"
                                               spacing="m"
                                             >
                                               <PublicDraggable
-                                                data-attr-field="geo"
+                                                data-attr-field="host"
                                                 draggableId=""
-                                                index={5}
+                                                index={6}
                                                 isDragDisabled={false}
                                               >
                                                 <PrivateDraggable
                                                   canDragInteractiveElements={false}
-                                                  data-attr-field="geo"
+                                                  data-attr-field="host"
                                                   draggableId=""
-                                                  index={5}
+                                                  index={6}
                                                   isClone={false}
                                                   isDragDisabled={false}
                                                   isEnabled={true}
@@ -6823,9 +7229,9 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                 >
                                                   <Connect(Draggable)
                                                     canDragInteractiveElements={false}
-                                                    data-attr-field="geo"
+                                                    data-attr-field="host"
                                                     draggableId=""
-                                                    index={5}
+                                                    index={6}
                                                     isClone={false}
                                                     isDragDisabled={false}
                                                     isEnabled={true}
@@ -6833,10 +7239,10 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                   >
                                                     <Draggable
                                                       canDragInteractiveElements={false}
-                                                      data-attr-field="geo"
+                                                      data-attr-field="host"
                                                       draggableId=""
                                                       dropAnimationFinished={[Function]}
-                                                      index={5}
+                                                      index={6}
                                                       isClone={false}
                                                       isDragDisabled={false}
                                                       isEnabled={true}
@@ -6883,392 +7289,451 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="geo"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "host",
+                                                              "type": "string",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="geo"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "geo",
-                                                                  "type": "struct",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-geo-showDetails"
-                                                                    fieldAction={
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-host-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
                                                                       <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
+                                                                        <EuiButtonIcon
+                                                                          aria-labelledby="override_pattern"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="text"
+                                                                          data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                          iconType="inputOutput"
+                                                                          onClick={[Function]}
+                                                                          size="s"
                                                                         >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add geo to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-geo"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
+                                                                          Override
+                                                                        </EuiButtonIcon>
                                                                       </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="struct"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-geo"
-                                                                        title="geo"
-                                                                      >
-                                                                        <EuiText
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add host to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-host"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
                                                                           size="xs"
-                                                                        >
-                                                                          geo
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="string"
                                                                   />
                                                                 }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-host"
+                                                                    title="host"
+                                                                  >
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      host
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
                                                               >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-host-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            Override
+                                                                          </EuiButtonIcon>
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add host to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-host"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="string"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-host"
+                                                                      title="host"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        host
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
                                                                 >
                                                                   <div
-                                                                    className="euiPopover__anchor"
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-geo-showDetails"
-                                                                      fieldAction={
-                                                                        <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add geo to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-geo"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                        </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-host-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
                                                                         <FieldIcon
-                                                                          type="struct"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
+                                                                          type="string"
+                                                                        >
+                                                                          <EuiToken
+                                                                            aria-label="string"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="string"
+                                                                          >
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-label="string"
+                                                                                size="l"
+                                                                                title="string"
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="string"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="string"
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="string"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </span>
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
                                                                         <span
                                                                           className="dscSidebarField__name"
-                                                                          data-test-subj="field-geo"
-                                                                          title="geo"
+                                                                          data-test-subj="field-host"
+                                                                          title="host"
                                                                         >
                                                                           <EuiText
                                                                             size="xs"
                                                                           >
-                                                                            geo
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
+                                                                            >
+                                                                              host
+                                                                            </div>
                                                                           </EuiText>
                                                                         </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-geo-showDetails"
-                                                                          onClick={[Function]}
-                                                                        >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
-                                                                          >
-                                                                            <FieldIcon
-                                                                              type="struct"
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            <button
+                                                                              aria-labelledby="override_pattern"
+                                                                              className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
+                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiToken
-                                                                                aria-label="struct"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
-                                                                                size="l"
-                                                                                title="struct"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inputOutput"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-label="struct"
-                                                                                    size="l"
-                                                                                    title="struct"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="struct"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="struct"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="struct"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-geo"
-                                                                              title="geo"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add host to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-host"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add host to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-host"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  geo
-                                                                                </div>
-                                                                              </EuiText>
-                                                                            </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
-                                                                        >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add geo to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-geo"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add geo to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-geo"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -7277,23 +7742,23 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                             </EuiDraggable>
                                             <EuiDraggable
                                               className="dscSidebar__item sidebar_content"
-                                              data-attr-field="host"
+                                              data-attr-field="index"
                                               draggableId=""
-                                              index={6}
-                                              key="fieldhost"
+                                              index={7}
+                                              key="fieldindex"
                                               spacing="m"
                                             >
                                               <PublicDraggable
-                                                data-attr-field="host"
+                                                data-attr-field="index"
                                                 draggableId=""
-                                                index={6}
+                                                index={7}
                                                 isDragDisabled={false}
                                               >
                                                 <PrivateDraggable
                                                   canDragInteractiveElements={false}
-                                                  data-attr-field="host"
+                                                  data-attr-field="index"
                                                   draggableId=""
-                                                  index={6}
+                                                  index={7}
                                                   isClone={false}
                                                   isDragDisabled={false}
                                                   isEnabled={true}
@@ -7301,9 +7766,9 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                 >
                                                   <Connect(Draggable)
                                                     canDragInteractiveElements={false}
-                                                    data-attr-field="host"
+                                                    data-attr-field="index"
                                                     draggableId=""
-                                                    index={6}
+                                                    index={7}
                                                     isClone={false}
                                                     isDragDisabled={false}
                                                     isEnabled={true}
@@ -7311,10 +7776,10 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                   >
                                                     <Draggable
                                                       canDragInteractiveElements={false}
-                                                      data-attr-field="host"
+                                                      data-attr-field="index"
                                                       draggableId=""
                                                       dropAnimationFinished={[Function]}
-                                                      index={6}
+                                                      index={7}
                                                       isClone={false}
                                                       isDragDisabled={false}
                                                       isEnabled={true}
@@ -7361,463 +7826,451 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="host"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "index",
+                                                              "type": "string",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="host"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "host",
-                                                                  "type": "string",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-host-showDetails"
-                                                                    fieldAction={
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-index-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
                                                                       <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-labelledby="override_pattern"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="text"
-                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                              iconType="inputOutput"
-                                                                              onClick={[Function]}
-                                                                              size="s"
-                                                                            >
-                                                                              Override
-                                                                            </EuiButtonIcon>
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
+                                                                        <EuiButtonIcon
+                                                                          aria-labelledby="override_pattern"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="text"
+                                                                          data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                          iconType="inputOutput"
+                                                                          onClick={[Function]}
+                                                                          size="s"
                                                                         >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add host to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-host"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
+                                                                          Override
+                                                                        </EuiButtonIcon>
                                                                       </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="string"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-host"
-                                                                        title="host"
-                                                                      >
-                                                                        <EuiText
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add index to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-index"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
                                                                           size="xs"
-                                                                        >
-                                                                          host
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="string"
                                                                   />
                                                                 }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-index"
+                                                                    title="index"
+                                                                  >
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      index
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
                                                               >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-index-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            Override
+                                                                          </EuiButtonIcon>
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add index to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-index"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="string"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-index"
+                                                                      title="index"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        index
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
                                                                 >
                                                                   <div
-                                                                    className="euiPopover__anchor"
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-host-showDetails"
-                                                                      fieldAction={
-                                                                        <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                Override
-                                                                              </EuiButtonIcon>
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add host to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-host"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                        </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-index-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
                                                                         <FieldIcon
                                                                           type="string"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
+                                                                        >
+                                                                          <EuiToken
+                                                                            aria-label="string"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="string"
+                                                                          >
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-label="string"
+                                                                                size="l"
+                                                                                title="string"
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="string"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="string"
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="string"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </span>
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
                                                                         <span
                                                                           className="dscSidebarField__name"
-                                                                          data-test-subj="field-host"
-                                                                          title="host"
+                                                                          data-test-subj="field-index"
+                                                                          title="index"
                                                                         >
                                                                           <EuiText
                                                                             size="xs"
                                                                           >
-                                                                            host
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
+                                                                            >
+                                                                              index
+                                                                            </div>
                                                                           </EuiText>
                                                                         </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-host-showDetails"
-                                                                          onClick={[Function]}
-                                                                        >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
-                                                                          >
-                                                                            <FieldIcon
-                                                                              type="string"
-                                                                            >
-                                                                              <EuiToken
-                                                                                aria-label="string"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
-                                                                                size="l"
-                                                                                title="string"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-label="string"
-                                                                                    size="l"
-                                                                                    title="string"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="string"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="string"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="string"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-host"
-                                                                              title="host"
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            <button
+                                                                              aria-labelledby="override_pattern"
+                                                                              className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
+                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inputOutput"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  host
-                                                                                </div>
-                                                                              </EuiText>
-                                                                            </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
-                                                                        >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add index to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-index"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add index to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-index"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                <button
-                                                                                  aria-labelledby="override_pattern"
-                                                                                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
-                                                                                  data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inputOutput"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add host to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-host"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add host to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-host"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -7826,23 +8279,23 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                             </EuiDraggable>
                                             <EuiDraggable
                                               className="dscSidebar__item sidebar_content"
-                                              data-attr-field="index"
+                                              data-attr-field="ip"
                                               draggableId=""
-                                              index={7}
-                                              key="fieldindex"
+                                              index={8}
+                                              key="fieldip"
                                               spacing="m"
                                             >
                                               <PublicDraggable
-                                                data-attr-field="index"
+                                                data-attr-field="ip"
                                                 draggableId=""
-                                                index={7}
+                                                index={8}
                                                 isDragDisabled={false}
                                               >
                                                 <PrivateDraggable
                                                   canDragInteractiveElements={false}
-                                                  data-attr-field="index"
+                                                  data-attr-field="ip"
                                                   draggableId=""
-                                                  index={7}
+                                                  index={8}
                                                   isClone={false}
                                                   isDragDisabled={false}
                                                   isEnabled={true}
@@ -7850,9 +8303,9 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                 >
                                                   <Connect(Draggable)
                                                     canDragInteractiveElements={false}
-                                                    data-attr-field="index"
+                                                    data-attr-field="ip"
                                                     draggableId=""
-                                                    index={7}
+                                                    index={8}
                                                     isClone={false}
                                                     isDragDisabled={false}
                                                     isEnabled={true}
@@ -7860,10 +8313,10 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                   >
                                                     <Draggable
                                                       canDragInteractiveElements={false}
-                                                      data-attr-field="index"
+                                                      data-attr-field="ip"
                                                       draggableId=""
                                                       dropAnimationFinished={[Function]}
-                                                      index={7}
+                                                      index={8}
                                                       isClone={false}
                                                       isDragDisabled={false}
                                                       isEnabled={true}
@@ -7910,463 +8363,380 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="index"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "ip",
+                                                              "type": "ip",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="index"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "index",
-                                                                  "type": "string",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-index-showDetails"
-                                                                    fieldAction={
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-ip-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
                                                                       <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-labelledby="override_pattern"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="text"
-                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                              iconType="inputOutput"
-                                                                              onClick={[Function]}
-                                                                              size="s"
-                                                                            >
-                                                                              Override
-                                                                            </EuiButtonIcon>
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add index to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-index"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                      </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="string"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-index"
-                                                                        title="index"
-                                                                      >
-                                                                        <EuiText
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add ip to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-ip"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
                                                                           size="xs"
-                                                                        >
-                                                                          index
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="ip"
                                                                   />
                                                                 }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-ip"
+                                                                    title="ip"
+                                                                  >
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      ip
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
                                                               >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-ip-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add ip to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-ip"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="ip"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-ip"
+                                                                      title="ip"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        ip
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
                                                                 >
                                                                   <div
-                                                                    className="euiPopover__anchor"
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-index-showDetails"
-                                                                      fieldAction={
-                                                                        <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                Override
-                                                                              </EuiButtonIcon>
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add index to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-index"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                        </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-ip-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
                                                                         <FieldIcon
-                                                                          type="string"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
+                                                                          type="ip"
+                                                                        >
+                                                                          <EuiToken
+                                                                            aria-label="ip"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenIP"
+                                                                            size="l"
+                                                                            title="ip"
+                                                                          >
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis9 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-label="ip"
+                                                                                size="l"
+                                                                                title="ip"
+                                                                                type="tokenIP"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="ip"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="ip"
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="ip"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </span>
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
                                                                         <span
                                                                           className="dscSidebarField__name"
-                                                                          data-test-subj="field-index"
-                                                                          title="index"
+                                                                          data-test-subj="field-ip"
+                                                                          title="ip"
                                                                         >
                                                                           <EuiText
                                                                             size="xs"
                                                                           >
-                                                                            index
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
+                                                                            >
+                                                                              ip
+                                                                            </div>
                                                                           </EuiText>
                                                                         </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-index-showDetails"
-                                                                          onClick={[Function]}
-                                                                        >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add ip to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-ip"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add ip to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-ip"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
                                                                           >
-                                                                            <FieldIcon
-                                                                              type="string"
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiToken
-                                                                                aria-label="string"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
-                                                                                size="l"
-                                                                                title="string"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-label="string"
-                                                                                    size="l"
-                                                                                    title="string"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="string"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="string"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="string"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-index"
-                                                                              title="index"
-                                                                            >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
-                                                                                >
-                                                                                  index
-                                                                                </div>
-                                                                              </EuiText>
-                                                                            </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
-                                                                        >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            >
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                <button
-                                                                                  aria-labelledby="override_pattern"
-                                                                                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
-                                                                                  data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inputOutput"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add index to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-index"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add index to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-index"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -8375,23 +8745,23 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                             </EuiDraggable>
                                             <EuiDraggable
                                               className="dscSidebar__item sidebar_content"
-                                              data-attr-field="ip"
+                                              data-attr-field="machine"
                                               draggableId=""
-                                              index={8}
-                                              key="fieldip"
+                                              index={9}
+                                              key="fieldmachine"
                                               spacing="m"
                                             >
                                               <PublicDraggable
-                                                data-attr-field="ip"
+                                                data-attr-field="machine"
                                                 draggableId=""
-                                                index={8}
+                                                index={9}
                                                 isDragDisabled={false}
                                               >
                                                 <PrivateDraggable
                                                   canDragInteractiveElements={false}
-                                                  data-attr-field="ip"
+                                                  data-attr-field="machine"
                                                   draggableId=""
-                                                  index={8}
+                                                  index={9}
                                                   isClone={false}
                                                   isDragDisabled={false}
                                                   isEnabled={true}
@@ -8399,9 +8769,9 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                 >
                                                   <Connect(Draggable)
                                                     canDragInteractiveElements={false}
-                                                    data-attr-field="ip"
+                                                    data-attr-field="machine"
                                                     draggableId=""
-                                                    index={8}
+                                                    index={9}
                                                     isClone={false}
                                                     isDragDisabled={false}
                                                     isEnabled={true}
@@ -8409,10 +8779,10 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                   >
                                                     <Draggable
                                                       canDragInteractiveElements={false}
-                                                      data-attr-field="ip"
+                                                      data-attr-field="machine"
                                                       draggableId=""
                                                       dropAnimationFinished={[Function]}
-                                                      index={8}
+                                                      index={9}
                                                       isClone={false}
                                                       isDragDisabled={false}
                                                       isEnabled={true}
@@ -8459,392 +8829,380 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="ip"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "machine",
+                                                              "type": "struct",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="ip"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "ip",
-                                                                  "type": "ip",
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-machine-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add machine to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-machine"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
+                                                                          size="xs"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
                                                                 }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="struct"
+                                                                  />
+                                                                }
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-machine"
+                                                                    title="machine"
+                                                                  >
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      machine
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
                                                             >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-ip-showDetails"
-                                                                    fieldAction={
-                                                                      <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add ip to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-ip"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                      </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="ip"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-ip"
-                                                                        title="ip"
-                                                                      >
-                                                                        <EuiText
-                                                                          size="xs"
-                                                                        >
-                                                                          ip
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
-                                                                  />
-                                                                }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
+                                                              <div
+                                                                className="euiPopover__anchor"
                                                               >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-machine-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add machine to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-machine"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="struct"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-machine"
+                                                                      title="machine"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        machine
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
                                                                 >
                                                                   <div
-                                                                    className="euiPopover__anchor"
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-ip-showDetails"
-                                                                      fieldAction={
-                                                                        <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add ip to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-ip"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                        </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-machine-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
                                                                         <FieldIcon
-                                                                          type="ip"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
+                                                                          type="struct"
+                                                                        >
+                                                                          <EuiToken
+                                                                            aria-label="struct"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="struct"
+                                                                          >
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-label="struct"
+                                                                                size="l"
+                                                                                title="struct"
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="struct"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="struct"
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="struct"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </span>
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
                                                                         <span
                                                                           className="dscSidebarField__name"
-                                                                          data-test-subj="field-ip"
-                                                                          title="ip"
+                                                                          data-test-subj="field-machine"
+                                                                          title="machine"
                                                                         >
                                                                           <EuiText
                                                                             size="xs"
                                                                           >
-                                                                            ip
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
+                                                                            >
+                                                                              machine
+                                                                            </div>
                                                                           </EuiText>
                                                                         </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-ip-showDetails"
-                                                                          onClick={[Function]}
-                                                                        >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
-                                                                          >
-                                                                            <FieldIcon
-                                                                              type="ip"
-                                                                            >
-                                                                              <EuiToken
-                                                                                aria-label="ip"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenIP"
-                                                                                size="l"
-                                                                                title="ip"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis9 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-label="ip"
-                                                                                    size="l"
-                                                                                    title="ip"
-                                                                                    type="tokenIP"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="ip"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="ip"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="ip"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-ip"
-                                                                              title="ip"
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add machine to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-machine"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add machine to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-machine"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  ip
-                                                                                </div>
-                                                                              </EuiText>
-                                                                            </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
-                                                                        >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add ip to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-ip"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add ip to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-ip"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -8853,23 +9211,23 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                             </EuiDraggable>
                                             <EuiDraggable
                                               className="dscSidebar__item sidebar_content"
-                                              data-attr-field="machine"
+                                              data-attr-field="memory"
                                               draggableId=""
-                                              index={9}
-                                              key="fieldmachine"
+                                              index={10}
+                                              key="fieldmemory"
                                               spacing="m"
                                             >
                                               <PublicDraggable
-                                                data-attr-field="machine"
+                                                data-attr-field="memory"
                                                 draggableId=""
-                                                index={9}
+                                                index={10}
                                                 isDragDisabled={false}
                                               >
                                                 <PrivateDraggable
                                                   canDragInteractiveElements={false}
-                                                  data-attr-field="machine"
+                                                  data-attr-field="memory"
                                                   draggableId=""
-                                                  index={9}
+                                                  index={10}
                                                   isClone={false}
                                                   isDragDisabled={false}
                                                   isEnabled={true}
@@ -8877,9 +9235,9 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                 >
                                                   <Connect(Draggable)
                                                     canDragInteractiveElements={false}
-                                                    data-attr-field="machine"
+                                                    data-attr-field="memory"
                                                     draggableId=""
-                                                    index={9}
+                                                    index={10}
                                                     isClone={false}
                                                     isDragDisabled={false}
                                                     isEnabled={true}
@@ -8887,10 +9245,10 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                   >
                                                     <Draggable
                                                       canDragInteractiveElements={false}
-                                                      data-attr-field="machine"
+                                                      data-attr-field="memory"
                                                       draggableId=""
                                                       dropAnimationFinished={[Function]}
-                                                      index={9}
+                                                      index={10}
                                                       isClone={false}
                                                       isDragDisabled={false}
                                                       isEnabled={true}
@@ -8937,392 +9295,380 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="machine"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "memory",
+                                                              "type": "double",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="machine"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "machine",
-                                                                  "type": "struct",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-machine-showDetails"
-                                                                    fieldAction={
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-memory-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
                                                                       <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add machine to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-machine"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                      </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="struct"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-machine"
-                                                                        title="machine"
-                                                                      >
-                                                                        <EuiText
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add memory to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-memory"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
                                                                           size="xs"
-                                                                        >
-                                                                          machine
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="double"
                                                                   />
                                                                 }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-memory"
+                                                                    title="memory"
+                                                                  >
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      memory
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
                                                               >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-memory-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add memory to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-memory"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="double"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-memory"
+                                                                      title="memory"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        memory
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
                                                                 >
                                                                   <div
-                                                                    className="euiPopover__anchor"
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-machine-showDetails"
-                                                                      fieldAction={
-                                                                        <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add machine to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-machine"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                        </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-memory-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
                                                                         <FieldIcon
-                                                                          type="struct"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
+                                                                          type="double"
+                                                                        >
+                                                                          <EuiToken
+                                                                            aria-label="double"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="double"
+                                                                          >
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-label="double"
+                                                                                size="l"
+                                                                                title="double"
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="double"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="double"
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="double"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </span>
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
                                                                         <span
                                                                           className="dscSidebarField__name"
-                                                                          data-test-subj="field-machine"
-                                                                          title="machine"
+                                                                          data-test-subj="field-memory"
+                                                                          title="memory"
                                                                         >
                                                                           <EuiText
                                                                             size="xs"
                                                                           >
-                                                                            machine
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
+                                                                            >
+                                                                              memory
+                                                                            </div>
                                                                           </EuiText>
                                                                         </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-machine-showDetails"
-                                                                          onClick={[Function]}
-                                                                        >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
-                                                                          >
-                                                                            <FieldIcon
-                                                                              type="struct"
-                                                                            >
-                                                                              <EuiToken
-                                                                                aria-label="struct"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
-                                                                                size="l"
-                                                                                title="struct"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-label="struct"
-                                                                                    size="l"
-                                                                                    title="struct"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="struct"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="struct"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="struct"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-machine"
-                                                                              title="machine"
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add memory to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-memory"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add memory to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-memory"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  machine
-                                                                                </div>
-                                                                              </EuiText>
-                                                                            </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
-                                                                        >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add machine to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-machine"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add machine to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-machine"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -9331,23 +9677,23 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                             </EuiDraggable>
                                             <EuiDraggable
                                               className="dscSidebar__item sidebar_content"
-                                              data-attr-field="memory"
+                                              data-attr-field="message"
                                               draggableId=""
-                                              index={10}
-                                              key="fieldmemory"
+                                              index={11}
+                                              key="fieldmessage"
                                               spacing="m"
                                             >
                                               <PublicDraggable
-                                                data-attr-field="memory"
+                                                data-attr-field="message"
                                                 draggableId=""
-                                                index={10}
+                                                index={11}
                                                 isDragDisabled={false}
                                               >
                                                 <PrivateDraggable
                                                   canDragInteractiveElements={false}
-                                                  data-attr-field="memory"
+                                                  data-attr-field="message"
                                                   draggableId=""
-                                                  index={10}
+                                                  index={11}
                                                   isClone={false}
                                                   isDragDisabled={false}
                                                   isEnabled={true}
@@ -9355,9 +9701,9 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                 >
                                                   <Connect(Draggable)
                                                     canDragInteractiveElements={false}
-                                                    data-attr-field="memory"
+                                                    data-attr-field="message"
                                                     draggableId=""
-                                                    index={10}
+                                                    index={11}
                                                     isClone={false}
                                                     isDragDisabled={false}
                                                     isEnabled={true}
@@ -9365,10 +9711,10 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                   >
                                                     <Draggable
                                                       canDragInteractiveElements={false}
-                                                      data-attr-field="memory"
+                                                      data-attr-field="message"
                                                       draggableId=""
                                                       dropAnimationFinished={[Function]}
-                                                      index={10}
+                                                      index={11}
                                                       isClone={false}
                                                       isDragDisabled={false}
                                                       isEnabled={true}
@@ -9415,392 +9761,451 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="memory"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "message",
+                                                              "type": "string",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="memory"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "memory",
-                                                                  "type": "double",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-memory-showDetails"
-                                                                    fieldAction={
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-message-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
                                                                       <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
+                                                                        <EuiButtonIcon
+                                                                          aria-labelledby="override_pattern"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="text"
+                                                                          data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                          iconType="inputOutput"
+                                                                          onClick={[Function]}
+                                                                          size="s"
                                                                         >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add memory to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-memory"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
+                                                                          Override
+                                                                        </EuiButtonIcon>
                                                                       </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="double"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-memory"
-                                                                        title="memory"
-                                                                      >
-                                                                        <EuiText
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add message to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-message"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
                                                                           size="xs"
-                                                                        >
-                                                                          memory
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="string"
                                                                   />
                                                                 }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-message"
+                                                                    title="message"
+                                                                  >
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      message
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
                                                               >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-message-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            Override
+                                                                          </EuiButtonIcon>
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add message to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-message"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="string"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-message"
+                                                                      title="message"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        message
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
                                                                 >
                                                                   <div
-                                                                    className="euiPopover__anchor"
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-memory-showDetails"
-                                                                      fieldAction={
-                                                                        <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add memory to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-memory"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                        </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-message-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
                                                                         <FieldIcon
-                                                                          type="double"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
+                                                                          type="string"
+                                                                        >
+                                                                          <EuiToken
+                                                                            aria-label="string"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="string"
+                                                                          >
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-label="string"
+                                                                                size="l"
+                                                                                title="string"
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="string"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="string"
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="string"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </span>
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
                                                                         <span
                                                                           className="dscSidebarField__name"
-                                                                          data-test-subj="field-memory"
-                                                                          title="memory"
+                                                                          data-test-subj="field-message"
+                                                                          title="message"
                                                                         >
                                                                           <EuiText
                                                                             size="xs"
                                                                           >
-                                                                            memory
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
+                                                                            >
+                                                                              message
+                                                                            </div>
                                                                           </EuiText>
                                                                         </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-memory-showDetails"
-                                                                          onClick={[Function]}
-                                                                        >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
-                                                                          >
-                                                                            <FieldIcon
-                                                                              type="double"
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            <button
+                                                                              aria-labelledby="override_pattern"
+                                                                              className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
+                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiToken
-                                                                                aria-label="double"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
-                                                                                size="l"
-                                                                                title="double"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inputOutput"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-label="double"
-                                                                                    size="l"
-                                                                                    title="double"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="double"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="double"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="double"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-memory"
-                                                                              title="memory"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add message to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-message"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add message to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-message"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  memory
-                                                                                </div>
-                                                                              </EuiText>
-                                                                            </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
-                                                                        >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add memory to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-memory"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add memory to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-memory"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -9809,23 +10214,23 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                             </EuiDraggable>
                                             <EuiDraggable
                                               className="dscSidebar__item sidebar_content"
-                                              data-attr-field="message"
+                                              data-attr-field="phpmemory"
                                               draggableId=""
-                                              index={11}
-                                              key="fieldmessage"
+                                              index={12}
+                                              key="fieldphpmemory"
                                               spacing="m"
                                             >
                                               <PublicDraggable
-                                                data-attr-field="message"
+                                                data-attr-field="phpmemory"
                                                 draggableId=""
-                                                index={11}
+                                                index={12}
                                                 isDragDisabled={false}
                                               >
                                                 <PrivateDraggable
                                                   canDragInteractiveElements={false}
-                                                  data-attr-field="message"
+                                                  data-attr-field="phpmemory"
                                                   draggableId=""
-                                                  index={11}
+                                                  index={12}
                                                   isClone={false}
                                                   isDragDisabled={false}
                                                   isEnabled={true}
@@ -9833,9 +10238,9 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                 >
                                                   <Connect(Draggable)
                                                     canDragInteractiveElements={false}
-                                                    data-attr-field="message"
+                                                    data-attr-field="phpmemory"
                                                     draggableId=""
-                                                    index={11}
+                                                    index={12}
                                                     isClone={false}
                                                     isDragDisabled={false}
                                                     isEnabled={true}
@@ -9843,10 +10248,10 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                   >
                                                     <Draggable
                                                       canDragInteractiveElements={false}
-                                                      data-attr-field="message"
+                                                      data-attr-field="phpmemory"
                                                       draggableId=""
                                                       dropAnimationFinished={[Function]}
-                                                      index={11}
+                                                      index={12}
                                                       isClone={false}
                                                       isDragDisabled={false}
                                                       isEnabled={true}
@@ -9893,463 +10298,917 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="message"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "phpmemory",
+                                                              "type": "long",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="message"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "message",
-                                                                  "type": "string",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-message-showDetails"
-                                                                    fieldAction={
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-phpmemory-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
                                                                       <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-labelledby="override_pattern"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="text"
-                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                              iconType="inputOutput"
-                                                                              onClick={[Function]}
-                                                                              size="s"
-                                                                            >
-                                                                              Override
-                                                                            </EuiButtonIcon>
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add message to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-message"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                      </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="string"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-message"
-                                                                        title="message"
-                                                                      >
-                                                                        <EuiText
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add phpmemory to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-phpmemory"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
                                                                           size="xs"
-                                                                        >
-                                                                          message
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="long"
                                                                   />
                                                                 }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-phpmemory"
+                                                                    title="phpmemory"
+                                                                  >
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      phpmemory
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
                                                               >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-phpmemory-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add phpmemory to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-phpmemory"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="long"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-phpmemory"
+                                                                      title="phpmemory"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        phpmemory
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
                                                                 >
                                                                   <div
-                                                                    className="euiPopover__anchor"
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-message-showDetails"
-                                                                      fieldAction={
-                                                                        <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                Override
-                                                                              </EuiButtonIcon>
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-phpmemory-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
+                                                                        <FieldIcon
+                                                                          type="long"
+                                                                        >
+                                                                          <EuiToken
+                                                                            aria-label="long"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="long"
                                                                           >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add message to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-message"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                        </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
-                                                                        <FieldIcon
-                                                                          type="string"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-label="long"
+                                                                                size="l"
+                                                                                title="long"
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="long"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="long"
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="long"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </span>
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
                                                                         <span
                                                                           className="dscSidebarField__name"
-                                                                          data-test-subj="field-message"
-                                                                          title="message"
+                                                                          data-test-subj="field-phpmemory"
+                                                                          title="phpmemory"
                                                                         >
                                                                           <EuiText
                                                                             size="xs"
                                                                           >
-                                                                            message
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
+                                                                            >
+                                                                              phpmemory
+                                                                            </div>
                                                                           </EuiText>
                                                                         </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-message-showDetails"
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add phpmemory to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-phpmemory"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add phpmemory to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-phpmemory"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          >
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
+                                                                  </div>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
+                                                      </div>
+                                                    </Draggable>
+                                                  </Connect(Draggable)>
+                                                </PrivateDraggable>
+                                              </PublicDraggable>
+                                            </EuiDraggable>
+                                            <EuiDraggable
+                                              className="dscSidebar__item sidebar_content"
+                                              data-attr-field="referer"
+                                              draggableId=""
+                                              index={13}
+                                              key="fieldreferer"
+                                              spacing="m"
+                                            >
+                                              <PublicDraggable
+                                                data-attr-field="referer"
+                                                draggableId=""
+                                                index={13}
+                                                isDragDisabled={false}
+                                              >
+                                                <PrivateDraggable
+                                                  canDragInteractiveElements={false}
+                                                  data-attr-field="referer"
+                                                  draggableId=""
+                                                  index={13}
+                                                  isClone={false}
+                                                  isDragDisabled={false}
+                                                  isEnabled={true}
+                                                  shouldRespectForcePress={false}
+                                                >
+                                                  <Connect(Draggable)
+                                                    canDragInteractiveElements={false}
+                                                    data-attr-field="referer"
+                                                    draggableId=""
+                                                    index={13}
+                                                    isClone={false}
+                                                    isDragDisabled={false}
+                                                    isEnabled={true}
+                                                    shouldRespectForcePress={false}
+                                                  >
+                                                    <Draggable
+                                                      canDragInteractiveElements={false}
+                                                      data-attr-field="referer"
+                                                      draggableId=""
+                                                      dropAnimationFinished={[Function]}
+                                                      index={13}
+                                                      isClone={false}
+                                                      isDragDisabled={false}
+                                                      isEnabled={true}
+                                                      mapped={
+                                                        Object {
+                                                          "combineTargetFor": null,
+                                                          "offset": Object {
+                                                            "x": 0,
+                                                            "y": 0,
+                                                          },
+                                                          "shouldAnimateDisplacement": true,
+                                                          "snapshot": Object {
+                                                            "combineTargetFor": null,
+                                                            "combineWith": null,
+                                                            "draggingOver": null,
+                                                            "dropAnimation": null,
+                                                            "isClone": false,
+                                                            "isDragging": false,
+                                                            "isDropAnimating": false,
+                                                            "mode": null,
+                                                          },
+                                                          "type": "SECONDARY",
+                                                        }
+                                                      }
+                                                      shouldRespectForcePress={false}
+                                                    >
+                                                      <div
+                                                        aria-describedby="rbd-hidden-text-1-hidden-text-1"
+                                                        className="euiDraggable euiDraggable--m dscSidebar__item sidebar_content"
+                                                        data-rbd-drag-handle-context-id="1"
+                                                        data-rbd-drag-handle-draggable-id=""
+                                                        data-rbd-draggable-context-id="1"
+                                                        data-rbd-draggable-id=""
+                                                        data-test-subj="draggable"
+                                                        draggable={false}
+                                                        onDragStart={[Function]}
+                                                        onTransitionEnd={null}
+                                                        role="button"
+                                                        style={
+                                                          Object {
+                                                            "transform": null,
+                                                            "transition": null,
+                                                          }
+                                                        }
+                                                        tabIndex={0}
+                                                      >
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "referer",
+                                                              "type": "string",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
+                                                        >
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-referer-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-labelledby="override_pattern"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="text"
+                                                                          data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                          iconType="inputOutput"
                                                                           onClick={[Function]}
+                                                                          size="s"
                                                                         >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
+                                                                          Override
+                                                                        </EuiButtonIcon>
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add referer to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-referer"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
+                                                                          size="xs"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="string"
+                                                                  />
+                                                                }
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-referer"
+                                                                    title="referer"
+                                                                  >
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      referer
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
+                                                              >
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-referer-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            Override
+                                                                          </EuiButtonIcon>
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add referer to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-referer"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="string"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-referer"
+                                                                      title="referer"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        referer
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
+                                                                >
+                                                                  <div
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  >
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-referer-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
+                                                                        <FieldIcon
+                                                                          type="string"
+                                                                        >
+                                                                          <EuiToken
+                                                                            aria-label="string"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="string"
                                                                           >
-                                                                            <FieldIcon
-                                                                              type="string"
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
                                                                             >
-                                                                              <EuiToken
+                                                                              <EuiIcon
                                                                                 aria-label="string"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
                                                                                 size="l"
                                                                                 title="string"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="string"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="string"
                                                                                 >
-                                                                                  <EuiIcon
+                                                                                  <svg
+                                                                                    aria-hidden={true}
                                                                                     aria-label="string"
-                                                                                    size="l"
-                                                                                    title="string"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="string"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="string"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="string"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </span>
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
+                                                                        <span
+                                                                          className="dscSidebarField__name"
+                                                                          data-test-subj="field-referer"
+                                                                          title="referer"
+                                                                        >
+                                                                          <EuiText
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-message"
-                                                                              title="message"
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
                                                                             >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
+                                                                              referer
+                                                                            </div>
+                                                                          </EuiText>
+                                                                        </span>
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
+                                                                    >
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            <button
+                                                                              aria-labelledby="override_pattern"
+                                                                              className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
+                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inputOutput"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  message
-                                                                                </div>
-                                                                              </EuiText>
-                                                                            </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
-                                                                        >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add referer to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-referer"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add referer to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-referer"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                <button
-                                                                                  aria-labelledby="override_pattern"
-                                                                                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
-                                                                                  data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inputOutput"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add message to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-message"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add message to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-message"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -10358,23 +11217,23 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                             </EuiDraggable>
                                             <EuiDraggable
                                               className="dscSidebar__item sidebar_content"
-                                              data-attr-field="phpmemory"
+                                              data-attr-field="request"
                                               draggableId=""
-                                              index={12}
-                                              key="fieldphpmemory"
+                                              index={14}
+                                              key="fieldrequest"
                                               spacing="m"
                                             >
                                               <PublicDraggable
-                                                data-attr-field="phpmemory"
+                                                data-attr-field="request"
                                                 draggableId=""
-                                                index={12}
+                                                index={14}
                                                 isDragDisabled={false}
                                               >
                                                 <PrivateDraggable
                                                   canDragInteractiveElements={false}
-                                                  data-attr-field="phpmemory"
+                                                  data-attr-field="request"
                                                   draggableId=""
-                                                  index={12}
+                                                  index={14}
                                                   isClone={false}
                                                   isDragDisabled={false}
                                                   isEnabled={true}
@@ -10382,9 +11241,9 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                 >
                                                   <Connect(Draggable)
                                                     canDragInteractiveElements={false}
-                                                    data-attr-field="phpmemory"
+                                                    data-attr-field="request"
                                                     draggableId=""
-                                                    index={12}
+                                                    index={14}
                                                     isClone={false}
                                                     isDragDisabled={false}
                                                     isEnabled={true}
@@ -10392,10 +11251,10 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                   >
                                                     <Draggable
                                                       canDragInteractiveElements={false}
-                                                      data-attr-field="phpmemory"
+                                                      data-attr-field="request"
                                                       draggableId=""
                                                       dropAnimationFinished={[Function]}
-                                                      index={12}
+                                                      index={14}
                                                       isClone={false}
                                                       isDragDisabled={false}
                                                       isEnabled={true}
@@ -10442,1490 +11301,451 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="phpmemory"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "request",
+                                                              "type": "string",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="phpmemory"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "phpmemory",
-                                                                  "type": "long",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-phpmemory-showDetails"
-                                                                    fieldAction={
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-request-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
                                                                       <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
+                                                                        <EuiButtonIcon
+                                                                          aria-labelledby="override_pattern"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="text"
+                                                                          data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                          iconType="inputOutput"
+                                                                          onClick={[Function]}
+                                                                          size="s"
                                                                         >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add phpmemory to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-phpmemory"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                      </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="long"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-phpmemory"
-                                                                        title="phpmemory"
-                                                                      >
-                                                                        <EuiText
-                                                                          size="xs"
-                                                                        >
-                                                                          phpmemory
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
-                                                                  />
-                                                                }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
-                                                              >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
-                                                                >
-                                                                  <div
-                                                                    className="euiPopover__anchor"
-                                                                  >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-phpmemory-showDetails"
-                                                                      fieldAction={
-                                                                        <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add phpmemory to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-phpmemory"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                        </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
-                                                                        <FieldIcon
-                                                                          type="long"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
-                                                                        <span
-                                                                          className="dscSidebarField__name"
-                                                                          data-test-subj="field-phpmemory"
-                                                                          title="phpmemory"
-                                                                        >
-                                                                          <EuiText
-                                                                            size="xs"
-                                                                          >
-                                                                            phpmemory
-                                                                          </EuiText>
-                                                                        </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
-                                                                    >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-phpmemory-showDetails"
-                                                                          onClick={[Function]}
-                                                                        >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
-                                                                          >
-                                                                            <FieldIcon
-                                                                              type="long"
-                                                                            >
-                                                                              <EuiToken
-                                                                                aria-label="long"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
-                                                                                size="l"
-                                                                                title="long"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-label="long"
-                                                                                    size="l"
-                                                                                    title="long"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="long"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="long"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="long"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-phpmemory"
-                                                                              title="phpmemory"
-                                                                            >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
-                                                                                >
-                                                                                  phpmemory
-                                                                                </div>
-                                                                              </EuiText>
-                                                                            </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
-                                                                        >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add phpmemory to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-phpmemory"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add phpmemory to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-phpmemory"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
-                                                                  </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
-                                                      </div>
-                                                    </Draggable>
-                                                  </Connect(Draggable)>
-                                                </PrivateDraggable>
-                                              </PublicDraggable>
-                                            </EuiDraggable>
-                                            <EuiDraggable
-                                              className="dscSidebar__item sidebar_content"
-                                              data-attr-field="referer"
-                                              draggableId=""
-                                              index={13}
-                                              key="fieldreferer"
-                                              spacing="m"
-                                            >
-                                              <PublicDraggable
-                                                data-attr-field="referer"
-                                                draggableId=""
-                                                index={13}
-                                                isDragDisabled={false}
-                                              >
-                                                <PrivateDraggable
-                                                  canDragInteractiveElements={false}
-                                                  data-attr-field="referer"
-                                                  draggableId=""
-                                                  index={13}
-                                                  isClone={false}
-                                                  isDragDisabled={false}
-                                                  isEnabled={true}
-                                                  shouldRespectForcePress={false}
-                                                >
-                                                  <Connect(Draggable)
-                                                    canDragInteractiveElements={false}
-                                                    data-attr-field="referer"
-                                                    draggableId=""
-                                                    index={13}
-                                                    isClone={false}
-                                                    isDragDisabled={false}
-                                                    isEnabled={true}
-                                                    shouldRespectForcePress={false}
-                                                  >
-                                                    <Draggable
-                                                      canDragInteractiveElements={false}
-                                                      data-attr-field="referer"
-                                                      draggableId=""
-                                                      dropAnimationFinished={[Function]}
-                                                      index={13}
-                                                      isClone={false}
-                                                      isDragDisabled={false}
-                                                      isEnabled={true}
-                                                      mapped={
-                                                        Object {
-                                                          "combineTargetFor": null,
-                                                          "offset": Object {
-                                                            "x": 0,
-                                                            "y": 0,
-                                                          },
-                                                          "shouldAnimateDisplacement": true,
-                                                          "snapshot": Object {
-                                                            "combineTargetFor": null,
-                                                            "combineWith": null,
-                                                            "draggingOver": null,
-                                                            "dropAnimation": null,
-                                                            "isClone": false,
-                                                            "isDragging": false,
-                                                            "isDropAnimating": false,
-                                                            "mode": null,
-                                                          },
-                                                          "type": "SECONDARY",
-                                                        }
-                                                      }
-                                                      shouldRespectForcePress={false}
-                                                    >
-                                                      <div
-                                                        aria-describedby="rbd-hidden-text-1-hidden-text-1"
-                                                        className="euiDraggable euiDraggable--m dscSidebar__item sidebar_content"
-                                                        data-rbd-drag-handle-context-id="1"
-                                                        data-rbd-drag-handle-draggable-id=""
-                                                        data-rbd-draggable-context-id="1"
-                                                        data-rbd-draggable-id=""
-                                                        data-test-subj="draggable"
-                                                        draggable={false}
-                                                        onDragStart={[Function]}
-                                                        onTransitionEnd={null}
-                                                        role="button"
-                                                        style={
-                                                          Object {
-                                                            "transform": null,
-                                                            "transition": null,
-                                                          }
-                                                        }
-                                                        tabIndex={0}
-                                                      >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="referer"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
-                                                        >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="referer"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "referer",
-                                                                  "type": "string",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-referer-showDetails"
-                                                                    fieldAction={
-                                                                      <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-labelledby="override_pattern"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="text"
-                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                              iconType="inputOutput"
-                                                                              onClick={[Function]}
-                                                                              size="s"
-                                                                            >
-                                                                              Override
-                                                                            </EuiButtonIcon>
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add referer to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-referer"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                      </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="string"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-referer"
-                                                                        title="referer"
-                                                                      >
-                                                                        <EuiText
-                                                                          size="xs"
-                                                                        >
-                                                                          referer
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
-                                                                  />
-                                                                }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
-                                                              >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
-                                                                >
-                                                                  <div
-                                                                    className="euiPopover__anchor"
-                                                                  >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-referer-showDetails"
-                                                                      fieldAction={
-                                                                        <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                Override
-                                                                              </EuiButtonIcon>
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add referer to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-referer"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                        </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
-                                                                        <FieldIcon
-                                                                          type="string"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
-                                                                        <span
-                                                                          className="dscSidebarField__name"
-                                                                          data-test-subj="field-referer"
-                                                                          title="referer"
-                                                                        >
-                                                                          <EuiText
-                                                                            size="xs"
-                                                                          >
-                                                                            referer
-                                                                          </EuiText>
-                                                                        </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
-                                                                    >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-referer-showDetails"
-                                                                          onClick={[Function]}
-                                                                        >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
-                                                                          >
-                                                                            <FieldIcon
-                                                                              type="string"
-                                                                            >
-                                                                              <EuiToken
-                                                                                aria-label="string"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
-                                                                                size="l"
-                                                                                title="string"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-label="string"
-                                                                                    size="l"
-                                                                                    title="string"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="string"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="string"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="string"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-referer"
-                                                                              title="referer"
-                                                                            >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
-                                                                                >
-                                                                                  referer
-                                                                                </div>
-                                                                              </EuiText>
-                                                                            </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
-                                                                        >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            >
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                <button
-                                                                                  aria-labelledby="override_pattern"
-                                                                                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
-                                                                                  data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inputOutput"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add referer to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-referer"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add referer to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-referer"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
-                                                                  </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
-                                                      </div>
-                                                    </Draggable>
-                                                  </Connect(Draggable)>
-                                                </PrivateDraggable>
-                                              </PublicDraggable>
-                                            </EuiDraggable>
-                                            <EuiDraggable
-                                              className="dscSidebar__item sidebar_content"
-                                              data-attr-field="request"
-                                              draggableId=""
-                                              index={14}
-                                              key="fieldrequest"
-                                              spacing="m"
-                                            >
-                                              <PublicDraggable
-                                                data-attr-field="request"
-                                                draggableId=""
-                                                index={14}
-                                                isDragDisabled={false}
-                                              >
-                                                <PrivateDraggable
-                                                  canDragInteractiveElements={false}
-                                                  data-attr-field="request"
-                                                  draggableId=""
-                                                  index={14}
-                                                  isClone={false}
-                                                  isDragDisabled={false}
-                                                  isEnabled={true}
-                                                  shouldRespectForcePress={false}
-                                                >
-                                                  <Connect(Draggable)
-                                                    canDragInteractiveElements={false}
-                                                    data-attr-field="request"
-                                                    draggableId=""
-                                                    index={14}
-                                                    isClone={false}
-                                                    isDragDisabled={false}
-                                                    isEnabled={true}
-                                                    shouldRespectForcePress={false}
-                                                  >
-                                                    <Draggable
-                                                      canDragInteractiveElements={false}
-                                                      data-attr-field="request"
-                                                      draggableId=""
-                                                      dropAnimationFinished={[Function]}
-                                                      index={14}
-                                                      isClone={false}
-                                                      isDragDisabled={false}
-                                                      isEnabled={true}
-                                                      mapped={
-                                                        Object {
-                                                          "combineTargetFor": null,
-                                                          "offset": Object {
-                                                            "x": 0,
-                                                            "y": 0,
-                                                          },
-                                                          "shouldAnimateDisplacement": true,
-                                                          "snapshot": Object {
-                                                            "combineTargetFor": null,
-                                                            "combineWith": null,
-                                                            "draggingOver": null,
-                                                            "dropAnimation": null,
-                                                            "isClone": false,
-                                                            "isDragging": false,
-                                                            "isDropAnimating": false,
-                                                            "mode": null,
-                                                          },
-                                                          "type": "SECONDARY",
-                                                        }
-                                                      }
-                                                      shouldRespectForcePress={false}
-                                                    >
-                                                      <div
-                                                        aria-describedby="rbd-hidden-text-1-hidden-text-1"
-                                                        className="euiDraggable euiDraggable--m dscSidebar__item sidebar_content"
-                                                        data-rbd-drag-handle-context-id="1"
-                                                        data-rbd-drag-handle-draggable-id=""
-                                                        data-rbd-draggable-context-id="1"
-                                                        data-rbd-draggable-id=""
-                                                        data-test-subj="draggable"
-                                                        draggable={false}
-                                                        onDragStart={[Function]}
-                                                        onTransitionEnd={null}
-                                                        role="button"
-                                                        style={
-                                                          Object {
-                                                            "transform": null,
-                                                            "transition": null,
-                                                          }
-                                                        }
-                                                        tabIndex={0}
-                                                      >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="request"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
-                                                        >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="request"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "request",
-                                                                  "type": "string",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-request-showDetails"
-                                                                    fieldAction={
-                                                                      <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-labelledby="override_pattern"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="text"
-                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                              iconType="inputOutput"
-                                                                              onClick={[Function]}
-                                                                              size="s"
-                                                                            >
-                                                                              Override
-                                                                            </EuiButtonIcon>
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add request to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-request"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
+                                                                          Override
+                                                                        </EuiButtonIcon>
                                                                       </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="string"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-request"
-                                                                        title="request"
-                                                                      >
-                                                                        <EuiText
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add request to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-request"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
                                                                           size="xs"
-                                                                        >
-                                                                          request
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="string"
                                                                   />
                                                                 }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
-                                                              >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
-                                                                >
-                                                                  <div
-                                                                    className="euiPopover__anchor"
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-request"
+                                                                    title="request"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-request-showDetails"
-                                                                      fieldAction={
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      request
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
+                                                              >
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-request-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
                                                                         <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                Override
-                                                                              </EuiButtonIcon>
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add request to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-request"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            Override
+                                                                          </EuiButtonIcon>
                                                                         </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
-                                                                        <FieldIcon
-                                                                          type="string"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
-                                                                        <span
-                                                                          className="dscSidebarField__name"
-                                                                          data-test-subj="field-request"
-                                                                          title="request"
-                                                                        >
-                                                                          <EuiText
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add request to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-request"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
                                                                             size="xs"
-                                                                          >
-                                                                            request
-                                                                          </EuiText>
-                                                                        </span>
-                                                                      }
-                                                                      isActive={false}
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="string"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-request"
+                                                                      title="request"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        request
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
+                                                                >
+                                                                  <div
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  >
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-request-showDetails"
                                                                       onClick={[Function]}
-                                                                      size="s"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-request-showDetails"
-                                                                          onClick={[Function]}
-                                                                        >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
-                                                                          >
-                                                                            <FieldIcon
-                                                                              type="string"
-                                                                            >
-                                                                              <EuiToken
-                                                                                aria-label="string"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
-                                                                                size="l"
-                                                                                title="string"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-label="string"
-                                                                                    size="l"
-                                                                                    title="string"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="string"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="string"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="string"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-request"
-                                                                              title="request"
-                                                                            >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
-                                                                                >
-                                                                                  request
-                                                                                </div>
-                                                                              </EuiText>
-                                                                            </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
+                                                                        <FieldIcon
+                                                                          type="string"
                                                                         >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
+                                                                          <EuiToken
+                                                                            aria-label="string"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="string"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                <button
-                                                                                  aria-labelledby="override_pattern"
-                                                                                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
-                                                                                  data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-label="string"
+                                                                                size="l"
+                                                                                title="string"
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="string"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="string"
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inputOutput"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="string"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
                                                                             </span>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
+                                                                        <span
+                                                                          className="dscSidebarField__name"
+                                                                          data-test-subj="field-request"
+                                                                          title="request"
+                                                                        >
+                                                                          <EuiText
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add request to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-request"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add request to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-request"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
+                                                                              request
+                                                                            </div>
+                                                                          </EuiText>
+                                                                        </span>
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
+                                                                    >
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            <button
+                                                                              aria-labelledby="override_pattern"
+                                                                              className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
+                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inputOutput"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add request to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-request"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add request to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-request"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          >
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -12018,463 +11838,451 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="response"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "response",
+                                                              "type": "string",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="response"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "response",
-                                                                  "type": "string",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-response-showDetails"
-                                                                    fieldAction={
-                                                                      <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-labelledby="override_pattern"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="text"
-                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                              iconType="inputOutput"
-                                                                              onClick={[Function]}
-                                                                              size="s"
-                                                                            >
-                                                                              Override
-                                                                            </EuiButtonIcon>
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add response to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-response"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                      </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="string"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-response"
-                                                                        title="response"
-                                                                      >
-                                                                        <EuiText
-                                                                          size="xs"
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-response-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-labelledby="override_pattern"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="text"
+                                                                          data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                          iconType="inputOutput"
+                                                                          onClick={[Function]}
+                                                                          size="s"
                                                                         >
-                                                                          response
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
+                                                                          Override
+                                                                        </EuiButtonIcon>
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add response to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-response"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
+                                                                          size="xs"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="string"
                                                                   />
                                                                 }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
-                                                              >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
-                                                                >
-                                                                  <div
-                                                                    className="euiPopover__anchor"
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-response"
+                                                                    title="response"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-response-showDetails"
-                                                                      fieldAction={
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      response
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
+                                                              >
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-response-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
                                                                         <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                Override
-                                                                              </EuiButtonIcon>
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add response to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-response"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            Override
+                                                                          </EuiButtonIcon>
                                                                         </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
-                                                                        <FieldIcon
-                                                                          type="string"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
-                                                                        <span
-                                                                          className="dscSidebarField__name"
-                                                                          data-test-subj="field-response"
-                                                                          title="response"
-                                                                        >
-                                                                          <EuiText
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add response to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-response"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
                                                                             size="xs"
-                                                                          >
-                                                                            response
-                                                                          </EuiText>
-                                                                        </span>
-                                                                      }
-                                                                      isActive={false}
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="string"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-response"
+                                                                      title="response"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        response
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
+                                                                >
+                                                                  <div
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  >
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-response-showDetails"
                                                                       onClick={[Function]}
-                                                                      size="s"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-response-showDetails"
-                                                                          onClick={[Function]}
+                                                                        <FieldIcon
+                                                                          type="string"
                                                                         >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
+                                                                          <EuiToken
+                                                                            aria-label="string"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="string"
                                                                           >
-                                                                            <FieldIcon
-                                                                              type="string"
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
                                                                             >
-                                                                              <EuiToken
+                                                                              <EuiIcon
                                                                                 aria-label="string"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
                                                                                 size="l"
                                                                                 title="string"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="string"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="string"
                                                                                 >
-                                                                                  <EuiIcon
+                                                                                  <svg
+                                                                                    aria-hidden={true}
                                                                                     aria-label="string"
-                                                                                    size="l"
-                                                                                    title="string"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="string"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="string"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="string"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-response"
-                                                                              title="response"
-                                                                            >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
-                                                                                >
-                                                                                  response
-                                                                                </div>
-                                                                              </EuiText>
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
                                                                             </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
+                                                                        <span
+                                                                          className="dscSidebarField__name"
+                                                                          data-test-subj="field-response"
+                                                                          title="response"
                                                                         >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
+                                                                          <EuiText
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                <button
-                                                                                  aria-labelledby="override_pattern"
-                                                                                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
-                                                                                  data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
+                                                                              response
+                                                                            </div>
+                                                                          </EuiText>
+                                                                        </span>
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
+                                                                    >
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            <button
+                                                                              aria-labelledby="override_pattern"
+                                                                              className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
+                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inputOutput"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inputOutput"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add response to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-response"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add response to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-response"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add response to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-response"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add response to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-response"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          >
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -12556,474 +12364,462 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         data-rbd-draggable-id=""
                                                         data-test-subj="draggable"
                                                         draggable={false}
-                                                        onDragStart={[Function]}
-                                                        onTransitionEnd={null}
-                                                        role="button"
-                                                        style={
-                                                          Object {
-                                                            "transform": null,
-                                                            "transition": null,
-                                                          }
-                                                        }
-                                                        tabIndex={0}
-                                                      >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="tags"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
-                                                        >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="tags"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "tags",
-                                                                  "type": "string",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-tags-showDetails"
-                                                                    fieldAction={
-                                                                      <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-labelledby="override_pattern"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="text"
-                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                              iconType="inputOutput"
-                                                                              onClick={[Function]}
-                                                                              size="s"
-                                                                            >
-                                                                              Override
-                                                                            </EuiButtonIcon>
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add tags to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-tags"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                      </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="string"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-tags"
-                                                                        title="tags"
-                                                                      >
-                                                                        <EuiText
-                                                                          size="xs"
-                                                                        >
-                                                                          tags
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
-                                                                  />
-                                                                }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
-                                                              >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
-                                                                >
-                                                                  <div
-                                                                    className="euiPopover__anchor"
-                                                                  >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-tags-showDetails"
-                                                                      fieldAction={
-                                                                        <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                Override
-                                                                              </EuiButtonIcon>
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add tags to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-tags"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                        </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
-                                                                        <FieldIcon
-                                                                          type="string"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
-                                                                        <span
-                                                                          className="dscSidebarField__name"
-                                                                          data-test-subj="field-tags"
-                                                                          title="tags"
+                                                        onDragStart={[Function]}
+                                                        onTransitionEnd={null}
+                                                        role="button"
+                                                        style={
+                                                          Object {
+                                                            "transform": null,
+                                                            "transition": null,
+                                                          }
+                                                        }
+                                                        tabIndex={0}
+                                                      >
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "tags",
+                                                              "type": "string",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
+                                                        >
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-tags-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-labelledby="override_pattern"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="text"
+                                                                          data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                          iconType="inputOutput"
+                                                                          onClick={[Function]}
+                                                                          size="s"
                                                                         >
-                                                                          <EuiText
+                                                                          Override
+                                                                        </EuiButtonIcon>
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add tags to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-tags"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
+                                                                          size="xs"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="string"
+                                                                  />
+                                                                }
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-tags"
+                                                                    title="tags"
+                                                                  >
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      tags
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
+                                                              >
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-tags-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            Override
+                                                                          </EuiButtonIcon>
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add tags to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-tags"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
                                                                             size="xs"
-                                                                          >
-                                                                            tags
-                                                                          </EuiText>
-                                                                        </span>
-                                                                      }
-                                                                      isActive={false}
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="string"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-tags"
+                                                                      title="tags"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        tags
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
+                                                                >
+                                                                  <div
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  >
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-tags-showDetails"
                                                                       onClick={[Function]}
-                                                                      size="s"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-tags-showDetails"
-                                                                          onClick={[Function]}
+                                                                        <FieldIcon
+                                                                          type="string"
                                                                         >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
+                                                                          <EuiToken
+                                                                            aria-label="string"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="string"
                                                                           >
-                                                                            <FieldIcon
-                                                                              type="string"
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
                                                                             >
-                                                                              <EuiToken
+                                                                              <EuiIcon
                                                                                 aria-label="string"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
                                                                                 size="l"
                                                                                 title="string"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="string"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="string"
                                                                                 >
-                                                                                  <EuiIcon
+                                                                                  <svg
+                                                                                    aria-hidden={true}
                                                                                     aria-label="string"
-                                                                                    size="l"
-                                                                                    title="string"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="string"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="string"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="string"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-tags"
-                                                                              title="tags"
-                                                                            >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
-                                                                                >
-                                                                                  tags
-                                                                                </div>
-                                                                              </EuiText>
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
                                                                             </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
+                                                                        <span
+                                                                          className="dscSidebarField__name"
+                                                                          data-test-subj="field-tags"
+                                                                          title="tags"
                                                                         >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
+                                                                          <EuiText
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                <button
-                                                                                  aria-labelledby="override_pattern"
-                                                                                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
-                                                                                  data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
+                                                                              tags
+                                                                            </div>
+                                                                          </EuiText>
+                                                                        </span>
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
+                                                                    >
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            <button
+                                                                              aria-labelledby="override_pattern"
+                                                                              className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
+                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inputOutput"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inputOutput"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add tags to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-tags"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add tags to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-tags"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add tags to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-tags"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add tags to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-tags"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          >
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -13116,415 +12912,403 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="timestamp"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "timestamp",
+                                                              "type": "timestamp",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="timestamp"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "timestamp",
-                                                                  "type": "timestamp",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-timestamp-showDetails"
-                                                                    fieldAction={
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-timestamp-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
                                                                       <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiMark
-                                                                              data-test-subj="eventFields__default-timestamp-mark"
-                                                                            >
-                                                                              Default Timestamp
-                                                                            </EuiMark>
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
+                                                                        <EuiMark
+                                                                          data-test-subj="eventFields__default-timestamp-mark"
                                                                         >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add timestamp to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-timestamp"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
+                                                                          Default Timestamp
+                                                                        </EuiMark>
                                                                       </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="date"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-timestamp"
-                                                                        title="timestamp"
-                                                                      >
-                                                                        <EuiText
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add timestamp to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-timestamp"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
                                                                           size="xs"
-                                                                        >
-                                                                          timestamp
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="date"
                                                                   />
                                                                 }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
-                                                              >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
-                                                                >
-                                                                  <div
-                                                                    className="euiPopover__anchor"
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-timestamp"
+                                                                    title="timestamp"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-timestamp-showDetails"
-                                                                      fieldAction={
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      timestamp
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
+                                                              >
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-timestamp-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
                                                                         <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiMark
-                                                                                data-test-subj="eventFields__default-timestamp-mark"
-                                                                              >
-                                                                                Default Timestamp
-                                                                              </EuiMark>
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
+                                                                          <EuiMark
+                                                                            data-test-subj="eventFields__default-timestamp-mark"
                                                                           >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add timestamp to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-timestamp"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
+                                                                            Default Timestamp
+                                                                          </EuiMark>
                                                                         </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
-                                                                        <FieldIcon
-                                                                          type="date"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
-                                                                        <span
-                                                                          className="dscSidebarField__name"
-                                                                          data-test-subj="field-timestamp"
-                                                                          title="timestamp"
-                                                                        >
-                                                                          <EuiText
-                                                                            size="xs"
-                                                                          >
-                                                                            timestamp
-                                                                          </EuiText>
-                                                                        </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
-                                                                    >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-timestamp-showDetails"
-                                                                          onClick={[Function]}
-                                                                        >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
-                                                                          >
-                                                                            <FieldIcon
-                                                                              type="date"
-                                                                            >
-                                                                              <EuiToken
-                                                                                aria-label="date"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenDate"
-                                                                                size="l"
-                                                                                title="date"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis6 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-label="date"
-                                                                                    size="l"
-                                                                                    title="date"
-                                                                                    type="tokenDate"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="date"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="date"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="date"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add timestamp to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-timestamp"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="date"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-timestamp"
+                                                                      title="timestamp"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        timestamp
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
+                                                                >
+                                                                  <div
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  >
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-timestamp-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
+                                                                        <FieldIcon
+                                                                          type="date"
+                                                                        >
+                                                                          <EuiToken
+                                                                            aria-label="date"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenDate"
+                                                                            size="l"
+                                                                            title="date"
                                                                           >
                                                                             <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-timestamp"
-                                                                              title="timestamp"
+                                                                              className="euiToken euiToken--euiColorVis6 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
                                                                             >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
+                                                                              <EuiIcon
+                                                                                aria-label="date"
+                                                                                size="l"
+                                                                                title="date"
+                                                                                type="tokenDate"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="date"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="date"
                                                                                 >
-                                                                                  timestamp
-                                                                                </div>
-                                                                              </EuiText>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="date"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
                                                                             </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
+                                                                        <span
+                                                                          className="dscSidebarField__name"
+                                                                          data-test-subj="field-timestamp"
+                                                                          title="timestamp"
                                                                         >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
+                                                                          <EuiText
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
+                                                                            >
+                                                                              timestamp
+                                                                            </div>
+                                                                          </EuiText>
+                                                                        </span>
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
+                                                                    >
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiMark
+                                                                            data-test-subj="eventFields__default-timestamp-mark"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <mark
+                                                                              className="euiMark"
+                                                                              data-test-subj="eventFields__default-timestamp-mark"
                                                                             >
-                                                                              <EuiMark
-                                                                                data-test-subj="eventFields__default-timestamp-mark"
-                                                                              >
-                                                                                <mark
-                                                                                  className="euiMark"
-                                                                                  data-test-subj="eventFields__default-timestamp-mark"
+                                                                              Default Timestamp
+                                                                            </mark>
+                                                                          </EuiMark>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add timestamp to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-timestamp"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add timestamp to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-timestamp"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  Default Timestamp
-                                                                                </mark>
-                                                                              </EuiMark>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add timestamp to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-timestamp"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add timestamp to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-timestamp"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -13617,463 +13401,451 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="url"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
-                                                        >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="url"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "url",
-                                                                  "type": "string",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-url-showDetails"
-                                                                    fieldAction={
-                                                                      <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-labelledby="override_pattern"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="text"
-                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                              iconType="inputOutput"
-                                                                              onClick={[Function]}
-                                                                              size="s"
-                                                                            >
-                                                                              Override
-                                                                            </EuiButtonIcon>
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add url to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-url"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                      </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="string"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-url"
-                                                                        title="url"
-                                                                      >
-                                                                        <EuiText
-                                                                          size="xs"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "url",
+                                                              "type": "string",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
+                                                        >
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-url-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-labelledby="override_pattern"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="text"
+                                                                          data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                          iconType="inputOutput"
+                                                                          onClick={[Function]}
+                                                                          size="s"
                                                                         >
-                                                                          url
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
+                                                                          Override
+                                                                        </EuiButtonIcon>
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add url to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-url"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
+                                                                          size="xs"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="string"
                                                                   />
                                                                 }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
-                                                              >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
-                                                                >
-                                                                  <div
-                                                                    className="euiPopover__anchor"
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-url"
+                                                                    title="url"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-url-showDetails"
-                                                                      fieldAction={
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      url
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
+                                                              >
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-url-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
                                                                         <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                Override
-                                                                              </EuiButtonIcon>
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add url to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-url"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            Override
+                                                                          </EuiButtonIcon>
                                                                         </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
-                                                                        <FieldIcon
-                                                                          type="string"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
-                                                                        <span
-                                                                          className="dscSidebarField__name"
-                                                                          data-test-subj="field-url"
-                                                                          title="url"
-                                                                        >
-                                                                          <EuiText
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add url to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-url"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
                                                                             size="xs"
-                                                                          >
-                                                                            url
-                                                                          </EuiText>
-                                                                        </span>
-                                                                      }
-                                                                      isActive={false}
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="string"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-url"
+                                                                      title="url"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        url
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
+                                                                >
+                                                                  <div
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  >
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-url-showDetails"
                                                                       onClick={[Function]}
-                                                                      size="s"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-url-showDetails"
-                                                                          onClick={[Function]}
+                                                                        <FieldIcon
+                                                                          type="string"
                                                                         >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
+                                                                          <EuiToken
+                                                                            aria-label="string"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenString"
+                                                                            size="l"
+                                                                            title="string"
                                                                           >
-                                                                            <FieldIcon
-                                                                              type="string"
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
                                                                             >
-                                                                              <EuiToken
+                                                                              <EuiIcon
                                                                                 aria-label="string"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenString"
                                                                                 size="l"
                                                                                 title="string"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
+                                                                                type="tokenString"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="string"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="string"
                                                                                 >
-                                                                                  <EuiIcon
+                                                                                  <svg
+                                                                                    aria-hidden={true}
                                                                                     aria-label="string"
-                                                                                    size="l"
-                                                                                    title="string"
-                                                                                    type="tokenString"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="string"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="string"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="string"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-url"
-                                                                              title="url"
-                                                                            >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
-                                                                                >
-                                                                                  url
-                                                                                </div>
-                                                                              </EuiText>
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
                                                                             </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
+                                                                        <span
+                                                                          className="dscSidebarField__name"
+                                                                          data-test-subj="field-url"
+                                                                          title="url"
                                                                         >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
+                                                                          <EuiText
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_pattern"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                <button
-                                                                                  aria-labelledby="override_pattern"
-                                                                                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
-                                                                                  data-test-subj="eventExplorer__overrideDefaultPattern"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inputOutput"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                              url
+                                                                            </div>
+                                                                          </EuiText>
+                                                                        </span>
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
+                                                                    >
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_pattern"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            <button
+                                                                              aria-labelledby="override_pattern"
+                                                                              className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
+                                                                              data-test-subj="eventExplorer__overrideDefaultPattern"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add url to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-url"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add url to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-url"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inputOutput"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add url to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-url"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add url to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-url"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          >
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
@@ -14166,188 +13938,255 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                         }
                                                         tabIndex={0}
                                                       >
-                                                        <EuiPanel
-                                                          className="dscSidebar__item euiDraggable__item"
-                                                          data-attr-field="utc_time"
-                                                          data-test-subj="fieldList-field"
-                                                          paddingSize="s"
+                                                        <Component
+                                                          className="euiDraggable__item"
+                                                          field={
+                                                            Object {
+                                                              "name": "utc_time",
+                                                              "type": "timestamp",
+                                                            }
+                                                          }
+                                                          handleOverrideTimestamp={[MockFunction]}
+                                                          isFieldToggleButtonDisabled={false}
+                                                          isOverridingTimestamp={false}
+                                                          onToggleField={[Function]}
+                                                          selected={false}
+                                                          selectedTimestamp="timestamp"
+                                                          showTimestampOverrideButton={true}
                                                         >
-                                                          <div
-                                                            className="euiPanel euiPanel--paddingSmall euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow dscSidebar__item euiDraggable__item"
-                                                            data-attr-field="utc_time"
-                                                            data-test-subj="fieldList-field"
-                                                          >
-                                                            <Component
-                                                              field={
-                                                                Object {
-                                                                  "name": "utc_time",
-                                                                  "type": "timestamp",
-                                                                }
-                                                              }
-                                                              handleOverrideTimestamp={[MockFunction]}
-                                                              isFieldToggleButtonDisabled={false}
-                                                              isOverridingTimestamp={false}
-                                                              onToggleField={[Function]}
-                                                              selected={false}
-                                                              selectedTimestamp="timestamp"
-                                                              showTimestampOverrideButton={true}
-                                                            >
-                                                              <EuiPopover
-                                                                anchorPosition="rightUp"
-                                                                button={
-                                                                  <FieldButton
-                                                                    className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                    dataTestSubj="field-utc_time-showDetails"
-                                                                    fieldAction={
+                                                          <EuiPopover
+                                                            anchorPosition="rightUp"
+                                                            button={
+                                                              <FieldButton
+                                                                className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                dataTestSubj="field-utc_time-showDetails"
+                                                                fieldAction={
+                                                                  <React.Fragment>
+                                                                    <EuiToolTip
+                                                                      content="Override default pattern"
+                                                                      delay="long"
+                                                                      id="override-pattern"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment />
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Override default timestamp"
+                                                                      delay="long"
+                                                                      id="override-timestamp"
+                                                                      position="top"
+                                                                    >
                                                                       <React.Fragment>
-                                                                        <EuiToolTip
-                                                                          content="Override default pattern"
-                                                                          delay="long"
-                                                                          id="override-pattern"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment />
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Override default timestamp"
-                                                                          delay="long"
-                                                                          id="override-timestamp"
-                                                                          position="top"
-                                                                        >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-labelledby="override_timestamp"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="text"
-                                                                              data-test-subj="eventExplorer__overrideDefaultTimestamp"
-                                                                              iconType="inputOutput"
-                                                                              onClick={[Function]}
-                                                                              size="s"
-                                                                            >
-                                                                              Override
-                                                                            </EuiButtonIcon>
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
-                                                                        <EuiToolTip
-                                                                          content="Add field as column"
-                                                                          delay="long"
-                                                                          position="top"
+                                                                        <EuiButtonIcon
+                                                                          aria-labelledby="override_timestamp"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="text"
+                                                                          data-test-subj="eventExplorer__overrideDefaultTimestamp"
+                                                                          iconType="inputOutput"
+                                                                          onClick={[Function]}
+                                                                          size="s"
                                                                         >
-                                                                          <React.Fragment>
-                                                                            <EuiButtonIcon
-                                                                              aria-label="Add utc_time to table"
-                                                                              className="explorerSidebarItem__action"
-                                                                              color="primary"
-                                                                              data-test-subj="fieldToggle-utc_time"
-                                                                              iconType="plusInCircleFilled"
-                                                                              onClick={[Function]}
-                                                                            />
-                                                                            <EuiButtonIcon
-                                                                              iconType="inspect"
-                                                                              size="xs"
-                                                                            />
-                                                                          </React.Fragment>
-                                                                        </EuiToolTip>
+                                                                          Override
+                                                                        </EuiButtonIcon>
                                                                       </React.Fragment>
-                                                                    }
-                                                                    fieldIcon={
-                                                                      <FieldIcon
-                                                                        type="date"
-                                                                      />
-                                                                    }
-                                                                    fieldName={
-                                                                      <span
-                                                                        className="dscSidebarField__name"
-                                                                        data-test-subj="field-utc_time"
-                                                                        title="utc_time"
-                                                                      >
-                                                                        <EuiText
+                                                                    </EuiToolTip>
+                                                                    <EuiToolTip
+                                                                      content="Add field as column"
+                                                                      delay="long"
+                                                                      position="top"
+                                                                    >
+                                                                      <React.Fragment>
+                                                                        <EuiButtonIcon
+                                                                          aria-label="Add utc_time to table"
+                                                                          className="explorerSidebarItem__action"
+                                                                          color="primary"
+                                                                          data-test-subj="fieldToggle-utc_time"
+                                                                          iconType="plusInCircleFilled"
+                                                                          onClick={[Function]}
+                                                                        />
+                                                                        <EuiButtonIcon
+                                                                          iconType="inspect"
                                                                           size="xs"
-                                                                        >
-                                                                          utc_time
-                                                                        </EuiText>
-                                                                      </span>
-                                                                    }
-                                                                    isActive={false}
-                                                                    onClick={[Function]}
-                                                                    size="s"
+                                                                        />
+                                                                      </React.Fragment>
+                                                                    </EuiToolTip>
+                                                                  </React.Fragment>
+                                                                }
+                                                                fieldIcon={
+                                                                  <FieldIcon
+                                                                    type="date"
                                                                   />
                                                                 }
-                                                                closePopover={[Function]}
-                                                                display="block"
-                                                                hasArrow={true}
-                                                                isOpen={false}
-                                                                ownFocus={true}
-                                                                panelClassName="explorerSidebarItem__fieldPopoverPanel"
-                                                                panelPaddingSize="m"
+                                                                fieldName={
+                                                                  <span
+                                                                    className="dscSidebarField__name"
+                                                                    data-test-subj="field-utc_time"
+                                                                    title="utc_time"
+                                                                  >
+                                                                    <EuiText
+                                                                      size="xs"
+                                                                    >
+                                                                      utc_time
+                                                                    </EuiText>
+                                                                  </span>
+                                                                }
+                                                                isActive={false}
+                                                                onClick={[Function]}
+                                                                size="s"
+                                                              />
+                                                            }
+                                                            closePopover={[Function]}
+                                                            display="block"
+                                                            hasArrow={true}
+                                                            isOpen={false}
+                                                            ownFocus={true}
+                                                            panelClassName="explorerSidebarItem__fieldPopoverPanel"
+                                                            panelPaddingSize="m"
+                                                          >
+                                                            <div
+                                                              className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                            >
+                                                              <div
+                                                                className="euiPopover__anchor"
                                                               >
-                                                                <div
-                                                                  className="euiPopover euiPopover--anchorRightUp euiPopover--displayBlock"
+                                                                <FieldButton
+                                                                  className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                  dataTestSubj="field-utc_time-showDetails"
+                                                                  fieldAction={
+                                                                    <React.Fragment>
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_timestamp"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultTimestamp"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            Override
+                                                                          </EuiButtonIcon>
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <React.Fragment>
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add utc_time to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-utc_time"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          />
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
+                                                                          />
+                                                                        </React.Fragment>
+                                                                      </EuiToolTip>
+                                                                    </React.Fragment>
+                                                                  }
+                                                                  fieldIcon={
+                                                                    <FieldIcon
+                                                                      type="date"
+                                                                    />
+                                                                  }
+                                                                  fieldName={
+                                                                    <span
+                                                                      className="dscSidebarField__name"
+                                                                      data-test-subj="field-utc_time"
+                                                                      title="utc_time"
+                                                                    >
+                                                                      <EuiText
+                                                                        size="xs"
+                                                                      >
+                                                                        utc_time
+                                                                      </EuiText>
+                                                                    </span>
+                                                                  }
+                                                                  isActive={false}
+                                                                  onClick={[Function]}
+                                                                  size="s"
                                                                 >
                                                                   <div
-                                                                    className="euiPopover__anchor"
+                                                                    className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
                                                                   >
-                                                                    <FieldButton
-                                                                      className="shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
-                                                                      dataTestSubj="field-utc_time-showDetails"
-                                                                      fieldAction={
-                                                                        <React.Fragment>
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_timestamp"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultTimestamp"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                Override
-                                                                              </EuiButtonIcon>
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
-                                                                          >
-                                                                            <React.Fragment>
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add utc_time to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-utc_time"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              />
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              />
-                                                                            </React.Fragment>
-                                                                          </EuiToolTip>
-                                                                        </React.Fragment>
-                                                                      }
-                                                                      fieldIcon={
+                                                                    <button
+                                                                      className="osd-resetFocusState osdFieldButton__button"
+                                                                      data-test-subj="field-utc_time-showDetails"
+                                                                      onClick={[Function]}
+                                                                    >
+                                                                      <span
+                                                                        className="osdFieldButton__fieldIcon"
+                                                                      >
                                                                         <FieldIcon
                                                                           type="date"
-                                                                        />
-                                                                      }
-                                                                      fieldName={
+                                                                        >
+                                                                          <EuiToken
+                                                                            aria-label="date"
+                                                                            className="osdFieldIcon"
+                                                                            iconType="tokenDate"
+                                                                            size="l"
+                                                                            title="date"
+                                                                          >
+                                                                            <span
+                                                                              className="euiToken euiToken--euiColorVis6 euiToken--square euiToken--light euiToken--large osdFieldIcon"
+                                                                              style={Object {}}
+                                                                            >
+                                                                              <EuiIcon
+                                                                                aria-label="date"
+                                                                                size="l"
+                                                                                title="date"
+                                                                                type="tokenDate"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  aria-label="date"
+                                                                                  className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
+                                                                                  title="date"
+                                                                                >
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    aria-label="date"
+                                                                                    className="euiIcon euiIcon--large euiIcon-isLoading"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </span>
+                                                                          </EuiToken>
+                                                                        </FieldIcon>
+                                                                      </span>
+                                                                      <span
+                                                                        className="osdFieldButton__name"
+                                                                      >
                                                                         <span
                                                                           className="dscSidebarField__name"
                                                                           data-test-subj="field-utc_time"
@@ -14356,273 +14195,194 @@ exports[`Siderbar component Renders sidebar component 1`] = `
                                                                           <EuiText
                                                                             size="xs"
                                                                           >
-                                                                            utc_time
+                                                                            <div
+                                                                              className="euiText euiText--extraSmall"
+                                                                            >
+                                                                              utc_time
+                                                                            </div>
                                                                           </EuiText>
                                                                         </span>
-                                                                      }
-                                                                      isActive={false}
-                                                                      onClick={[Function]}
-                                                                      size="s"
+                                                                      </span>
+                                                                    </button>
+                                                                    <div
+                                                                      className="osdFieldButton__fieldAction"
                                                                     >
-                                                                      <div
-                                                                        className="osdFieldButton osdFieldButton--small shard__fieldSelectorField explorer__fieldSelectorField vbFieldButton"
+                                                                      <EuiToolTip
+                                                                        content="Override default pattern"
+                                                                        delay="long"
+                                                                        id="override-pattern"
+                                                                        position="top"
                                                                       >
-                                                                        <button
-                                                                          className="osd-resetFocusState osdFieldButton__button"
-                                                                          data-test-subj="field-utc_time-showDetails"
-                                                                          onClick={[Function]}
-                                                                        >
-                                                                          <span
-                                                                            className="osdFieldButton__fieldIcon"
-                                                                          >
-                                                                            <FieldIcon
-                                                                              type="date"
-                                                                            >
-                                                                              <EuiToken
-                                                                                aria-label="date"
-                                                                                className="osdFieldIcon"
-                                                                                iconType="tokenDate"
-                                                                                size="l"
-                                                                                title="date"
-                                                                              >
-                                                                                <span
-                                                                                  className="euiToken euiToken--euiColorVis6 euiToken--square euiToken--light euiToken--large osdFieldIcon"
-                                                                                  style={Object {}}
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-label="date"
-                                                                                    size="l"
-                                                                                    title="date"
-                                                                                    type="tokenDate"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      aria-label="date"
-                                                                                      className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                      title="date"
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        aria-label="date"
-                                                                                        className="euiIcon euiIcon--large euiIcon-isLoading"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </span>
-                                                                              </EuiToken>
-                                                                            </FieldIcon>
-                                                                          </span>
-                                                                          <span
-                                                                            className="osdFieldButton__name"
-                                                                          >
-                                                                            <span
-                                                                              className="dscSidebarField__name"
-                                                                              data-test-subj="field-utc_time"
-                                                                              title="utc_time"
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        />
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Override default timestamp"
+                                                                        delay="long"
+                                                                        id="override-timestamp"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-labelledby="override_timestamp"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="text"
+                                                                            data-test-subj="eventExplorer__overrideDefaultTimestamp"
+                                                                            iconType="inputOutput"
+                                                                            onClick={[Function]}
+                                                                            size="s"
+                                                                          >
+                                                                            <button
+                                                                              aria-labelledby="override_timestamp"
+                                                                              className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
+                                                                              data-test-subj="eventExplorer__overrideDefaultTimestamp"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiText
-                                                                                size="xs"
-                                                                              >
-                                                                                <div
-                                                                                  className="euiText euiText--extraSmall"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inputOutput"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  utc_time
-                                                                                </div>
-                                                                              </EuiText>
-                                                                            </span>
-                                                                          </span>
-                                                                        </button>
-                                                                        <div
-                                                                          className="osdFieldButton__fieldAction"
-                                                                        >
-                                                                          <EuiToolTip
-                                                                            content="Override default pattern"
-                                                                            delay="long"
-                                                                            id="override-pattern"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
-                                                                            />
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Override default timestamp"
-                                                                            delay="long"
-                                                                            id="override-timestamp"
-                                                                            position="top"
-                                                                          >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                      <EuiToolTip
+                                                                        content="Add field as column"
+                                                                        delay="long"
+                                                                        position="top"
+                                                                      >
+                                                                        <span
+                                                                          className="euiToolTipAnchor"
+                                                                          onKeyUp={[Function]}
+                                                                          onMouseOut={[Function]}
+                                                                          onMouseOver={[Function]}
+                                                                        >
+                                                                          <EuiButtonIcon
+                                                                            aria-label="Add utc_time to table"
+                                                                            className="explorerSidebarItem__action"
+                                                                            color="primary"
+                                                                            data-test-subj="fieldToggle-utc_time"
+                                                                            iconType="plusInCircleFilled"
+                                                                            onClick={[Function]}
+                                                                          >
+                                                                            <button
+                                                                              aria-label="Add utc_time to table"
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
+                                                                              data-test-subj="fieldToggle-utc_time"
+                                                                              disabled={false}
+                                                                              onClick={[Function]}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-labelledby="override_timestamp"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="text"
-                                                                                data-test-subj="eventExplorer__overrideDefaultTimestamp"
-                                                                                iconType="inputOutput"
-                                                                                onClick={[Function]}
-                                                                                size="s"
-                                                                              >
-                                                                                <button
-                                                                                  aria-labelledby="override_timestamp"
-                                                                                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--small explorerSidebarItem__action"
-                                                                                  data-test-subj="eventExplorer__overrideDefaultTimestamp"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="plusInCircleFilled"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inputOutput"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                          <EuiToolTip
-                                                                            content="Add field as column"
-                                                                            delay="long"
-                                                                            position="top"
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                          <EuiButtonIcon
+                                                                            iconType="inspect"
+                                                                            size="xs"
                                                                           >
-                                                                            <span
-                                                                              className="euiToolTipAnchor"
-                                                                              onKeyUp={[Function]}
-                                                                              onMouseOut={[Function]}
-                                                                              onMouseOver={[Function]}
+                                                                            <button
+                                                                              className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+                                                                              disabled={false}
+                                                                              type="button"
                                                                             >
-                                                                              <EuiButtonIcon
-                                                                                aria-label="Add utc_time to table"
-                                                                                className="explorerSidebarItem__action"
-                                                                                color="primary"
-                                                                                data-test-subj="fieldToggle-utc_time"
-                                                                                iconType="plusInCircleFilled"
-                                                                                onClick={[Function]}
-                                                                              >
-                                                                                <button
-                                                                                  aria-label="Add utc_time to table"
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall explorerSidebarItem__action"
-                                                                                  data-test-subj="fieldToggle-utc_time"
-                                                                                  disabled={false}
-                                                                                  onClick={[Function]}
-                                                                                  type="button"
-                                                                                >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="plusInCircleFilled"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                              <EuiButtonIcon
-                                                                                iconType="inspect"
-                                                                                size="xs"
-                                                                              >
-                                                                                <button
-                                                                                  className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
-                                                                                  disabled={false}
-                                                                                  type="button"
+                                                                              <EuiIcon
+                                                                                aria-hidden="true"
+                                                                                className="euiButtonIcon__icon"
+                                                                                color="inherit"
+                                                                                size="m"
+                                                                                type="inspect"
+                                                                              >
+                                                                                <EuiIconEmpty
+                                                                                  aria-hidden={true}
+                                                                                  className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                  focusable="false"
+                                                                                  role="img"
+                                                                                  style={null}
                                                                                 >
-                                                                                  <EuiIcon
-                                                                                    aria-hidden="true"
-                                                                                    className="euiButtonIcon__icon"
-                                                                                    color="inherit"
-                                                                                    size="m"
-                                                                                    type="inspect"
-                                                                                  >
-                                                                                    <EuiIconEmpty
-                                                                                      aria-hidden={true}
-                                                                                      className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                      focusable="false"
-                                                                                      role="img"
-                                                                                      style={null}
-                                                                                    >
-                                                                                      <svg
-                                                                                        aria-hidden={true}
-                                                                                        className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
-                                                                                        focusable="false"
-                                                                                        height={16}
-                                                                                        role="img"
-                                                                                        style={null}
-                                                                                        viewBox="0 0 16 16"
-                                                                                        width={16}
-                                                                                        xmlns="http://www.w3.org/2000/svg"
-                                                                                      />
-                                                                                    </EuiIconEmpty>
-                                                                                  </EuiIcon>
-                                                                                </button>
-                                                                              </EuiButtonIcon>
-                                                                            </span>
-                                                                          </EuiToolTip>
-                                                                        </div>
-                                                                      </div>
-                                                                    </FieldButton>
+                                                                                  <svg
+                                                                                    aria-hidden={true}
+                                                                                    className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
+                                                                                    focusable="false"
+                                                                                    height={16}
+                                                                                    role="img"
+                                                                                    style={null}
+                                                                                    viewBox="0 0 16 16"
+                                                                                    width={16}
+                                                                                    xmlns="http://www.w3.org/2000/svg"
+                                                                                  />
+                                                                                </EuiIconEmpty>
+                                                                              </EuiIcon>
+                                                                            </button>
+                                                                          </EuiButtonIcon>
+                                                                        </span>
+                                                                      </EuiToolTip>
+                                                                    </div>
                                                                   </div>
-                                                                </div>
-                                                              </EuiPopover>
-                                                            </Component>
-                                                          </div>
-                                                        </EuiPanel>
+                                                                </FieldButton>
+                                                              </div>
+                                                            </div>
+                                                          </EuiPopover>
+                                                        </Component>
                                                       </div>
                                                     </Draggable>
                                                   </Connect(Draggable)>
diff --git a/public/components/event_analytics/explorer/sidebar/sidebar.tsx b/public/components/event_analytics/explorer/sidebar/sidebar.tsx
index 9ae6fb1275..543ebb5fa9 100644
--- a/public/components/event_analytics/explorer/sidebar/sidebar.tsx
+++ b/public/components/event_analytics/explorer/sidebar/sidebar.tsx
@@ -3,26 +3,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useState, useCallback, useContext } from 'react';
-import { batch, useDispatch } from 'react-redux';
-import { isEmpty } from 'lodash';
 import {
-  EuiTitle,
-  EuiSpacer,
-  EuiFieldSearch,
   EuiAccordion,
-  EuiHorizontalRule,
   EuiDragDropContext,
-  EuiDroppable,
   EuiDraggable,
+  EuiDroppable,
+  EuiFieldSearch,
+  EuiHorizontalRule,
   EuiPanel,
+  EuiSpacer,
+  EuiTitle,
 } from '@elastic/eui';
 import { I18nProvider } from '@osd/i18n/react';
-import { Field } from './field';
-import { ExplorerFields, IExplorerFields, IField } from '../../../../../common/types/explorer';
+import { isEmpty } from 'lodash';
+import React, { useCallback, useContext, useState } from 'react';
+import { batch, useDispatch } from 'react-redux';
 import { AVAILABLE_FIELDS, SELECTED_FIELDS } from '../../../../../common/constants/explorer';
-import { sortFields, updateFields } from '../../redux/slices/field_slice';
+import { ExplorerFields, IExplorerFields, IField } from '../../../../../common/types/explorer';
 import { TabContext } from '../../hooks/use_tab_context';
+import { sortFields, updateFields } from '../../redux/slices/field_slice';
+import { Field } from './field';
 
 interface ISidebarProps {
   query: string;
@@ -314,27 +314,20 @@ export const Sidebar = (props: ISidebarProps) => {
                               index={index}
                               draggableId=""
                             >
-                              <EuiPanel
-                                data-attr-field={field.name}
-                                paddingSize="s"
-                                className="dscSidebar__item"
-                                data-test-subj={`fieldList-field`}
-                              >
-                                <Field
-                                  query={query}
-                                  field={field}
-                                  selectedPattern={selectedPattern}
-                                  isOverridingPattern={isOverridingPattern}
-                                  handleOverridePattern={handleOverridePattern}
-                                  selectedTimestamp={selectedTimestamp}
-                                  isOverridingTimestamp={isOverridingTimestamp}
-                                  handleOverrideTimestamp={handleOverrideTimestamp}
-                                  onToggleField={handleAddField}
-                                  selected={false}
-                                  isFieldToggleButtonDisabled={isFieldToggleButtonDisabled}
-                                  showTimestampOverrideButton={true}
-                                />
-                              </EuiPanel>
+                              <Field
+                                query={query}
+                                field={field}
+                                selectedPattern={selectedPattern}
+                                isOverridingPattern={isOverridingPattern}
+                                handleOverridePattern={handleOverridePattern}
+                                selectedTimestamp={selectedTimestamp}
+                                isOverridingTimestamp={isOverridingTimestamp}
+                                handleOverrideTimestamp={handleOverrideTimestamp}
+                                onToggleField={handleAddField}
+                                selected={false}
+                                isFieldToggleButtonDisabled={isFieldToggleButtonDisabled}
+                                showTimestampOverrideButton={true}
+                              />
                             </EuiDraggable>
                           );
                         })}
diff --git a/public/components/event_analytics/explorer/visualizations/direct_query_vis.tsx b/public/components/event_analytics/explorer/visualizations/direct_query_vis.tsx
index 411d950eeb..73d55f0a56 100644
--- a/public/components/event_analytics/explorer/visualizations/direct_query_vis.tsx
+++ b/public/components/event_analytics/explorer/visualizations/direct_query_vis.tsx
@@ -3,16 +3,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { EuiCallOut, EuiFlexGroup, EuiFlexItem, EuiLink, EuiTitle } from '@elastic/eui';
 import React from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiCallOut, EuiLink, EuiTitle } from '@elastic/eui';
+import { queryWorkbenchPluginID } from '../../../../../common/constants/shared';
+import { coreRefs } from '../../../../framework/core_refs';
 
-export const DirectQueryVisualization = () => {
+interface DirectQueryVisualizationProps {
+  currentDataSource: string;
+}
+
+export const DirectQueryVisualization = ({ currentDataSource }: DirectQueryVisualizationProps) => {
   return (
     <EuiFlexGroup direction="column">
       <EuiFlexItem grow={false}>
         <EuiCallOut title="Data source can't be visualized." color="danger" iconType="alert">
           <p>
-            <EuiLink href="#">Index data to visualize</EuiLink>.
+            <EuiLink
+              onClick={() =>
+                coreRefs?.application!.navigateToApp(queryWorkbenchPluginID, {
+                  path: `#/${currentDataSource}`,
+                })
+              }
+            >
+              Index data to visualize
+            </EuiLink>
           </p>
         </EuiCallOut>
       </EuiFlexItem>
diff --git a/public/components/event_analytics/redux/slices/query_slice.ts b/public/components/event_analytics/redux/slices/query_slice.ts
index 8267d72f96..b6e3b5f611 100644
--- a/public/components/event_analytics/redux/slices/query_slice.ts
+++ b/public/components/event_analytics/redux/slices/query_slice.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createSlice, createSelector } from '@reduxjs/toolkit';
+import { createSelector, createSlice } from '@reduxjs/toolkit';
 import {
   APP_ANALYTICS_TAB_ID_REGEX,
   FILTERED_PATTERN,