diff --git a/src/plugins/unified_search/public/actions/apply_filter_action.ts b/src/plugins/unified_search/public/actions/apply_filter_action.ts
index 6bd2b3ab60932b8..ad6e89468eaafd5 100644
--- a/src/plugins/unified_search/public/actions/apply_filter_action.ts
+++ b/src/plugins/unified_search/public/actions/apply_filter_action.ts
@@ -10,7 +10,8 @@ import { i18n } from '@kbn/i18n';
 import { ThemeServiceSetup } from '@kbn/core/public';
 import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { Action, createAction, IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
-import { Filter, FilterManager, TimefilterContract, esFilters } from '@kbn/data-plugin/public';
+import { FilterManager, TimefilterContract, esFilters } from '@kbn/data-plugin/public';
+import { Filter } from '@kbn/es-query';
 import { getOverlays, getDataViews } from '../services';
 import { applyFiltersPopover } from '../apply_filters';
 
diff --git a/src/plugins/unified_search/public/apply_filters/apply_filter_popover_content.tsx b/src/plugins/unified_search/public/apply_filters/apply_filter_popover_content.tsx
index 97ad3ba72b12347..ccfad74b691d892 100644
--- a/src/plugins/unified_search/public/apply_filters/apply_filter_popover_content.tsx
+++ b/src/plugins/unified_search/public/apply_filters/apply_filter_popover_content.tsx
@@ -20,7 +20,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { Component } from 'react';
 import { getDisplayValueFromFilter, mapAndFlattenFilters } from '@kbn/data-plugin/public';
-import { Filter } from '@kbn/data-plugin/common';
+import { Filter } from '@kbn/es-query';
 import { DataView } from '@kbn/data-views-plugin/public';
 import { FilterLabel } from '../filter_bar';
 
diff --git a/src/plugins/unified_search/public/apply_filters/apply_filters_popover.tsx b/src/plugins/unified_search/public/apply_filters/apply_filters_popover.tsx
index 7c8ba2e0ac9ea23..32bb65768ae10f5 100644
--- a/src/plugins/unified_search/public/apply_filters/apply_filters_popover.tsx
+++ b/src/plugins/unified_search/public/apply_filters/apply_filters_popover.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 
 import { EuiDelayRender, EuiLoadingSpinner } from '@elastic/eui';
-import { Filter } from '@kbn/data-plugin/common';
+import { Filter } from '@kbn/es-query';
 import { DataView } from '@kbn/data-views-plugin/common';
 
 type CancelFnType = () => void;
diff --git a/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
index 24a27bcb99fbe15..74f0b6c90f495c2 100644
--- a/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
@@ -7,7 +7,8 @@
  */
 
 import { coreMock } from '@kbn/core/public/mocks';
-import { KueryNode } from '@kbn/data-plugin/public';
+import { KueryNode } from '@kbn/es-query';
+
 import { setupGetConjunctionSuggestions } from './conjunction';
 import { QuerySuggestionGetFnArgs } from '../query_suggestion_provider';
 
diff --git a/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.test.ts
index ccb2ab5db7f1ccb..6b16d2e73aef575 100644
--- a/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.test.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.test.ts
@@ -8,7 +8,8 @@
 
 import dataViewResponse from './__fixtures__/data_view_response.json';
 
-import { indexPatterns as dataViewsUtils, KueryNode } from '@kbn/data-plugin/public';
+import { indexPatterns as dataViewsUtils } from '@kbn/data-plugin/public';
+import { KueryNode } from '@kbn/es-query';
 import { setupGetFieldSuggestions } from './field';
 import { QuerySuggestionGetFnArgs } from '../query_suggestion_provider';
 import { coreMock } from '@kbn/core/public/mocks';
diff --git a/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
index 87ef95f0e970039..6b3c471002bc029 100644
--- a/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
@@ -9,7 +9,7 @@
 import dataViewResponse from './__fixtures__/data_view_response.json';
 
 import { setupGetOperatorSuggestions } from './operator';
-import { KueryNode } from '@kbn/data-plugin/public';
+import { KueryNode } from '@kbn/es-query';
 import { QuerySuggestionGetFnArgs } from '../query_suggestion_provider';
 import { coreMock } from '@kbn/core/public/mocks';
 
diff --git a/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.test.ts
index 9ce265c3307ec85..1227e947b1b4dd0 100644
--- a/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.test.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.test.ts
@@ -10,7 +10,7 @@ import { setupGetValueSuggestions } from './value';
 import dataViewResponse from './__fixtures__/data_view_response.json';
 
 import { coreMock } from '@kbn/core/public/mocks';
-import { KueryNode } from '@kbn/data-plugin/public';
+import { KueryNode } from '@kbn/es-query';
 import { QuerySuggestionGetFnArgs } from '../query_suggestion_provider';
 
 const mockKueryNode = (kueryNode: Partial<KueryNode>) => kueryNode as unknown as KueryNode;
diff --git a/src/plugins/unified_search/public/data_view_select/create_data_view_select.tsx b/src/plugins/unified_search/public/data_view_select/create_data_view_select.tsx
index 6fc263dcb409b01..6a2aa7da69760bb 100644
--- a/src/plugins/unified_search/public/data_view_select/create_data_view_select.tsx
+++ b/src/plugins/unified_search/public/data_view_select/create_data_view_select.tsx
@@ -9,7 +9,7 @@
 import _ from 'lodash';
 import React from 'react';
 
-import { IndexPatternsContract as DataViewsContract } from '@kbn/data-plugin/public';
+import { DataViewsContract } from '@kbn/data-plugin/public';
 import DataViewSelect, { DataViewSelectProps } from './data_view_select';
 
 // Takes in stateful runtime dependencies and pre-wires them to the component
diff --git a/src/plugins/unified_search/public/data_view_select/data_view_select.tsx b/src/plugins/unified_search/public/data_view_select/data_view_select.tsx
index 0e24a4b4187ef9f..44543b7bbf8b680 100644
--- a/src/plugins/unified_search/public/data_view_select/data_view_select.tsx
+++ b/src/plugins/unified_search/public/data_view_select/data_view_select.tsx
@@ -11,7 +11,7 @@ import React, { Component } from 'react';
 
 import { Required } from '@kbn/utility-types';
 import { EuiComboBox, EuiComboBoxProps } from '@elastic/eui';
-import { IndexPatternsContract as DataViewsContract } from '@kbn/data-plugin/public';
+import { DataViewsContract } from '@kbn/data-plugin/public';
 
 export type DataViewSelectProps = Required<
   Omit<
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts
index 0624e67060b01a0..e5e4fa46aea0e69 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts
@@ -14,7 +14,7 @@ import {
   stubDataView,
   stubFields,
 } from '@kbn/data-plugin/common/stubs';
-import { toggleFilterNegated } from '@kbn/data-plugin/common';
+import { toggleFilterNegated } from '@kbn/es-query';
 import {
   getFieldFromFilter,
   getFilterableFields,
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.tsx
index 0f5ea0cc136ad8e..8e0603a6780a373 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.tsx
@@ -9,7 +9,7 @@
 import React, { Fragment } from 'react';
 import { EuiTextColor } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { Filter, FILTERS } from '@kbn/data-plugin/common';
+import { Filter, FILTERS } from '@kbn/es-query';
 import { existsOperator, isOneOfOperator } from './filter_operators';
 import type { FilterLabelStatus } from '../../filter_item';
 
diff --git a/src/plugins/unified_search/public/search_bar/create_search_bar.tsx b/src/plugins/unified_search/public/search_bar/create_search_bar.tsx
index 3d8aa26af22af46..e2bd51ba73eaa5c 100644
--- a/src/plugins/unified_search/public/search_bar/create_search_bar.tsx
+++ b/src/plugins/unified_search/public/search_bar/create_search_bar.tsx
@@ -12,7 +12,8 @@ import { CoreStart } from '@kbn/core/public';
 import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { QueryStart, SavedQuery, DataPublicPluginStart } from '@kbn/data-plugin/public';
-import { Filter, Query, TimeRange } from '@kbn/data-plugin/common';
+import { Query, TimeRange } from '@kbn/data-plugin/common';
+import { Filter } from '@kbn/es-query';
 import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { SearchBar } from '.';
 import type { SearchBarOwnProps } from '.';
diff --git a/src/plugins/unified_search/public/search_bar/lib/use_filter_manager.ts b/src/plugins/unified_search/public/search_bar/lib/use_filter_manager.ts
index 511e05e043b2638..34d70a0b039aeba 100644
--- a/src/plugins/unified_search/public/search_bar/lib/use_filter_manager.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/use_filter_manager.ts
@@ -8,7 +8,8 @@
 
 import { useState, useEffect } from 'react';
 import { Subscription } from 'rxjs';
-import { DataPublicPluginStart, Filter } from '@kbn/data-plugin/public';
+import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { Filter } from '@kbn/es-query';
 
 interface UseFilterManagerProps {
   filters?: Filter[];
diff --git a/src/plugins/unified_search/public/test_helpers/get_stub_filter.ts b/src/plugins/unified_search/public/test_helpers/get_stub_filter.ts
index 2954526d7ede8de..6c14f0092e7e1e8 100644
--- a/src/plugins/unified_search/public/test_helpers/get_stub_filter.ts
+++ b/src/plugins/unified_search/public/test_helpers/get_stub_filter.ts
@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Filter, FilterStateStore } from '@kbn/data-plugin/public';
+import { FilterStateStore } from '@kbn/data-plugin/public';
+import { Filter } from '@kbn/es-query';
 
 export function getFilter(
   store: FilterStateStore,