From 3e2761d981178b19aacc5638c268980b90e61beb Mon Sep 17 00:00:00 2001
From: Nodir Latipov <nodir.latypov@gmail.com>
Date: Tue, 5 Apr 2022 12:23:31 +0500
Subject: [PATCH] [Unified search] Create unified search plugin (#127651)

* [Unified search] Create unified search plugin

* add unified_search into USES_STYLED_COMPONENTS

* fix JEST group 4

* update limits for data plugin

* fix: remove unifiedSearch plugin from x-pack/plugins/file_upload

* feat: updated .github/CODEOWNERS and set @elastic/kibana-app-services as a code owner

* apply PR comments

* [CI] Auto-commit changed files from 'node scripts/build_plugin_list_docs'

* feat: moved filter bar, apply filters folders and apply filter action from Data plugin to unified search plugin

* fix Checks

* fix Checks

* fix Linting and Default CI Group #16

* fix Checks

* fix Checks

* fix Linting (with types)

* fix show FILTER_BAR

* fix Jest Tests

* feat replece indexPatternsContranct in setIndexPatterns to DataViewsContract

* feat: removed unnecessary interface in unified search

* fix Checks

* fix Checks

* fix Jest Tests, Checks

* fix Checks

* resolve comments

Co-authored-by: Alexey Antonov <alexwizp@gmail.com>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .github/CODEOWNERS                            |   1 +
 .i18nrc.json                                  |   3 +-
 docs/developer/plugin-list.asciidoc           |   4 +
 examples/search_examples/kibana.json          |   2 +-
 .../search_examples/public/application.tsx    |   4 +-
 .../search_examples/public/search/app.tsx     |   5 +-
 .../public/search_sessions/app.tsx            |   5 +-
 examples/search_examples/public/types.ts      |   2 +
 .../styled_components_files.js                |   2 +-
 packages/kbn-optimizer/limits.yml             |   3 +-
 src/plugins/data/public/actions/index.ts      |   2 -
 src/plugins/data/public/deprecated.ts         |   5 -
 src/plugins/data/public/index.scss            |   1 -
 src/plugins/data/public/index.ts              |  18 +-
 src/plugins/data/public/mocks.ts              |   4 -
 src/plugins/data/public/plugin.ts             |  32 +--
 src/plugins/data/public/query/index.tsx       |   1 +
 src/plugins/data/public/query/lib/index.ts    |   4 -
 .../public/search/fetch/handle_response.tsx   |   2 +-
 src/plugins/data/public/search/index.ts       |   2 +
 .../__mocks__/shard_failure_request.ts        |   0
 .../__mocks__/shard_failure_response.ts       |   0
 .../shard_failure_description.test.tsx.snap   |   0
 .../shard_failure_modal.test.tsx.snap         |   0
 .../shard_failure_table.test.tsx.snap         |   0
 .../_shard_failure_modal.scss                 |   0
 .../{ui => }/shard_failure_modal/index.tsx    |   0
 .../shard_failure_description.test.tsx        |   0
 .../shard_failure_description.tsx             |   0
 .../shard_failure_description_header.tsx      |   0
 .../shard_failure_modal.test.tsx              |   0
 .../shard_failure_modal.tsx                   |   0
 ...d_failure_open_modal_button.test.mocks.tsx |   2 +-
 .../shard_failure_open_modal_button.test.tsx  |   0
 .../shard_failure_open_modal_button.tsx       |   7 +-
 .../shard_failure_table.test.tsx              |   0
 .../shard_failure_table.tsx                   |   0
 .../shard_failure_types.ts                    |   0
 src/plugins/data/public/types.ts              |  15 --
 .../filter_editor/lib/filter_label.test.tsx   | 143 -----------
 src/plugins/data/public/ui/index.ts           |  15 --
 src/plugins/data/tsconfig.json                |   2 +-
 src/plugins/data_view_management/kibana.json  |   2 +-
 .../components/scripting_help/test_script.tsx |   2 +-
 .../mount_management_section.tsx              |   3 +-
 .../data_view_management/public/mocks.ts      |   3 +
 .../data_view_management/public/plugin.ts     |   2 +
 .../data_view_management/public/types.ts      |   2 +
 .../data_view_management/tsconfig.json        |   1 +
 src/plugins/input_control_vis/kibana.json     |   2 +-
 .../editor/index_pattern_select_form_row.tsx  |   2 +-
 .../components/editor/list_control_editor.tsx |   6 +-
 .../editor/range_control_editor.tsx           |   6 +-
 .../input_control_vis/public/plugin.ts        |   2 +
 .../public/test_utils/get_deps_mock.tsx       |   8 +-
 src/plugins/input_control_vis/tsconfig.json   |   1 +
 src/plugins/navigation/kibana.json            |   2 +-
 src/plugins/navigation/public/plugin.ts       |   4 +-
 .../top_nav_menu/create_top_nav_menu.tsx      |   6 +-
 .../public/top_nav_menu/top_nav_menu.test.tsx |  18 +-
 .../public/top_nav_menu/top_nav_menu.tsx      |  15 +-
 src/plugins/navigation/public/types.ts        |   4 +-
 src/plugins/navigation/tsconfig.json          |   1 +
 src/plugins/unified_search/README.md          |  12 +
 src/plugins/unified_search/config.ts          |  13 +
 src/plugins/unified_search/jest.config.js     |  16 ++
 src/plugins/unified_search/kibana.json        |  14 ++
 .../public/actions/apply_filter_action.ts     |   6 +-
 .../unified_search/public/actions/index.ts    |  10 +
 .../apply_filter_popover_content.tsx          |  11 +-
 .../apply_filters/apply_filters_popover.tsx   |   2 +-
 .../public}/apply_filters/index.ts            |   0
 .../filter_bar/_global_filter_group.scss      |   0
 .../filter_bar/_global_filter_item.scss       |   0
 .../public}/filter_bar/_index.scss            |   0
 .../public}/filter_bar/_variables.scss        |   0
 .../public}/filter_bar/filter_bar.tsx         |  14 +-
 .../filter_editor/filter_editor.test.tsx      |   4 +-
 .../filter_editor/generic_combo_box.tsx       |   0
 .../filter_bar/filter_editor/index.tsx        |  38 +--
 .../__snapshots__/filter_label.test.tsx.snap  |  68 +++++
 .../lib/filter_editor_utils.test.ts           |   4 +-
 .../filter_editor/lib/filter_editor_utils.ts  |   2 +-
 .../filter_editor/lib/filter_label.test.tsx   |  64 +++++
 .../filter_editor/lib/filter_label.tsx        |   4 +-
 .../filter_editor/lib/filter_operators.ts     |  18 +-
 .../filter_editor/phrase_suggestor.tsx        |   6 +-
 .../filter_editor/phrase_value_input.tsx      |   8 +-
 .../filter_editor/phrases_values_input.tsx    |   6 +-
 .../filter_editor/range_value_input.tsx       |  10 +-
 .../filter_editor/value_input_type.tsx        |   6 +-
 .../public}/filter_bar/filter_item.tsx        |  32 +--
 .../public}/filter_bar/filter_options.tsx     |  20 +-
 .../public}/filter_bar/filter_view/index.tsx  |  35 ++-
 .../public}/filter_bar/index.tsx              |   7 +
 .../public/index.scss}                        |   5 +-
 src/plugins/unified_search/public/index.ts    |  27 ++
 .../create_index_pattern_select.tsx           |   2 +-
 .../public}/index_pattern_select/index.tsx    |   0
 .../index_pattern_select.tsx                  |   3 +-
 src/plugins/unified_search/public/mocks.ts    |  25 ++
 src/plugins/unified_search/public/plugin.ts   |  75 ++++++
 .../public}/query_string_input/_index.scss    |   0
 .../query_string_input/_query_bar.scss        |   0
 .../fetch_index_patterns.ts                   |   2 +-
 .../query_string_input}/from_user.test.ts     |   2 +-
 .../public/query_string_input}/from_user.ts   |   0
 .../public}/query_string_input/index.tsx      |   3 +-
 .../language_switcher.test.tsx                |   4 +-
 .../query_string_input/language_switcher.tsx  |  29 ++-
 .../public/query_string_input}/match_pairs.ts |   0
 .../no_data_popover.test.tsx                  |   0
 .../query_string_input/no_data_popover.tsx    |  16 +-
 .../query_bar_top_row.test.tsx                |  10 +-
 .../query_string_input/query_bar_top_row.tsx  |  19 +-
 .../query_string_input.test.mocks.ts          |   4 +-
 .../query_string_input.test.tsx               |   8 +-
 .../query_string_input/query_string_input.tsx |  45 ++--
 .../query_string_input}/to_user.test.ts       |   2 +-
 .../public/query_string_input}/to_user.ts     |   0
 .../public}/saved_query_form/index.ts         |   0
 .../saved_query_form/save_query_form.tsx      |  36 +--
 .../saved_query_management/_index.scss        |   0
 .../_saved_query_list_item.scss               |   0
 .../_saved_query_management_component.scss    |   0
 .../public}/saved_query_management/index.ts   |   0
 .../saved_query_list_item.tsx                 |  40 +--
 .../saved_query_management_component.tsx      |  42 ++--
 .../public}/search_bar/create_search_bar.tsx  |  13 +-
 .../public}/search_bar/index.tsx              |   3 +-
 .../search_bar/lib/clear_saved_query.test.ts  |   5 +-
 .../search_bar/lib/clear_saved_query.ts       |   2 +-
 .../populate_state_from_saved_query.test.ts   |  10 +-
 .../lib/populate_state_from_saved_query.ts    |   2 +-
 .../search_bar/lib/use_filter_manager.ts      |   2 +-
 .../lib/use_query_string_manager.ts           |   4 +-
 .../public}/search_bar/lib/use_saved_query.ts |   7 +-
 .../public}/search_bar/lib/use_timefilter.ts  |   2 +-
 .../public}/search_bar/search_bar.test.tsx    |   8 +-
 .../public}/search_bar/search_bar.tsx         |  11 +-
 src/plugins/unified_search/public/services.ts |  18 ++
 .../public/test_helpers/get_stub_filter.ts    |  34 +++
 .../suggestion_component.test.tsx.snap        |   0
 .../public}/typeahead/_index.scss             |   0
 .../public}/typeahead/_suggestion.scss        |   0
 .../public}/typeahead/constants.ts            |   0
 .../public}/typeahead/index.tsx               |   0
 .../typeahead/suggestion_component.test.tsx   |   2 +-
 .../typeahead/suggestion_component.tsx        |   2 +-
 .../typeahead/suggestions_component.test.tsx  |   2 +-
 .../typeahead/suggestions_component.tsx       |   8 +-
 .../public}/typeahead/types.ts                |   2 +-
 src/plugins/unified_search/public/types.ts    |  46 ++++
 .../public}/utils/index.ts                    |   1 +
 .../public}/utils/on_raf.ts                   |   0
 .../public/utils/shallow_equal.ts             |  36 +++
 src/plugins/unified_search/tsconfig.json      |  23 ++
 src/plugins/vis_default_editor/kibana.json    |   2 +-
 .../public/components/controls/filter.tsx     |   9 +-
 src/plugins/vis_default_editor/tsconfig.json  |   3 +-
 src/plugins/vis_types/timeseries/kibana.json  |   2 +-
 .../components/query_bar_wrapper.tsx          |   2 +-
 .../vis_types/timeseries/tsconfig.json        |   1 +
 test/tsconfig.json                            |   1 +
 .../exploratory_view_example/public/plugin.ts |   6 +-
 .../ui_actions_enhanced_examples/kibana.json  |   3 +-
 .../drilldown.tsx                             |   6 +-
 .../dashboard_to_discover_drilldown/types.ts  |   2 +-
 .../cloud_security_posture/kibana.json        |   2 +-
 .../public/pages/findings/findings.test.tsx   |  21 +-
 .../pages/findings/findings_search_bar.tsx    |   2 +-
 .../cloud_security_posture/public/types.ts    |   3 +-
 x-pack/plugins/dashboard_enhanced/kibana.json |   2 +-
 ...embeddable_to_dashboard_drilldown.test.tsx |   2 +-
 .../embeddable_to_dashboard_drilldown.tsx     |   2 +-
 x-pack/plugins/data_visualizer/kibana.json    |   3 +-
 .../components/search_panel/search_panel.tsx  |   4 +-
 .../index_data_visualizer.tsx                 |   2 +
 .../plugins/data_visualizer/public/plugin.ts  |   2 +
 x-pack/plugins/data_visualizer/tsconfig.json  |   2 +
 .../explore_data/explore_data_chart_action.ts |   6 +-
 .../drilldowns/url_drilldown/tsconfig.json    |   3 +-
 x-pack/plugins/file_upload/public/plugin.ts   |   2 +-
 x-pack/plugins/fleet/kibana.json              |   2 +-
 .../fleet/components/search_bar.tsx           |   2 +-
 .../components/agent_logs/query_bar.tsx       |   2 +-
 x-pack/plugins/fleet/tsconfig.json            |   1 +
 x-pack/plugins/graph/kibana.json              |   1 +
 .../public/components/search_bar.test.tsx     |   2 +-
 .../graph/public/components/search_bar.tsx    |   7 +-
 x-pack/plugins/graph/tsconfig.json            |   3 +-
 x-pack/plugins/infra/kibana.json              |   1 +
 .../inventory/components/expression.tsx       |   5 +-
 .../metric_anomaly/components/expression.tsx  |   2 +-
 .../components/expression.tsx                 |   5 +-
 .../public/pages/logs/stream/page_toolbar.tsx |   2 +-
 x-pack/plugins/infra/tsconfig.json            |   3 +-
 x-pack/plugins/lens/kibana.json               |   3 +-
 .../filters/filter_popover.test.tsx           |   4 +-
 .../definitions/filters/filters.test.tsx      |   2 +-
 .../indexpattern_datasource/query_input.tsx   |   3 +-
 x-pack/plugins/lens/tsconfig.json             |  42 ++--
 x-pack/plugins/maps/kibana.json               |   4 +-
 .../draw_forms/distance_filter_form.tsx       |   2 +-
 .../geometry_filter_form.tsx                  |   2 +-
 .../filter_editor/filter_editor.tsx           |   4 +-
 .../resources/where_expression.tsx            |   4 +-
 .../feature_geometry_filter_form.tsx          |   2 +-
 .../feature_properties.test.tsx               |   2 +-
 .../features_tooltip/feature_properties.tsx   |   2 +-
 .../maps/public/embeddable/map_embeddable.tsx |   8 +-
 x-pack/plugins/maps/public/kibana_services.ts |   4 +-
 x-pack/plugins/maps/public/plugin.ts          |   2 +
 x-pack/plugins/maps/tsconfig.json             |   3 +-
 x-pack/plugins/ml/kibana.json                 |   3 +-
 .../exploration_query_bar.tsx                 |   3 +-
 .../explorer_query_bar/explorer_query_bar.tsx |   3 +-
 x-pack/plugins/ml/tsconfig.json               |   3 +-
 x-pack/plugins/observability/kibana.json      |   4 +-
 .../shared/exploratory_view/rtl_helpers.tsx   |   5 +-
 .../filter_value_label/filter_value_label.tsx |   2 +-
 .../alerts/components/alerts_search_bar.tsx   |   3 +-
 x-pack/plugins/observability/tsconfig.json    |   3 +-
 x-pack/plugins/security_solution/kibana.json  |   1 +
 .../components/query_bar/index.test.tsx       |   3 +-
 .../common/components/query_bar/index.tsx     |   2 +-
 .../components/search_bar/index.test.tsx      |   2 +
 .../common/components/search_bar/index.tsx    |   4 +-
 .../public/common/lib/kibana/services.ts      |   5 +-
 .../mock/endpoint/dependencies_start_mock.ts  |   8 +-
 .../rules/description_step/helpers.test.tsx   |   7 +-
 .../rules/description_step/helpers.tsx        |   7 +-
 .../view/components/search_bar.tsx            |   3 +-
 .../plugins/security_solution/public/types.ts |   2 +
 .../plugins/security_solution/tsconfig.json   |   1 +
 x-pack/plugins/stack_alerts/kibana.json       |   1 +
 .../expression/es_query_expression.test.tsx   |   3 +
 .../expression/read_only_filter_items.tsx     |   6 +-
 .../search_source_expression.test.tsx         |   3 +
 .../expressions/boundary_index_expression.tsx |   5 +-
 .../expressions/entity_index_expression.tsx   |   5 +-
 ...containment_alert_type_expression.test.tsx |   5 +
 .../geo_containment/query_builder/index.tsx   |   7 +-
 .../alert_types/threshold/expression.tsx      |   2 +-
 x-pack/plugins/stack_alerts/tsconfig.json     |   3 +-
 x-pack/plugins/transform/kibana.json          |   1 +
 .../source_search_bar/source_search_bar.tsx   |   2 +-
 x-pack/plugins/transform/tsconfig.json        |   1 +
 .../translations/translations/fr-FR.json      | 232 ++++++++---------
 .../translations/translations/ja-JP.json      | 234 +++++++++---------
 .../translations/translations/zh-CN.json      | 234 +++++++++---------
 .../plugins/triggers_actions_ui/kibana.json   |   2 +-
 .../public/application/app.tsx                |   2 +
 .../sections/rule_form/rule_form.tsx          |   2 +
 .../common/lib/kibana/kibana_react.mock.ts    |   2 +
 .../triggers_actions_ui/public/plugin.ts      |   3 +
 .../triggers_actions_ui/public/types.ts       |  10 +-
 .../plugins/triggers_actions_ui/tsconfig.json |   1 +
 x-pack/plugins/uptime/kibana.json             |   2 +-
 .../alerts/alert_query_bar/query_bar.tsx      |   2 +-
 .../overview/query_bar/query_bar.tsx          |   2 +-
 x-pack/plugins/uptime/tsconfig.json           |   3 +
 262 files changed, 1467 insertions(+), 1058 deletions(-)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/__mocks__/shard_failure_request.ts (100%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/__mocks__/shard_failure_response.ts (100%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/__snapshots__/shard_failure_description.test.tsx.snap (100%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/__snapshots__/shard_failure_modal.test.tsx.snap (100%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/__snapshots__/shard_failure_table.test.tsx.snap (100%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/_shard_failure_modal.scss (100%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/index.tsx (100%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/shard_failure_description.test.tsx (100%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/shard_failure_description.tsx (100%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/shard_failure_description_header.tsx (100%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/shard_failure_modal.test.tsx (100%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/shard_failure_modal.tsx (100%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx (91%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/shard_failure_open_modal_button.test.tsx (100%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/shard_failure_open_modal_button.tsx (91%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/shard_failure_table.test.tsx (100%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/shard_failure_table.tsx (100%)
 rename src/plugins/data/public/{ui => }/shard_failure_modal/shard_failure_types.ts (100%)
 delete mode 100644 src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_label.test.tsx
 delete mode 100644 src/plugins/data/public/ui/index.ts
 create mode 100755 src/plugins/unified_search/README.md
 create mode 100644 src/plugins/unified_search/config.ts
 create mode 100644 src/plugins/unified_search/jest.config.js
 create mode 100755 src/plugins/unified_search/kibana.json
 rename src/plugins/{data => unified_search}/public/actions/apply_filter_action.ts (95%)
 create mode 100644 src/plugins/unified_search/public/actions/index.ts
 rename src/plugins/{data/public/ui => unified_search/public}/apply_filters/apply_filter_popover_content.tsx (89%)
 rename src/plugins/{data/public/ui => unified_search/public}/apply_filters/apply_filters_popover.tsx (94%)
 rename src/plugins/{data/public/ui => unified_search/public}/apply_filters/index.ts (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/_global_filter_group.scss (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/_global_filter_item.scss (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/_index.scss (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/_variables.scss (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_bar.tsx (94%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_editor/filter_editor.test.tsx (93%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_editor/generic_combo_box.tsx (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_editor/index.tsx (91%)
 create mode 100644 src/plugins/unified_search/public/filter_bar/filter_editor/lib/__snapshots__/filter_label.test.tsx.snap
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_editor/lib/filter_editor_utils.test.ts (98%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_editor/lib/filter_editor_utils.ts (98%)
 create mode 100644 src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.test.tsx
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_editor/lib/filter_label.tsx (94%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_editor/lib/filter_operators.ts (76%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_editor/phrase_suggestor.tsx (94%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_editor/phrase_value_input.tsx (90%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_editor/phrases_values_input.tsx (90%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_editor/range_value_input.tsx (89%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_editor/value_input_type.tsx (95%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_item.tsx (90%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_options.tsx (85%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/filter_view/index.tsx (71%)
 rename src/plugins/{data/public/ui => unified_search/public}/filter_bar/index.tsx (79%)
 rename src/plugins/{data/public/ui/_index.scss => unified_search/public/index.scss} (72%)
 mode change 100644 => 100755
 create mode 100755 src/plugins/unified_search/public/index.ts
 rename src/plugins/{data/public/ui => unified_search/public}/index_pattern_select/create_index_pattern_select.tsx (92%)
 rename src/plugins/{data/public/ui => unified_search/public}/index_pattern_select/index.tsx (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/index_pattern_select/index_pattern_select.tsx (98%)
 create mode 100644 src/plugins/unified_search/public/mocks.ts
 create mode 100755 src/plugins/unified_search/public/plugin.ts
 rename src/plugins/{data/public/ui => unified_search/public}/query_string_input/_index.scss (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/query_string_input/_query_bar.scss (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/query_string_input/fetch_index_patterns.ts (94%)
 rename src/plugins/{data/public/query/lib => unified_search/public/query_string_input}/from_user.test.ts (96%)
 rename src/plugins/{data/public/query/lib => unified_search/public/query_string_input}/from_user.ts (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/query_string_input/index.tsx (94%)
 rename src/plugins/{data/public/ui => unified_search/public}/query_string_input/language_switcher.test.tsx (97%)
 rename src/plugins/{data/public/ui => unified_search/public}/query_string_input/language_switcher.tsx (80%)
 rename src/plugins/{data/public/query/lib => unified_search/public/query_string_input}/match_pairs.ts (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/query_string_input/no_data_popover.test.tsx (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/query_string_input/no_data_popover.tsx (84%)
 rename src/plugins/{data/public/ui => unified_search/public}/query_string_input/query_bar_top_row.test.tsx (95%)
 rename src/plugins/{data/public/ui => unified_search/public}/query_string_input/query_bar_top_row.tsx (96%)
 rename src/plugins/{data/public/ui => unified_search/public}/query_string_input/query_string_input.test.mocks.ts (89%)
 rename src/plugins/{data/public/ui => unified_search/public}/query_string_input/query_string_input.test.tsx (97%)
 rename src/plugins/{data/public/ui => unified_search/public}/query_string_input/query_string_input.tsx (95%)
 rename src/plugins/{data/public/query/lib => unified_search/public/query_string_input}/to_user.test.ts (96%)
 rename src/plugins/{data/public/query/lib => unified_search/public/query_string_input}/to_user.ts (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/saved_query_form/index.ts (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/saved_query_form/save_query_form.tsx (84%)
 rename src/plugins/{data/public/ui => unified_search/public}/saved_query_management/_index.scss (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/saved_query_management/_saved_query_list_item.scss (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/saved_query_management/_saved_query_management_component.scss (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/saved_query_management/index.ts (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/saved_query_management/saved_query_list_item.tsx (77%)
 rename src/plugins/{data/public/ui => unified_search/public}/saved_query_management/saved_query_management_component.tsx (86%)
 rename src/plugins/{data/public/ui => unified_search/public}/search_bar/create_search_bar.tsx (94%)
 rename src/plugins/{data/public/ui => unified_search/public}/search_bar/index.tsx (89%)
 rename src/plugins/{data/public/ui => unified_search/public}/search_bar/lib/clear_saved_query.test.ts (87%)
 rename src/plugins/{data/public/ui => unified_search/public}/search_bar/lib/clear_saved_query.ts (90%)
 rename src/plugins/{data/public/ui => unified_search/public}/search_bar/lib/populate_state_from_saved_query.test.ts (91%)
 rename src/plugins/{data/public/ui => unified_search/public}/search_bar/lib/populate_state_from_saved_query.ts (94%)
 rename src/plugins/{data/public/ui => unified_search/public}/search_bar/lib/use_filter_manager.ts (94%)
 rename src/plugins/{data/public/ui => unified_search/public}/search_bar/lib/use_query_string_manager.ts (92%)
 rename src/plugins/{data/public/ui => unified_search/public}/search_bar/lib/use_saved_query.ts (92%)
 rename src/plugins/{data/public/ui => unified_search/public}/search_bar/lib/use_timefilter.ts (98%)
 rename src/plugins/{data/public/ui => unified_search/public}/search_bar/search_bar.test.tsx (96%)
 rename src/plugins/{data/public/ui => unified_search/public}/search_bar/search_bar.tsx (97%)
 create mode 100644 src/plugins/unified_search/public/services.ts
 create mode 100644 src/plugins/unified_search/public/test_helpers/get_stub_filter.ts
 rename src/plugins/{data/public/ui => unified_search/public}/typeahead/__snapshots__/suggestion_component.test.tsx.snap (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/typeahead/_index.scss (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/typeahead/_suggestion.scss (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/typeahead/constants.ts (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/typeahead/index.tsx (100%)
 rename src/plugins/{data/public/ui => unified_search/public}/typeahead/suggestion_component.test.tsx (97%)
 rename src/plugins/{data/public/ui => unified_search/public}/typeahead/suggestion_component.tsx (98%)
 rename src/plugins/{data/public/ui => unified_search/public}/typeahead/suggestions_component.test.tsx (98%)
 rename src/plugins/{data/public/ui => unified_search/public}/typeahead/suggestions_component.tsx (98%)
 rename src/plugins/{data/public/ui => unified_search/public}/typeahead/types.ts (90%)
 create mode 100755 src/plugins/unified_search/public/types.ts
 rename src/plugins/{data/public/ui => unified_search/public}/utils/index.ts (89%)
 rename src/plugins/{data/public/ui => unified_search/public}/utils/on_raf.ts (100%)
 create mode 100644 src/plugins/unified_search/public/utils/shallow_equal.ts
 create mode 100644 src/plugins/unified_search/tsconfig.json

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c88a787e1c04..405972b4f919 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -82,6 +82,7 @@
 /src/plugins/bfetch/ @elastic/kibana-app-services
 /src/plugins/data_view_management/ @elastic/kibana-app-services
 /src/plugins/inspector/ @elastic/kibana-app-services
+/src/plugins/unified_search/ @elastic/kibana-app-services
 /x-pack/examples/ui_actions_enhanced_examples/ @elastic/kibana-app-services
 /x-pack/plugins/data_enhanced/ @elastic/kibana-app-services
 /x-pack/plugins/embeddable_enhanced/ @elastic/kibana-app-services
diff --git a/.i18nrc.json b/.i18nrc.json
index 908963ca4d99..d6256e753df6 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -90,7 +90,8 @@
     "visTypeVega": "src/plugins/vis_types/vega",
     "visTypeVislib": "src/plugins/vis_types/vislib",
     "visTypeXy": "src/plugins/vis_types/xy",
-    "visualizations": "src/plugins/visualizations"
+    "visualizations": "src/plugins/visualizations",
+    "unifiedSearch": "src/plugins/unified_search"
   },
   "translations": []
 }
\ No newline at end of file
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
index 0b9e48020c68..04b21bf73781 100644
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@@ -291,6 +291,10 @@ In general this plugin provides:
 - Exposing a context menu for the user to choose the appropriate action when there are multiple actions attached to a single trigger.
 
 
+|{kib-repo}blob/{branch}/src/plugins/unified_search/README.md[unifiedSearch]
+|Contains all the components of Kibana's unified search experience. Specifically:
+
+
 |{kib-repo}blob/{branch}/src/plugins/url_forwarding/README.md[urlForwarding]
 |This plugins contains helpers to redirect legacy URLs. It can be used to forward old URLs to their new counterparts.
 
diff --git a/examples/search_examples/kibana.json b/examples/search_examples/kibana.json
index 87839f2037f9..70e934759be0 100644
--- a/examples/search_examples/kibana.json
+++ b/examples/search_examples/kibana.json
@@ -9,7 +9,7 @@
   "description": "Example plugin of how to use data plugin search services",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["navigation", "data", "developerExamples", "kibanaUtils", "share"],
+  "requiredPlugins": ["navigation", "data", "developerExamples", "kibanaUtils", "share", "unifiedSearch"],
   "optionalPlugins": [],
   "requiredBundles": ["kibanaReact"],
   "owner": {
diff --git a/examples/search_examples/public/application.tsx b/examples/search_examples/public/application.tsx
index 9bd5bb0f3f8a..2c1d92451fe6 100644
--- a/examples/search_examples/public/application.tsx
+++ b/examples/search_examples/public/application.tsx
@@ -39,7 +39,7 @@ const LINKS: ExampleLink[] = [
 
 export const renderApp = (
   { notifications, savedObjects, http, application }: CoreStart,
-  { data, navigation }: AppPluginStartDependencies,
+  { data, navigation, unifiedSearch }: AppPluginStartDependencies,
   { element, history }: AppMountParameters
 ) => {
   ReactDOM.render(
@@ -53,6 +53,7 @@ export const renderApp = (
                 navigation={navigation}
                 data={data}
                 http={http}
+                unifiedSearch={unifiedSearch}
               />
             </Route>
             <Route path={LINKS[1].path}>
@@ -63,6 +64,7 @@ export const renderApp = (
                 navigation={navigation}
                 notifications={notifications}
                 data={data}
+                unifiedSearch={unifiedSearch}
               />
             </Route>
 
diff --git a/examples/search_examples/public/search/app.tsx b/examples/search_examples/public/search/app.tsx
index 922082786385..9bd7bf8f7d43 100644
--- a/examples/search_examples/public/search/app.tsx
+++ b/examples/search_examples/public/search/app.tsx
@@ -44,6 +44,7 @@ import {
   isCompleteResponse,
   isErrorResponse,
 } from '../../../../src/plugins/data/public';
+import { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
 import type { DataViewField, DataView } from '../../../../src/plugins/data_views/public';
 import { IMyStrategyResponse } from '../../common/types';
 import { AbortError } from '../../../../src/plugins/kibana_utils/common';
@@ -53,6 +54,7 @@ interface SearchExamplesAppDeps {
   http: CoreStart['http'];
   navigation: NavigationPublicPluginStart;
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
 }
 
 function getNumeric(fields?: DataViewField[]) {
@@ -85,8 +87,9 @@ export const SearchExamplesApp = ({
   notifications,
   navigation,
   data,
+  unifiedSearch,
 }: SearchExamplesAppDeps) => {
-  const { IndexPatternSelect } = data.ui;
+  const { IndexPatternSelect } = unifiedSearch.ui;
   const [getCool, setGetCool] = useState<boolean>(false);
   const [fibonacciN, setFibonacciN] = useState<number>(10);
   const [timeTook, setTimeTook] = useState<number | undefined>();
diff --git a/examples/search_examples/public/search_sessions/app.tsx b/examples/search_examples/public/search_sessions/app.tsx
index fbca346af8a3..fa9ec526e02f 100644
--- a/examples/search_examples/public/search_sessions/app.tsx
+++ b/examples/search_examples/public/search_sessions/app.tsx
@@ -49,6 +49,7 @@ import {
   SearchSessionState,
   TimeRange,
 } from '../../../../src/plugins/data/public';
+import { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
 import type { DataView, DataViewField } from '../../../../src/plugins/data_views/public';
 import {
   createStateContainer,
@@ -60,6 +61,7 @@ interface SearchSessionsExampleAppDeps {
   notifications: CoreStart['notifications'];
   navigation: NavigationPublicPluginStart;
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
 }
 
 /**
@@ -89,8 +91,9 @@ export const SearchSessionsExampleApp = ({
   notifications,
   navigation,
   data,
+  unifiedSearch,
 }: SearchSessionsExampleAppDeps) => {
-  const { IndexPatternSelect } = data.ui;
+  const { IndexPatternSelect } = unifiedSearch.ui;
 
   const [isSearching, setIsSearching] = useState<boolean>(false);
   const [request, setRequest] = useState<IEsSearchRequest | null>(null);
diff --git a/examples/search_examples/public/types.ts b/examples/search_examples/public/types.ts
index fd3b869af3fe..02f0ad28cfd7 100644
--- a/examples/search_examples/public/types.ts
+++ b/examples/search_examples/public/types.ts
@@ -8,6 +8,7 @@
 
 import { NavigationPublicPluginStart } from '../../../src/plugins/navigation/public';
 import { DataPublicPluginStart } from '../../../src/plugins/data/public';
+import { UnifiedSearchPublicPluginStart } from '../../../src/plugins/unified_search/public';
 import { DeveloperExamplesSetup } from '../../developer_examples/public';
 import { SharePluginSetup } from '../../../src/plugins/share/public';
 
@@ -24,4 +25,5 @@ export interface AppPluginSetupDependencies {
 export interface AppPluginStartDependencies {
   navigation: NavigationPublicPluginStart;
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
 }
diff --git a/packages/kbn-babel-preset/styled_components_files.js b/packages/kbn-babel-preset/styled_components_files.js
index 2efe4b1474b4..a1d94136ebfb 100644
--- a/packages/kbn-babel-preset/styled_components_files.js
+++ b/packages/kbn-babel-preset/styled_components_files.js
@@ -13,7 +13,7 @@ module.exports = {
    */
   USES_STYLED_COMPONENTS: [
     /packages[\/\\]kbn-ui-shared-deps-(npm|src)[\/\\]/,
-    /src[\/\\]plugins[\/\\](data|kibana_react)[\/\\]/,
+    /src[\/\\]plugins[\/\\](unified_search|kibana_react)[\/\\]/,
     /x-pack[\/\\]plugins[\/\\](apm|beats_management|cases|fleet|infra|lists|observability|osquery|security_solution|timelines|uptime|ux)[\/\\]/,
     /x-pack[\/\\]test[\/\\]plugin_functional[\/\\]plugins[\/\\]resolver_test[\/\\]/,
   ],
diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
index e137bd005590..8d0e03218ddb 100644
--- a/packages/kbn-optimizer/limits.yml
+++ b/packages/kbn-optimizer/limits.yml
@@ -99,7 +99,6 @@ pageLoadAssetSize:
   visTypeMetric: 23332
   bfetch: 22837
   kibanaUtils: 79713
-  data: 491273
   dataViews: 43532
   expressions: 140958
   fieldFormats: 65209
@@ -124,5 +123,7 @@ pageLoadAssetSize:
   sessionView: 77750
   cloudSecurityPosture: 19109
   visTypeGauge: 24113
+  unifiedSearch: 49195
+  data: 454087
   expressionXY: 26500
   eventAnnotation: 19334
diff --git a/src/plugins/data/public/actions/index.ts b/src/plugins/data/public/actions/index.ts
index 0ec33f7e4652..4a5839065c5c 100644
--- a/src/plugins/data/public/actions/index.ts
+++ b/src/plugins/data/public/actions/index.ts
@@ -6,8 +6,6 @@
  * Side Public License, v 1.
  */
 
-export type { ApplyGlobalFilterActionContext } from './apply_filter_action';
-export { ACTION_GLOBAL_APPLY_FILTER, createFilterAction } from './apply_filter_action';
 export { createFiltersFromValueClickAction } from './filters/create_filters_from_value_click';
 export { createFiltersFromRangeSelectAction } from './filters/create_filters_from_range_select';
 export * from './select_range_action';
diff --git a/src/plugins/data/public/deprecated.ts b/src/plugins/data/public/deprecated.ts
index 6a6c7bbb2cd2..ac8f273eb720 100644
--- a/src/plugins/data/public/deprecated.ts
+++ b/src/plugins/data/public/deprecated.ts
@@ -51,8 +51,6 @@ import {
   getEsQueryConfig,
 } from '../common';
 
-import { FilterLabel, FilterItem } from './ui';
-
 import {
   getDisplayValueFromFilter,
   generateFilters,
@@ -90,9 +88,6 @@ const convertRangeFilterToTimeRangeString = oldConvertRangeFilterToTimeRangeStri
  * @removeBy 8.1
  */
 export const esFilters = {
-  FilterLabel,
-  FilterItem,
-
   FILTERS,
   FilterStateStore,
 
diff --git a/src/plugins/data/public/index.scss b/src/plugins/data/public/index.scss
index 467efa98934e..00d3b53865e7 100644
--- a/src/plugins/data/public/index.scss
+++ b/src/plugins/data/public/index.scss
@@ -1,2 +1 @@
-@import './ui/index';
 @import './utils/table_inspector_view/index';
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 77f17d3a63ee..6fd357447fad 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -19,7 +19,6 @@ export * from './deprecated';
  */
 
 export { getEsQueryConfig, FilterStateStore } from '../common';
-export { FilterLabel, FilterItem } from './ui';
 export {
   getDisplayValueFromFilter,
   generateFilters,
@@ -259,15 +258,6 @@ export const search = {
  * UI components
  */
 
-export type {
-  SearchBarProps,
-  StatefulSearchBarProps,
-  IndexPatternSelectProps,
-  QueryStringInputProps,
-} from './ui';
-
-export { QueryStringInput, SearchBar } from './ui';
-
 /**
  * Types to be shared externally
  * @public
@@ -281,6 +271,8 @@ export {
   getDefaultQuery,
   FilterManager,
   TimeHistory,
+  getQueryLog,
+  mapAndFlattenFilters,
 } from './query';
 
 export type {
@@ -293,6 +285,9 @@ export type {
   QueryStateChange,
   QueryStart,
   AutoRefreshDoneFn,
+  PersistedLog,
+  QueryStringContract,
+  QuerySetup,
 } from './query';
 
 export type { AggsStart } from './search/aggs';
@@ -303,8 +298,6 @@ export type { SavedObject } from '../common';
 
 export { isTimeRange, isQuery, flattenHit, calculateBounds, tabifyAggResponse } from '../common';
 
-export type { ApplyGlobalFilterActionContext } from './actions';
-export { ACTION_GLOBAL_APPLY_FILTER } from './actions';
 export { APPLY_FILTER_TRIGGER } from './triggers';
 
 /*
@@ -321,7 +314,6 @@ export type {
   DataPublicPluginSetup,
   DataPublicPluginStart,
   IDataPluginServices,
-  DataPublicPluginStartUi,
   DataPublicPluginStartActions,
 } from './types';
 
diff --git a/src/plugins/data/public/mocks.ts b/src/plugins/data/public/mocks.ts
index 630a29a8a785..3c0c58c979db 100644
--- a/src/plugins/data/public/mocks.ts
+++ b/src/plugins/data/public/mocks.ts
@@ -63,10 +63,6 @@ const createStartContract = (): Start => {
     search: searchServiceMock.createStartContract(),
     fieldFormats: fieldFormatsServiceMock.createStartContract(),
     query: queryStartMock,
-    ui: {
-      IndexPatternSelect: jest.fn(),
-      SearchBar: jest.fn().mockReturnValue(null),
-    },
     dataViews,
     /**
      * @deprecated Use dataViews service instead. All index pattern interfaces were renamed.
diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts
index 50795b441624..1402a01a3b05 100644
--- a/src/plugins/data/public/plugin.ts
+++ b/src/plugins/data/public/plugin.ts
@@ -20,7 +20,6 @@ import type {
 import { AutocompleteService } from './autocomplete';
 import { SearchService } from './search/search_service';
 import { QueryService } from './query';
-import { createIndexPatternSelect } from './ui/index_pattern_select';
 import {
   setIndexPatterns,
   setNotifications,
@@ -29,17 +28,13 @@ import {
   setUiSettings,
   setTheme,
 } from './services';
-import { createSearchBar } from './ui/search_bar/create_search_bar';
 import {
-  ACTION_GLOBAL_APPLY_FILTER,
-  createFilterAction,
   createFiltersFromValueClickAction,
   createFiltersFromRangeSelectAction,
   createValueClickAction,
   createSelectRangeAction,
 } from './actions';
-import { APPLY_FILTER_TRIGGER, applyFilterTrigger } from './triggers';
-import { UsageCollectionSetup } from '../../usage_collection/public';
+import { applyFilterTrigger } from './triggers';
 import { getTableViewDescription } from './utils/table_inspector_view';
 import { NowProvider, NowProviderInternalContract } from './now_provider';
 import { getAggsFormats, DatatableUtilitiesService } from '../common';
@@ -57,7 +52,6 @@ export class DataPublicPlugin
   private readonly searchService: SearchService;
   private readonly queryService: QueryService;
   private readonly storage: IStorageWrapper;
-  private usageCollection: UsageCollectionSetup | undefined;
   private readonly nowProvider: NowProviderInternalContract;
 
   constructor(initializerContext: PluginInitializerContext<ConfigSchema>) {
@@ -82,7 +76,6 @@ export class DataPublicPlugin
   ): DataPublicPluginSetup {
     const startServices = createStartServicesGetter(core.getStartServices);
 
-    this.usageCollection = usageCollection;
     setTheme(core.theme);
 
     const searchService = this.searchService.setup(core, {
@@ -99,9 +92,6 @@ export class DataPublicPlugin
     });
 
     uiActions.registerTrigger(applyFilterTrigger);
-    uiActions.registerAction(
-      createFilterAction(queryService.filterManager, queryService.timefilter.timefilter, core.theme)
-    );
 
     inspector.registerView(
       getTableViewDescription(() => ({
@@ -161,11 +151,6 @@ export class DataPublicPlugin
       }))
     );
 
-    uiActions.addTriggerAction(
-      APPLY_FILTER_TRIGGER,
-      uiActions.getAction(ACTION_GLOBAL_APPLY_FILTER)
-    );
-
     const datatableUtilities = new DatatableUtilitiesService(search.aggs, dataViews, fieldFormats);
     const dataServices = {
       actions: {
@@ -182,20 +167,7 @@ export class DataPublicPlugin
       nowProvider: this.nowProvider,
     };
 
-    const SearchBar = createSearchBar({
-      core,
-      data: dataServices,
-      storage: this.storage,
-      usageCollection: this.usageCollection,
-    });
-
-    return {
-      ...dataServices,
-      ui: {
-        IndexPatternSelect: createIndexPatternSelect(dataViews),
-        SearchBar,
-      },
-    };
+    return dataServices;
   }
 
   public stop() {
diff --git a/src/plugins/data/public/query/index.tsx b/src/plugins/data/public/query/index.tsx
index c4622f5701b3..f426573e1bd6 100644
--- a/src/plugins/data/public/query/index.tsx
+++ b/src/plugins/data/public/query/index.tsx
@@ -14,3 +14,4 @@ export * from './timefilter';
 export * from './saved_query';
 export * from './persisted_log';
 export * from './state_sync';
+export type { QueryStringContract } from './query_string';
diff --git a/src/plugins/data/public/query/lib/index.ts b/src/plugins/data/public/query/lib/index.ts
index 5966a7a8ad0e..79e8c38cb6e9 100644
--- a/src/plugins/data/public/query/lib/index.ts
+++ b/src/plugins/data/public/query/lib/index.ts
@@ -7,9 +7,5 @@
  */
 
 export * from './add_to_query_log';
-export * from './from_user';
 export * from './get_default_query';
 export * from './get_query_log';
-export * from './match_pairs';
-export * from './to_user';
-export * from './to_user';
diff --git a/src/plugins/data/public/search/fetch/handle_response.tsx b/src/plugins/data/public/search/fetch/handle_response.tsx
index 618efcb702ec..6199e52f4595 100644
--- a/src/plugins/data/public/search/fetch/handle_response.tsx
+++ b/src/plugins/data/public/search/fetch/handle_response.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer } from '@elastic/eui';
 import { IKibanaSearchResponse } from 'src/plugins/data/common';
-import { ShardFailureOpenModalButton } from '../../ui/shard_failure_modal';
+import { ShardFailureOpenModalButton } from '../../shard_failure_modal';
 import { ThemeServiceStart } from '../../../../../core/public';
 import { toMountPoint } from '../../../../kibana_react/public';
 import { getNotifications } from '../../services';
diff --git a/src/plugins/data/public/search/index.ts b/src/plugins/data/public/search/index.ts
index 6923ec7e8705..1e69d60af84f 100644
--- a/src/plugins/data/public/search/index.ts
+++ b/src/plugins/data/public/search/index.ts
@@ -59,3 +59,5 @@ export { handleResponse } from './fetch';
 export type { SearchInterceptorDeps } from './search_interceptor';
 export { SearchInterceptor } from './search_interceptor';
 export * from './errors';
+
+export { SearchService } from './search_service';
diff --git a/src/plugins/data/public/ui/shard_failure_modal/__mocks__/shard_failure_request.ts b/src/plugins/data/public/shard_failure_modal/__mocks__/shard_failure_request.ts
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/__mocks__/shard_failure_request.ts
rename to src/plugins/data/public/shard_failure_modal/__mocks__/shard_failure_request.ts
diff --git a/src/plugins/data/public/ui/shard_failure_modal/__mocks__/shard_failure_response.ts b/src/plugins/data/public/shard_failure_modal/__mocks__/shard_failure_response.ts
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/__mocks__/shard_failure_response.ts
rename to src/plugins/data/public/shard_failure_modal/__mocks__/shard_failure_response.ts
diff --git a/src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_description.test.tsx.snap b/src/plugins/data/public/shard_failure_modal/__snapshots__/shard_failure_description.test.tsx.snap
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_description.test.tsx.snap
rename to src/plugins/data/public/shard_failure_modal/__snapshots__/shard_failure_description.test.tsx.snap
diff --git a/src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_modal.test.tsx.snap b/src/plugins/data/public/shard_failure_modal/__snapshots__/shard_failure_modal.test.tsx.snap
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_modal.test.tsx.snap
rename to src/plugins/data/public/shard_failure_modal/__snapshots__/shard_failure_modal.test.tsx.snap
diff --git a/src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_table.test.tsx.snap b/src/plugins/data/public/shard_failure_modal/__snapshots__/shard_failure_table.test.tsx.snap
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/__snapshots__/shard_failure_table.test.tsx.snap
rename to src/plugins/data/public/shard_failure_modal/__snapshots__/shard_failure_table.test.tsx.snap
diff --git a/src/plugins/data/public/ui/shard_failure_modal/_shard_failure_modal.scss b/src/plugins/data/public/shard_failure_modal/_shard_failure_modal.scss
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/_shard_failure_modal.scss
rename to src/plugins/data/public/shard_failure_modal/_shard_failure_modal.scss
diff --git a/src/plugins/data/public/ui/shard_failure_modal/index.tsx b/src/plugins/data/public/shard_failure_modal/index.tsx
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/index.tsx
rename to src/plugins/data/public/shard_failure_modal/index.tsx
diff --git a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_description.test.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_description.test.tsx
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/shard_failure_description.test.tsx
rename to src/plugins/data/public/shard_failure_modal/shard_failure_description.test.tsx
diff --git a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_description.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_description.tsx
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/shard_failure_description.tsx
rename to src/plugins/data/public/shard_failure_modal/shard_failure_description.tsx
diff --git a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_description_header.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_description_header.tsx
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/shard_failure_description_header.tsx
rename to src/plugins/data/public/shard_failure_modal/shard_failure_description_header.tsx
diff --git a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_modal.test.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_modal.test.tsx
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/shard_failure_modal.test.tsx
rename to src/plugins/data/public/shard_failure_modal/shard_failure_modal.test.tsx
diff --git a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_modal.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_modal.tsx
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/shard_failure_modal.tsx
rename to src/plugins/data/public/shard_failure_modal/shard_failure_modal.tsx
diff --git a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx
similarity index 91%
rename from src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx
rename to src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx
index 44996497cc0c..757d318e1d1b 100644
--- a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx
+++ b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.mocks.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { setOverlays } from '../../services';
+import { setOverlays } from '../services';
 import { OverlayStart } from 'kibana/public';
 
 export const openModal = jest.fn();
diff --git a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.test.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.tsx
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.test.tsx
rename to src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.test.tsx
diff --git a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.tsx
similarity index 91%
rename from src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.tsx
rename to src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.tsx
index 585268824fb9..a20fe3da06e5 100644
--- a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.tsx
+++ b/src/plugins/data/public/shard_failure_modal/shard_failure_open_modal_button.tsx
@@ -10,10 +10,9 @@ import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButton, EuiTextAlign } from '@elastic/eui';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-
-import { getOverlays } from '../../services';
-import { ThemeServiceStart } from '../../../../../core/public';
-import { toMountPoint } from '../../../../kibana_react/public';
+import { getOverlays } from '../services';
+import { ThemeServiceStart } from '../../../../core/public';
+import { toMountPoint } from '../../../kibana_react/public';
 import { ShardFailureModal } from './shard_failure_modal';
 import { ShardFailureRequest } from './shard_failure_types';
 
diff --git a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_table.test.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_table.test.tsx
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/shard_failure_table.test.tsx
rename to src/plugins/data/public/shard_failure_modal/shard_failure_table.test.tsx
diff --git a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_table.tsx b/src/plugins/data/public/shard_failure_modal/shard_failure_table.tsx
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/shard_failure_table.tsx
rename to src/plugins/data/public/shard_failure_modal/shard_failure_table.tsx
diff --git a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_types.ts b/src/plugins/data/public/shard_failure_modal/shard_failure_types.ts
similarity index 100%
rename from src/plugins/data/public/ui/shard_failure_modal/shard_failure_types.ts
rename to src/plugins/data/public/shard_failure_modal/shard_failure_types.ts
diff --git a/src/plugins/data/public/types.ts b/src/plugins/data/public/types.ts
index bfc35b8f39c5..55b2637e874e 100644
--- a/src/plugins/data/public/types.ts
+++ b/src/plugins/data/public/types.ts
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-import React from 'react';
 import { CoreStart } from 'src/core/public';
 import { BfetchPublicSetup } from 'src/plugins/bfetch/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
@@ -20,7 +19,6 @@ import { createFiltersFromRangeSelectAction, createFiltersFromValueClickAction }
 import type { ISearchSetup, ISearchStart } from './search';
 import { QuerySetup, QueryStart } from './query';
 import { DataViewsContract } from './data_views';
-import { IndexPatternSelectProps, StatefulSearchBarProps } from './ui';
 import { UsageCollectionSetup, UsageCollectionStart } from '../../usage_collection/public';
 import { Setup as InspectorSetup } from '../../inspector/public';
 import { NowProviderPublicContract } from './now_provider';
@@ -49,14 +47,6 @@ export interface DataPublicPluginSetup {
   query: QuerySetup;
 }
 
-/**
- * Data plugin prewired UI components
- */
-export interface DataPublicPluginStartUi {
-  IndexPatternSelect: React.ComponentType<IndexPatternSelectProps>;
-  SearchBar: React.ComponentType<StatefulSearchBarProps>;
-}
-
 /**
  * utilities to generate filters from action context
  */
@@ -110,11 +100,6 @@ export interface DataPublicPluginStart {
    * {@link QueryStart}
    */
   query: QueryStart;
-  /**
-   * prewired UI components
-   * {@link DataPublicPluginStartUi}
-   */
-  ui: DataPublicPluginStartUi;
 
   nowProvider: NowProviderPublicContract;
 }
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_label.test.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_label.test.tsx
deleted file mode 100644
index f7e9d3930c0e..000000000000
--- a/src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_label.test.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import React from 'react';
-import FilterLabel from './filter_label';
-import { render } from '@testing-library/react';
-import { phraseFilter } from '../../../../stubs';
-
-test('alias', () => {
-  const filter = {
-    ...phraseFilter,
-    meta: {
-      ...phraseFilter.meta,
-      alias: 'geo.coordinates in US',
-    },
-  };
-  const { container } = render(<FilterLabel filter={filter} />);
-  expect(container).toMatchInlineSnapshot(`
-    <div>
-      
-      geo.coordinates in US
-    </div>
-  `);
-});
-
-test('negated alias', () => {
-  const filter = {
-    ...phraseFilter,
-    meta: {
-      ...phraseFilter.meta,
-      alias: 'geo.coordinates in US',
-      negate: true,
-    },
-  };
-  const { container } = render(<FilterLabel filter={filter} />);
-  expect(container).toMatchInlineSnapshot(`
-    <div>
-      <span
-        class="euiTextColor euiTextColor--danger"
-      >
-         NOT 
-      </span>
-      geo.coordinates in US
-    </div>
-  `);
-});
-
-test('alias with warning status', () => {
-  const filter = {
-    ...phraseFilter,
-    meta: {
-      ...phraseFilter.meta,
-      alias: 'geo.coordinates in US',
-      negate: true,
-    },
-  };
-  const { container } = render(
-    <FilterLabel filter={filter} valueLabel={'Warning'} filterLabelStatus={'warn'} />
-  );
-  expect(container).toMatchInlineSnapshot(`
-    <div>
-      <span
-        class="euiTextColor euiTextColor--danger"
-      >
-         NOT 
-      </span>
-      geo.coordinates in US
-      : 
-      <span
-        class="globalFilterLabel__value"
-      >
-        Warning
-      </span>
-    </div>
-  `);
-});
-
-test('alias with error status', () => {
-  const filter = {
-    ...phraseFilter,
-    meta: {
-      ...phraseFilter.meta,
-      alias: 'geo.coordinates in US',
-      negate: true,
-    },
-  };
-  const { container } = render(
-    <FilterLabel filter={filter} valueLabel={'Error'} filterLabelStatus={'error'} />
-  );
-  expect(container).toMatchInlineSnapshot(`
-    <div>
-      <span
-        class="euiTextColor euiTextColor--danger"
-      >
-         NOT 
-      </span>
-      geo.coordinates in US
-      : 
-      <span
-        class="globalFilterLabel__value"
-      >
-        Error
-      </span>
-    </div>
-  `);
-});
-
-test('warning', () => {
-  const { container } = render(<FilterLabel filter={phraseFilter} valueLabel={'Warning'} />);
-  expect(container).toMatchInlineSnapshot(`
-    <div>
-      
-      machine.os
-      : 
-      <span
-        class="globalFilterLabel__value"
-      >
-        Warning
-      </span>
-    </div>
-  `);
-});
-
-test('error', () => {
-  const { container } = render(<FilterLabel filter={phraseFilter} valueLabel={'Error'} />);
-  expect(container).toMatchInlineSnapshot(`
-    <div>
-      
-      machine.os
-      : 
-      <span
-        class="globalFilterLabel__value"
-      >
-        Error
-      </span>
-    </div>
-  `);
-});
diff --git a/src/plugins/data/public/ui/index.ts b/src/plugins/data/public/ui/index.ts
deleted file mode 100644
index 026db1b7c09e..000000000000
--- a/src/plugins/data/public/ui/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-export type { IndexPatternSelectProps } from './index_pattern_select';
-export { FilterLabel, FilterItem } from './filter_bar';
-export type { QueryStringInputProps } from './query_string_input';
-export { QueryStringInput } from './query_string_input';
-export type { SearchBarProps, StatefulSearchBarProps } from './search_bar';
-export { SearchBar } from './search_bar';
-export { SuggestionsComponent } from './typeahead';
diff --git a/src/plugins/data/tsconfig.json b/src/plugins/data/tsconfig.json
index 92f80f47eca6..b618a047f375 100644
--- a/src/plugins/data/tsconfig.json
+++ b/src/plugins/data/tsconfig.json
@@ -12,7 +12,7 @@
     "server/**/*",
     "config.ts",
     "common/**/*.json",
-    "public/**/*.json"
+    "public/**/*.json",
   ],
   "references": [
     { "path": "../../core/tsconfig.json" },
diff --git a/src/plugins/data_view_management/kibana.json b/src/plugins/data_view_management/kibana.json
index a8a0f694bd17..43d22f545bf9 100644
--- a/src/plugins/data_view_management/kibana.json
+++ b/src/plugins/data_view_management/kibana.json
@@ -3,7 +3,7 @@
   "version": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["management", "data", "urlForwarding", "dataViewFieldEditor", "dataViewEditor", "dataViews", "fieldFormats"],
+  "requiredPlugins": ["management", "data", "urlForwarding", "dataViewFieldEditor", "dataViewEditor", "dataViews", "fieldFormats", "unifiedSearch"],
   "requiredBundles": ["kibanaReact", "kibanaUtils"],
   "optionalPlugins": ["spaces"],
   "owner": {
diff --git a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/test_script.tsx b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/test_script.tsx
index 89f80f8a87e3..4b5609cf1970 100644
--- a/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/test_script.tsx
+++ b/src/plugins/data_view_management/public/components/field_editor/components/scripting_help/test_script.tsx
@@ -224,7 +224,7 @@ export class TestScript extends Component<TestScriptProps, TestScriptState> {
         </EuiFormRow>
 
         <div className="testScript__searchBar">
-          <this.context.services.data.ui.SearchBar
+          <this.context.services.unifiedSearch.ui.SearchBar
             appName={'indexPatternManagement'}
             showFilterBar={false}
             showDatePicker={false}
diff --git a/src/plugins/data_view_management/public/management_app/mount_management_section.tsx b/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
index 0b5275f2e2fa..842ee8a96695 100644
--- a/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
+++ b/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
@@ -40,7 +40,7 @@ export async function mountManagementSection(
 ) {
   const [
     { application, chrome, uiSettings, notifications, overlays, http, docLinks, theme },
-    { data, dataViewFieldEditor, dataViewEditor, dataViews, fieldFormats, spaces },
+    { data, dataViewFieldEditor, dataViewEditor, dataViews, fieldFormats, unifiedSearch, spaces },
     indexPatternManagementStart,
   ] = await getStartServices();
   const canSave = dataViews.getCanSaveSync();
@@ -55,6 +55,7 @@ export async function mountManagementSection(
     uiSettings,
     notifications,
     overlays,
+    unifiedSearch,
     http,
     docLinks,
     data,
diff --git a/src/plugins/data_view_management/public/mocks.ts b/src/plugins/data_view_management/public/mocks.ts
index e19d7bb29912..85c0e219d6a9 100644
--- a/src/plugins/data_view_management/public/mocks.ts
+++ b/src/plugins/data_view_management/public/mocks.ts
@@ -11,6 +11,7 @@ import { coreMock } from '../../../core/public/mocks';
 import { managementPluginMock } from '../../management/public/mocks';
 import { urlForwardingPluginMock } from '../../url_forwarding/public/mocks';
 import { dataPluginMock } from '../../data/public/mocks';
+import { unifiedSearchPluginMock } from '../../unified_search/public/mocks';
 import { indexPatternFieldEditorPluginMock } from '../../data_view_field_editor/public/mocks';
 import { indexPatternEditorPluginMock } from '../../data_view_editor/public/mocks';
 import { dataViewPluginMocks } from '../../data_views/public/mocks';
@@ -60,6 +61,7 @@ const createIndexPatternManagmentContext = (): {
   const data = dataPluginMock.createStartContract();
   const dataViewFieldEditor = indexPatternFieldEditorPluginMock.createStartContract();
   const dataViews = dataViewPluginMocks.createStartContract();
+  const unifiedSearch = unifiedSearchPluginMock.createStartContract();
 
   return {
     application,
@@ -71,6 +73,7 @@ const createIndexPatternManagmentContext = (): {
     docLinks,
     data,
     dataViews,
+    unifiedSearch,
     dataViewFieldEditor,
     indexPatternManagementStart: createStartContract(),
     setBreadcrumbs: () => {},
diff --git a/src/plugins/data_view_management/public/plugin.ts b/src/plugins/data_view_management/public/plugin.ts
index 84686dd666f9..f78f81297dcb 100644
--- a/src/plugins/data_view_management/public/plugin.ts
+++ b/src/plugins/data_view_management/public/plugin.ts
@@ -17,6 +17,7 @@ import { IndexPatternFieldEditorStart } from '../../data_view_field_editor/publi
 import { DataViewEditorStart } from '../../data_view_editor/public';
 import { DataViewsPublicPluginStart } from '../../data_views/public';
 import { SpacesPluginStart } from '../../../../x-pack/plugins/spaces/public';
+import { UnifiedSearchPublicPluginStart } from '../../unified_search/public';
 
 export interface IndexPatternManagementSetupDependencies {
   management: ManagementSetup;
@@ -30,6 +31,7 @@ export interface IndexPatternManagementStartDependencies {
   dataViews: DataViewsPublicPluginStart;
   fieldFormats: FieldFormatsStart;
   spaces?: SpacesPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
diff --git a/src/plugins/data_view_management/public/types.ts b/src/plugins/data_view_management/public/types.ts
index 0cea57c1bcd7..53e576f32fcb 100644
--- a/src/plugins/data_view_management/public/types.ts
+++ b/src/plugins/data_view_management/public/types.ts
@@ -16,6 +16,7 @@ import {
   ApplicationStart,
 } from 'src/core/public';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
+import { UnifiedSearchPublicPluginStart } from '../../unified_search/public';
 import { ManagementAppMountParams } from '../../management/public';
 import { IndexPatternManagementStart } from './index';
 import { KibanaReactContextValue } from '../../kibana_react/public';
@@ -34,6 +35,7 @@ export interface IndexPatternManagmentContext {
   http: HttpSetup;
   docLinks: DocLinksStart;
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   dataViews: DataViewsPublicPluginStart;
   dataViewFieldEditor: IndexPatternFieldEditorStart;
   indexPatternManagementStart: IndexPatternManagementStart;
diff --git a/src/plugins/data_view_management/tsconfig.json b/src/plugins/data_view_management/tsconfig.json
index 9710111bcfde..9b8a7e688e0c 100644
--- a/src/plugins/data_view_management/tsconfig.json
+++ b/src/plugins/data_view_management/tsconfig.json
@@ -20,6 +20,7 @@
     { "path": "../es_ui_shared/tsconfig.json" },
     { "path": "../data_view_field_editor/tsconfig.json" },
     { "path": "../data_view_editor/tsconfig.json" },
+    { "path": "../unified_search/tsconfig.json" },
     { "path": "../../../x-pack/plugins/spaces/tsconfig.json" }
   ]
 }
diff --git a/src/plugins/input_control_vis/kibana.json b/src/plugins/input_control_vis/kibana.json
index 83d2c92a7009..ad9a0e3accb6 100644
--- a/src/plugins/input_control_vis/kibana.json
+++ b/src/plugins/input_control_vis/kibana.json
@@ -9,6 +9,6 @@
   "kibanaVersion": "kibana",
   "server": false,
   "ui": true,
-  "requiredPlugins": ["data", "expressions", "visDefaultEditor", "visualizations"],
+  "requiredPlugins": ["data", "expressions", "visDefaultEditor", "visualizations", "unifiedSearch"],
   "requiredBundles": ["kibanaReact"]
 }
diff --git a/src/plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx b/src/plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx
index 5363a988226e..57fb9cdce6d8 100644
--- a/src/plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx
@@ -9,7 +9,7 @@
 import React, { ComponentType } from 'react';
 import { injectI18n, InjectedIntlProps } from '@kbn/i18n-react';
 import { EuiFormRow } from '@elastic/eui';
-import { IndexPatternSelectProps } from 'src/plugins/data/public';
+import { IndexPatternSelectProps } from '../../../../unified_search/public';
 
 export type IndexPatternSelectFormRowUiProps = InjectedIntlProps & {
   onChange: (opt: any) => void;
diff --git a/src/plugins/input_control_vis/public/components/editor/list_control_editor.tsx b/src/plugins/input_control_vis/public/components/editor/list_control_editor.tsx
index 720b1325142e..3a8dcccce651 100644
--- a/src/plugins/input_control_vis/public/components/editor/list_control_editor.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/list_control_editor.tsx
@@ -14,7 +14,7 @@ import { EuiFormRow, EuiFieldNumber, EuiSwitch, EuiSelect } from '@elastic/eui';
 import { IndexPatternSelectFormRow } from './index_pattern_select_form_row';
 import { FieldSelect } from './field_select';
 import { ControlParams, ControlParamsOptions } from '../../editor_utils';
-import { IndexPatternSelectProps } from '../../../../data/public';
+import { IndexPatternSelectProps } from '../../../../unified_search/public';
 import { DataView, DataViewField } from '../../../../data_views/public';
 import { InputControlVisDependencies } from '../../plugin';
 
@@ -93,9 +93,9 @@ export class ListControlEditor extends PureComponent<
   };
 
   async getIndexPatternSelect() {
-    const [, { data }] = await this.props.deps.core.getStartServices();
+    const [, { unifiedSearch }] = await this.props.deps.core.getStartServices();
     this.setState({
-      IndexPatternSelect: data.ui.IndexPatternSelect,
+      IndexPatternSelect: unifiedSearch.ui.IndexPatternSelect,
     });
   }
 
diff --git a/src/plugins/input_control_vis/public/components/editor/range_control_editor.tsx b/src/plugins/input_control_vis/public/components/editor/range_control_editor.tsx
index 913eb49c96cf..32d1f9aef554 100644
--- a/src/plugins/input_control_vis/public/components/editor/range_control_editor.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/range_control_editor.tsx
@@ -14,7 +14,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { IndexPatternSelectFormRow } from './index_pattern_select_form_row';
 import { FieldSelect } from './field_select';
 import { ControlParams, ControlParamsOptions } from '../../editor_utils';
-import { IndexPatternSelectProps } from '../../../../data/public';
+import { IndexPatternSelectProps } from '../../../../unified_search/public';
 import { DataView, DataViewField } from '../../../../data_views/public';
 import { InputControlVisDependencies } from '../../plugin';
 
@@ -53,9 +53,9 @@ export class RangeControlEditor extends Component<
   }
 
   async getIndexPatternSelect() {
-    const [, { data }] = await this.props.deps.core.getStartServices();
+    const [, { unifiedSearch }] = await this.props.deps.core.getStartServices();
     this.setState({
-      IndexPatternSelect: data.ui.IndexPatternSelect,
+      IndexPatternSelect: unifiedSearch.ui.IndexPatternSelect,
     });
   }
 
diff --git a/src/plugins/input_control_vis/public/plugin.ts b/src/plugins/input_control_vis/public/plugin.ts
index c086bc7f74d6..0f8f601d5edb 100644
--- a/src/plugins/input_control_vis/public/plugin.ts
+++ b/src/plugins/input_control_vis/public/plugin.ts
@@ -9,6 +9,7 @@
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
 
 import { DataPublicPluginSetup, DataPublicPluginStart } from 'src/plugins/data/public';
+import { UnifiedSearchPublicPluginStart } from 'src/plugins/unified_search/public';
 import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
 import { VisualizationsSetup, VisualizationsStart } from '../../visualizations/public';
 import { createInputControlVisFn } from './input_control_fn';
@@ -40,6 +41,7 @@ export interface InputControlVisPluginStartDependencies {
   expressions: ReturnType<ExpressionsPublicPlugin['start']>;
   visualizations: VisualizationsStart;
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
 }
 
 /** @internal */
diff --git a/src/plugins/input_control_vis/public/test_utils/get_deps_mock.tsx b/src/plugins/input_control_vis/public/test_utils/get_deps_mock.tsx
index e0964c481189..03102e42a603 100644
--- a/src/plugins/input_control_vis/public/test_utils/get_deps_mock.tsx
+++ b/src/plugins/input_control_vis/public/test_utils/get_deps_mock.tsx
@@ -31,15 +31,17 @@ export const getDepsMock = ({
             search: {
               searchSource,
             },
-            ui: {
-              IndexPatternSelect: () => (<div />) as any,
-            },
             indexPatterns: {
               get: () => ({
                 fields,
               }),
             },
           },
+          unifiedSearch: {
+            ui: {
+              IndexPatternSelect: () => (<div />) as any,
+            },
+          },
         },
       ]),
     },
diff --git a/src/plugins/input_control_vis/tsconfig.json b/src/plugins/input_control_vis/tsconfig.json
index 43b1539e87da..1840efb32bbc 100644
--- a/src/plugins/input_control_vis/tsconfig.json
+++ b/src/plugins/input_control_vis/tsconfig.json
@@ -17,5 +17,6 @@
     { "path": "../expressions/tsconfig.json" },
     { "path": "../visualizations/tsconfig.json" },
     { "path": "../vis_default_editor/tsconfig.json" },
+    { "path": "../unified_search/tsconfig.json" }
   ]
 }
diff --git a/src/plugins/navigation/kibana.json b/src/plugins/navigation/kibana.json
index aa1294847cef..ae188be0c6d3 100644
--- a/src/plugins/navigation/kibana.json
+++ b/src/plugins/navigation/kibana.json
@@ -7,6 +7,6 @@
   "version": "kibana",
   "server": false,
   "ui": true,
-  "requiredPlugins": ["data"],
+  "requiredPlugins": ["unifiedSearch"],
   "requiredBundles": ["kibanaReact"]
 }
diff --git a/src/plugins/navigation/public/plugin.ts b/src/plugins/navigation/public/plugin.ts
index e9a95312cba9..dc3d8f2043a7 100644
--- a/src/plugins/navigation/public/plugin.ts
+++ b/src/plugins/navigation/public/plugin.ts
@@ -32,13 +32,13 @@ export class NavigationPublicPlugin
 
   public start(
     { i18n }: CoreStart,
-    { data }: NavigationPluginStartDependencies
+    { unifiedSearch }: NavigationPluginStartDependencies
   ): NavigationPublicPluginStart {
     const extensions = this.topNavMenuExtensionsRegistry.getAll();
 
     return {
       ui: {
-        TopNavMenu: createTopNav(data, extensions, i18n),
+        TopNavMenu: createTopNav(unifiedSearch, extensions, i18n),
       },
     };
   }
diff --git a/src/plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx b/src/plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx
index 1e5cecb5346a..a26627c84a52 100644
--- a/src/plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx
@@ -8,12 +8,12 @@
 
 import React from 'react';
 import { I18nStart } from 'kibana/public';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
+import { UnifiedSearchPublicPluginStart } from 'src/plugins/unified_search/public';
 import { TopNavMenuProps, TopNavMenu } from './top_nav_menu';
 import { RegisteredTopNavMenuData } from './top_nav_menu_data';
 
 export function createTopNav(
-  data: DataPublicPluginStart,
+  unifiedSearch: UnifiedSearchPublicPluginStart,
   extraConfig: RegisteredTopNavMenuData[],
   i18n: I18nStart
 ) {
@@ -25,7 +25,7 @@ export function createTopNav(
 
     return (
       <i18n.Context>
-        <TopNavMenu {...props} data={data} config={config} />
+        <TopNavMenu {...props} unifiedSearch={unifiedSearch} config={config} />
       </i18n.Context>
     );
   };
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
index 682154dd5d5d..7d263d010d46 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
@@ -13,12 +13,13 @@ import { MountPoint } from 'kibana/public';
 import { TopNavMenu } from './top_nav_menu';
 import { TopNavMenuData } from './top_nav_menu_data';
 import { shallowWithIntl, mountWithIntl } from '@kbn/test-jest-helpers';
+import type { UnifiedSearchPublicPluginStart } from '../../../unified_search/public';
 
-const dataShim = {
+const unifiedSearch = {
   ui: {
     SearchBar: () => <div className="searchBar" />,
   },
-};
+} as unknown as UnifiedSearchPublicPluginStart;
 
 describe('TopNavMenu', () => {
   const WRAPPER_SELECTOR = '.kbnTopNavMenu__wrapper';
@@ -72,7 +73,7 @@ describe('TopNavMenu', () => {
 
   it('Should render search bar', () => {
     const component = shallowWithIntl(
-      <TopNavMenu appName={'test'} showSearchBar={true} data={dataShim as any} />
+      <TopNavMenu appName={'test'} showSearchBar={true} unifiedSearch={unifiedSearch} />
     );
     expect(component.find(WRAPPER_SELECTOR).length).toBe(1);
     expect(component.find(TOP_NAV_ITEM_SELECTOR).length).toBe(0);
@@ -81,7 +82,12 @@ describe('TopNavMenu', () => {
 
   it('Should render menu items and search bar', () => {
     const component = shallowWithIntl(
-      <TopNavMenu appName={'test'} config={menuItems} showSearchBar={true} data={dataShim as any} />
+      <TopNavMenu
+        appName={'test'}
+        config={menuItems}
+        showSearchBar={true}
+        unifiedSearch={unifiedSearch}
+      />
     );
     expect(component.find(WRAPPER_SELECTOR).length).toBe(1);
     expect(component.find(TOP_NAV_ITEM_SELECTOR).length).toBe(menuItems.length);
@@ -94,7 +100,7 @@ describe('TopNavMenu', () => {
         appName={'test'}
         config={menuItems}
         showSearchBar={true}
-        data={dataShim as any}
+        unifiedSearch={unifiedSearch}
         className={'myCoolClass'}
       />
     );
@@ -142,7 +148,7 @@ describe('TopNavMenu', () => {
           appName={'test'}
           config={menuItems}
           showSearchBar={true}
-          data={dataShim as any}
+          unifiedSearch={unifiedSearch}
           setMenuMountPoint={setMountPoint}
         />
       );
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
index 22edf9c45446..fcc2f0826339 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
@@ -12,11 +12,8 @@ import classNames from 'classnames';
 
 import { MountPoint } from '../../../../core/public';
 import { MountPointPortal } from '../../../kibana_react/public';
-import {
-  StatefulSearchBarProps,
-  DataPublicPluginStart,
-  SearchBarProps,
-} from '../../../data/public';
+import { UnifiedSearchPublicPluginStart } from '../../../unified_search/public';
+import { StatefulSearchBarProps, SearchBarProps } from '../../../unified_search/public';
 import { TopNavMenuData } from './top_nav_menu_data';
 import { TopNavMenuItem } from './top_nav_menu_item';
 
@@ -29,7 +26,7 @@ export type TopNavMenuProps = StatefulSearchBarProps &
     showQueryInput?: boolean;
     showDatePicker?: boolean;
     showFilterBar?: boolean;
-    data?: DataPublicPluginStart;
+    unifiedSearch?: UnifiedSearchPublicPluginStart;
     className?: string;
     /**
      * If provided, the menu part of the component will be rendered as a portal inside the given mount point.
@@ -64,7 +61,7 @@ export type TopNavMenuProps = StatefulSearchBarProps &
 export function TopNavMenu(props: TopNavMenuProps): ReactElement | null {
   const { config, badges, showSearchBar, ...searchBarProps } = props;
 
-  if ((!config || config.length === 0) && (!showSearchBar || !props.data)) {
+  if ((!config || config.length === 0) && (!showSearchBar || !props.unifiedSearch)) {
     return null;
   }
 
@@ -102,8 +99,8 @@ export function TopNavMenu(props: TopNavMenuProps): ReactElement | null {
 
   function renderSearchBar(): ReactElement | null {
     // Validate presense of all required fields
-    if (!showSearchBar || !props.data) return null;
-    const { SearchBar } = props.data.ui;
+    if (!showSearchBar || !props.unifiedSearch) return null;
+    const { SearchBar } = props.unifiedSearch.ui;
     return <SearchBar {...searchBarProps} />;
   }
 
diff --git a/src/plugins/navigation/public/types.ts b/src/plugins/navigation/public/types.ts
index d23bc249dd01..29b204a798fa 100644
--- a/src/plugins/navigation/public/types.ts
+++ b/src/plugins/navigation/public/types.ts
@@ -7,7 +7,7 @@
  */
 
 import { TopNavMenuProps, TopNavMenuExtensionsRegistrySetup } from './top_nav_menu';
-import { DataPublicPluginStart } from '../../data/public';
+import { UnifiedSearchPublicPluginStart } from '../../unified_search/public';
 
 export interface NavigationPublicPluginSetup {
   registerMenuItem: TopNavMenuExtensionsRegistrySetup['register'];
@@ -20,5 +20,5 @@ export interface NavigationPublicPluginStart {
 }
 
 export interface NavigationPluginStartDependencies {
-  data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
 }
diff --git a/src/plugins/navigation/tsconfig.json b/src/plugins/navigation/tsconfig.json
index 1b7e87aaba41..ca9acf96f419 100644
--- a/src/plugins/navigation/tsconfig.json
+++ b/src/plugins/navigation/tsconfig.json
@@ -11,5 +11,6 @@
     { "path": "../../core/tsconfig.json" },
     { "path": "../kibana_react/tsconfig.json" },
     { "path": "../data/tsconfig.json" },
+    { "path": "../unified_search/tsconfig.json" }
   ]
 }
diff --git a/src/plugins/unified_search/README.md b/src/plugins/unified_search/README.md
new file mode 100755
index 000000000000..dd2c65a2d03f
--- /dev/null
+++ b/src/plugins/unified_search/README.md
@@ -0,0 +1,12 @@
+# unifiedSearch
+
+Contains all the components of Kibana's unified search experience. Specifically:
+ - UI components for rendering unified search bar;
+ - Current state of the search (`data view`, `applied filters, …);
+ - Saved queries management.
+
+---
+
+## Development
+
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
diff --git a/src/plugins/unified_search/config.ts b/src/plugins/unified_search/config.ts
new file mode 100644
index 000000000000..c0067771b680
--- /dev/null
+++ b/src/plugins/unified_search/config.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { schema, TypeOf } from '@kbn/config-schema';
+
+export const configSchema = schema.object({});
+
+export type ConfigSchema = TypeOf<typeof configSchema>;
diff --git a/src/plugins/unified_search/jest.config.js b/src/plugins/unified_search/jest.config.js
new file mode 100644
index 000000000000..783631ba05d5
--- /dev/null
+++ b/src/plugins/unified_search/jest.config.js
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../..',
+  roots: ['<rootDir>/src/plugins/unified_search'],
+  coverageDirectory: '<rootDir>/target/kibana-coverage/jest/src/plugins/unified_search',
+  coverageReporters: ['text', 'html'],
+  collectCoverageFrom: ['<rootDir>/src/plugins/unified_search/public/**/*.{ts,tsx}'],
+};
diff --git a/src/plugins/unified_search/kibana.json b/src/plugins/unified_search/kibana.json
new file mode 100755
index 000000000000..8673c6ec783b
--- /dev/null
+++ b/src/plugins/unified_search/kibana.json
@@ -0,0 +1,14 @@
+{
+  "id": "unifiedSearch",
+  "version": "1.0.0",
+  "description": "Contains all the key functionality of Kibana's unified search experience.Contains all the key functionality of Kibana's unified search experience.",
+  "kibanaVersion": "kibana",
+  "owner": {
+    "name": "Unified Search",
+    "githubTeam": "kibana-app-services"
+  },
+  "server": false,
+  "ui": true,
+  "requiredPlugins": ["dataViews", "data", "uiActions"],
+  "requiredBundles": ["kibanaUtils", "kibanaReact", "data"]
+}
diff --git a/src/plugins/data/public/actions/apply_filter_action.ts b/src/plugins/unified_search/public/actions/apply_filter_action.ts
similarity index 95%
rename from src/plugins/data/public/actions/apply_filter_action.ts
rename to src/plugins/unified_search/public/actions/apply_filter_action.ts
index 97e332dfa01f..e9fb75c5bd6d 100644
--- a/src/plugins/data/public/actions/apply_filter_action.ts
+++ b/src/plugins/unified_search/public/actions/apply_filter_action.ts
@@ -11,8 +11,8 @@ import { ThemeServiceSetup } from 'kibana/public';
 import { toMountPoint } from '../../../kibana_react/public';
 import { Action, createAction, IncompatibleActionError } from '../../../ui_actions/public';
 import { getOverlays, getIndexPatterns } from '../services';
-import { applyFiltersPopover } from '../ui/apply_filters';
-import { Filter, FilterManager, TimefilterContract, esFilters } from '..';
+import { applyFiltersPopover } from '../apply_filters';
+import { Filter, FilterManager, TimefilterContract, esFilters } from '../../../data/public';
 
 export const ACTION_GLOBAL_APPLY_FILTER = 'ACTION_GLOBAL_APPLY_FILTER';
 
@@ -42,7 +42,7 @@ export function createFilterAction(
     order: 100,
     getIconType: () => 'filter',
     getDisplayName: () => {
-      return i18n.translate('data.filter.applyFilterActionTitle', {
+      return i18n.translate('unifiedSearch.filter.applyFilterActionTitle', {
         defaultMessage: 'Apply filter to current view',
       });
     },
diff --git a/src/plugins/unified_search/public/actions/index.ts b/src/plugins/unified_search/public/actions/index.ts
new file mode 100644
index 000000000000..3a8d41b64995
--- /dev/null
+++ b/src/plugins/unified_search/public/actions/index.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export type { ApplyGlobalFilterActionContext } from './apply_filter_action';
+export { ACTION_GLOBAL_APPLY_FILTER } from './apply_filter_action';
diff --git a/src/plugins/data/public/ui/apply_filters/apply_filter_popover_content.tsx b/src/plugins/unified_search/public/apply_filters/apply_filter_popover_content.tsx
similarity index 89%
rename from src/plugins/data/public/ui/apply_filters/apply_filter_popover_content.tsx
rename to src/plugins/unified_search/public/apply_filters/apply_filter_popover_content.tsx
index 64bf7975e393..03e377036b3d 100644
--- a/src/plugins/data/public/ui/apply_filters/apply_filter_popover_content.tsx
+++ b/src/plugins/unified_search/public/apply_filters/apply_filter_popover_content.tsx
@@ -19,10 +19,9 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { Component } from 'react';
-import { IIndexPattern } from '../..';
-import { Filter } from '../../../common';
+import { getDisplayValueFromFilter, mapAndFlattenFilters } from '../../../data/public';
 import { FilterLabel } from '../filter_bar';
-import { mapAndFlattenFilters, getDisplayValueFromFilter } from '../../query';
+import { Filter, IIndexPattern } from '../../../data/common';
 
 interface Props {
   filters: Filter[];
@@ -80,7 +79,7 @@ export default class ApplyFiltersPopoverContent extends Component<Props, State>
         <EuiModalHeader>
           <EuiModalHeaderTitle>
             <FormattedMessage
-              id="data.filter.applyFilters.popupHeader"
+              id="unifiedSearch.filter.applyFilters.popupHeader"
               defaultMessage="Select filters to apply"
             />
           </EuiModalHeaderTitle>
@@ -91,13 +90,13 @@ export default class ApplyFiltersPopoverContent extends Component<Props, State>
         <EuiModalFooter>
           <EuiButtonEmpty onClick={this.props.onCancel}>
             <FormattedMessage
-              id="data.filter.applyFiltersPopup.cancelButtonLabel"
+              id="unifiedSearch.filter.applyFiltersPopup.cancelButtonLabel"
               defaultMessage="Cancel"
             />
           </EuiButtonEmpty>
           <EuiButton onClick={this.onSubmit} data-test-subj="applyFiltersPopoverButton" fill>
             <FormattedMessage
-              id="data.filter.applyFiltersPopup.saveButtonLabel"
+              id="unifiedSearch.filter.applyFiltersPopup.saveButtonLabel"
               defaultMessage="Apply"
             />
           </EuiButton>
diff --git a/src/plugins/data/public/ui/apply_filters/apply_filters_popover.tsx b/src/plugins/unified_search/public/apply_filters/apply_filters_popover.tsx
similarity index 94%
rename from src/plugins/data/public/ui/apply_filters/apply_filters_popover.tsx
rename to src/plugins/unified_search/public/apply_filters/apply_filters_popover.tsx
index 4912e96df9d6..4d6e045cdb70 100644
--- a/src/plugins/data/public/ui/apply_filters/apply_filters_popover.tsx
+++ b/src/plugins/unified_search/public/apply_filters/apply_filters_popover.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { IIndexPattern, Filter } from '../..';
+import { IIndexPattern, Filter } from '../../../data/common';
 
 type CancelFnType = () => void;
 type SubmitFnType = (filters: Filter[]) => void;
diff --git a/src/plugins/data/public/ui/apply_filters/index.ts b/src/plugins/unified_search/public/apply_filters/index.ts
similarity index 100%
rename from src/plugins/data/public/ui/apply_filters/index.ts
rename to src/plugins/unified_search/public/apply_filters/index.ts
diff --git a/src/plugins/data/public/ui/filter_bar/_global_filter_group.scss b/src/plugins/unified_search/public/filter_bar/_global_filter_group.scss
similarity index 100%
rename from src/plugins/data/public/ui/filter_bar/_global_filter_group.scss
rename to src/plugins/unified_search/public/filter_bar/_global_filter_group.scss
diff --git a/src/plugins/data/public/ui/filter_bar/_global_filter_item.scss b/src/plugins/unified_search/public/filter_bar/_global_filter_item.scss
similarity index 100%
rename from src/plugins/data/public/ui/filter_bar/_global_filter_item.scss
rename to src/plugins/unified_search/public/filter_bar/_global_filter_item.scss
diff --git a/src/plugins/data/public/ui/filter_bar/_index.scss b/src/plugins/unified_search/public/filter_bar/_index.scss
similarity index 100%
rename from src/plugins/data/public/ui/filter_bar/_index.scss
rename to src/plugins/unified_search/public/filter_bar/_index.scss
diff --git a/src/plugins/data/public/ui/filter_bar/_variables.scss b/src/plugins/unified_search/public/filter_bar/_variables.scss
similarity index 100%
rename from src/plugins/data/public/ui/filter_bar/_variables.scss
rename to src/plugins/unified_search/public/filter_bar/_variables.scss
diff --git a/src/plugins/data/public/ui/filter_bar/filter_bar.tsx b/src/plugins/unified_search/public/filter_bar/filter_bar.tsx
similarity index 94%
rename from src/plugins/data/public/ui/filter_bar/filter_bar.tsx
rename to src/plugins/unified_search/public/filter_bar/filter_bar.tsx
index 00557dfab0e9..405580dc0534 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_bar.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_bar.tsx
@@ -25,10 +25,9 @@ import { METRIC_TYPE } from '@kbn/analytics';
 import { FilterEditor } from './filter_editor';
 import { FILTER_EDITOR_WIDTH, FilterItem } from './filter_item';
 import { FilterOptions } from './filter_options';
-import { useKibana } from '../../../../kibana_react/public';
-import { IDataPluginServices, IIndexPattern } from '../..';
-
-import { UI_SETTINGS } from '../../../common';
+import { useKibana } from '../../../kibana_react/public';
+import { IIndexPattern, UI_SETTINGS } from '../../../data/common';
+import { IDataPluginServices } from '../../../data/public';
 
 export interface Props {
   filters: Filter[];
@@ -89,7 +88,7 @@ const FilterBarUI = React.memo(function FilterBarUI(props: Props) {
       >
         +{' '}
         <FormattedMessage
-          id="data.filter.filterBar.addFilterButtonLabel"
+          id="unifiedSearch.filter.filterBar.addFilterButtonLabel"
           defaultMessage="Add filter"
         />
       </EuiButtonEmpty>
@@ -228,4 +227,7 @@ const FilterBarUI = React.memo(function FilterBarUI(props: Props) {
   );
 });
 
-export const FilterBar = injectI18n(FilterBarUI);
+const FilterBar = injectI18n(FilterBarUI);
+// Needed for React.lazy
+// eslint-disable-next-line import/no-default-export
+export default FilterBar;
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/filter_editor.test.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/filter_editor.test.tsx
similarity index 93%
rename from src/plugins/data/public/ui/filter_bar/filter_editor/filter_editor.test.tsx
rename to src/plugins/unified_search/public/filter_bar/filter_editor/filter_editor.test.tsx
index 8f48bef8e0e5..9bc8aa382bb0 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_editor/filter_editor.test.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/filter_editor.test.tsx
@@ -10,8 +10,8 @@ import { registerTestBed, TestBed } from '@kbn/test-jest-helpers';
 import { FilterEditor, Props } from '.';
 import React from 'react';
 
-jest.mock('../../../../../kibana_react/public', () => {
-  const original = jest.requireActual('../../../../../kibana_react/public');
+jest.mock('../../../../kibana_react/public', () => {
+  const original = jest.requireActual('../../../../kibana_react/public');
 
   return {
     ...original,
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/generic_combo_box.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/generic_combo_box.tsx
similarity index 100%
rename from src/plugins/data/public/ui/filter_bar/filter_editor/generic_combo_box.tsx
rename to src/plugins/unified_search/public/filter_bar/filter_editor/generic_combo_box.tsx
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/index.tsx
similarity index 91%
rename from src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx
rename to src/plugins/unified_search/public/filter_bar/filter_editor/index.tsx
index 35ac8f386946..7eb2cde56b80 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/index.tsx
@@ -44,9 +44,9 @@ import { Operator } from './lib/filter_operators';
 import { PhraseValueInput } from './phrase_value_input';
 import { PhrasesValuesInput } from './phrases_values_input';
 import { RangeValueInput } from './range_value_input';
-import { getIndexPatternFromFilter } from '../../../query';
-import { IIndexPattern, IFieldType } from '../../..';
-import { CodeEditor } from '../../../../../kibana_react/public';
+import { IIndexPattern, IFieldType } from '../../../../data/common';
+import { getIndexPatternFromFilter } from '../../../../data/public';
+import { CodeEditor } from '../../../../kibana_react/public';
 
 export interface Props {
   filter: Filter;
@@ -90,7 +90,7 @@ class FilterEditorUI extends Component<Props, State> {
           <EuiFlexGroup alignItems="baseline" responsive={false}>
             <EuiFlexItem>
               <FormattedMessage
-                id="data.filter.filterEditor.editFilterPopupTitle"
+                id="unifiedSearch.filter.filterEditor.editFilterPopupTitle"
                 defaultMessage="Edit filter"
               />
             </EuiFlexItem>
@@ -103,12 +103,12 @@ class FilterEditorUI extends Component<Props, State> {
               >
                 {this.state.isCustomEditorOpen ? (
                   <FormattedMessage
-                    id="data.filter.filterEditor.editFilterValuesButtonLabel"
+                    id="unifiedSearch.filter.filterEditor.editFilterValuesButtonLabel"
                     defaultMessage="Edit filter values"
                   />
                 ) : (
                   <FormattedMessage
-                    id="data.filter.filterEditor.editQueryDslButtonLabel"
+                    id="unifiedSearch.filter.filterEditor.editQueryDslButtonLabel"
                     defaultMessage="Edit as Query DSL"
                   />
                 )}
@@ -129,7 +129,7 @@ class FilterEditorUI extends Component<Props, State> {
               id="filterEditorCustomLabelSwitch"
               data-test-subj="createCustomLabel"
               label={this.props.intl.formatMessage({
-                id: 'data.filter.filterEditor.createCustomLabelSwitchLabel',
+                id: 'unifiedSearch.filter.filterEditor.createCustomLabelSwitchLabel',
                 defaultMessage: 'Create custom label?',
               })}
               checked={this.state.useCustomLabel}
@@ -141,7 +141,7 @@ class FilterEditorUI extends Component<Props, State> {
                 <EuiSpacer size="m" />
                 <EuiFormRow
                   label={this.props.intl.formatMessage({
-                    id: 'data.filter.filterEditor.createCustomLabelInputLabel',
+                    id: 'unifiedSearch.filter.filterEditor.createCustomLabelInputLabel',
                     defaultMessage: 'Custom label',
                   })}
                   fullWidth
@@ -166,7 +166,7 @@ class FilterEditorUI extends Component<Props, State> {
                   data-test-subj="saveFilter"
                 >
                   <FormattedMessage
-                    id="data.filter.filterEditor.saveButtonLabel"
+                    id="unifiedSearch.filter.filterEditor.saveButtonLabel"
                     defaultMessage="Save"
                   />
                 </EuiButton>
@@ -178,7 +178,7 @@ class FilterEditorUI extends Component<Props, State> {
                   data-test-subj="cancelSaveFilter"
                 >
                   <FormattedMessage
-                    id="data.filter.filterEditor.cancelButtonLabel"
+                    id="unifiedSearch.filter.filterEditor.cancelButtonLabel"
                     defaultMessage="Cancel"
                   />
                 </EuiButtonEmpty>
@@ -212,14 +212,14 @@ class FilterEditorUI extends Component<Props, State> {
           <EuiFormRow
             fullWidth
             label={this.props.intl.formatMessage({
-              id: 'data.filter.filterEditor.indexPatternSelectLabel',
+              id: 'unifiedSearch.filter.filterEditor.indexPatternSelectLabel',
               defaultMessage: 'Index Pattern',
             })}
           >
             <IndexPatternComboBox
               fullWidth
               placeholder={this.props.intl.formatMessage({
-                id: 'data.filter.filterBar.indexPatternSelectPlaceholder',
+                id: 'unifiedSearch.filter.filterBar.indexPatternSelectPlaceholder',
                 defaultMessage: 'Select an index pattern',
               })}
               options={this.props.indexPatterns}
@@ -259,7 +259,7 @@ class FilterEditorUI extends Component<Props, State> {
       <EuiFormRow
         fullWidth
         label={this.props.intl.formatMessage({
-          id: 'data.filter.filterEditor.fieldSelectLabel',
+          id: 'unifiedSearch.filter.filterEditor.fieldSelectLabel',
           defaultMessage: 'Field',
         })}
       >
@@ -268,7 +268,7 @@ class FilterEditorUI extends Component<Props, State> {
           id="fieldInput"
           isDisabled={!selectedIndexPattern}
           placeholder={this.props.intl.formatMessage({
-            id: 'data.filter.filterEditor.fieldSelectPlaceholder',
+            id: 'unifiedSearch.filter.filterEditor.fieldSelectPlaceholder',
             defaultMessage: 'Select a field first',
           })}
           options={fields}
@@ -290,7 +290,7 @@ class FilterEditorUI extends Component<Props, State> {
       <EuiFormRow
         fullWidth
         label={this.props.intl.formatMessage({
-          id: 'data.filter.filterEditor.operatorSelectLabel',
+          id: 'unifiedSearch.filter.filterEditor.operatorSelectLabel',
           defaultMessage: 'Operator',
         })}
       >
@@ -300,11 +300,11 @@ class FilterEditorUI extends Component<Props, State> {
           placeholder={
             selectedField
               ? this.props.intl.formatMessage({
-                  id: 'data.filter.filterEditor.operatorSelectPlaceholderSelect',
+                  id: 'unifiedSearch.filter.filterEditor.operatorSelectPlaceholderSelect',
                   defaultMessage: 'Select',
                 })
               : this.props.intl.formatMessage({
-                  id: 'data.filter.filterEditor.operatorSelectPlaceholderWaiting',
+                  id: 'unifiedSearch.filter.filterEditor.operatorSelectPlaceholderWaiting',
                   defaultMessage: 'Waiting',
                 })
           }
@@ -324,7 +324,7 @@ class FilterEditorUI extends Component<Props, State> {
     return (
       <EuiFormRow
         fullWidth
-        label={i18n.translate('data.filter.filterEditor.queryDslLabel', {
+        label={i18n.translate('unifiedSearch.filter.filterEditor.queryDslLabel', {
           defaultMessage: 'Elasticsearch Query DSL',
         })}
       >
@@ -335,7 +335,7 @@ class FilterEditorUI extends Component<Props, State> {
           value={this.state.queryDsl}
           onChange={this.onQueryDslChange}
           data-test-subj="customEditorInput"
-          aria-label={i18n.translate('data.filter.filterEditor.queryDslAriaLabel', {
+          aria-label={i18n.translate('unifiedSearch.filter.filterEditor.queryDslAriaLabel', {
             defaultMessage: 'Elasticsearch Query DSL editor',
           })}
         />
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/__snapshots__/filter_label.test.tsx.snap b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/__snapshots__/filter_label.test.tsx.snap
new file mode 100644
index 000000000000..208af5049d13
--- /dev/null
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/__snapshots__/filter_label.test.tsx.snap
@@ -0,0 +1,68 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`alias 1`] = `
+<div>
+  
+  geo.coordinates in US
+</div>
+`;
+
+exports[`alias with error status 1`] = `
+<div>
+  <span
+    class="euiTextColor euiTextColor--danger"
+  >
+     NOT 
+  </span>
+  geo.coordinates in US
+  : 
+  <span
+    class="globalFilterLabel__value"
+  >
+    Error
+  </span>
+</div>
+`;
+
+exports[`alias with warning status 1`] = `
+<div>
+  <span
+    class="euiTextColor euiTextColor--danger"
+  >
+     NOT 
+  </span>
+  geo.coordinates in US
+  : 
+  <span
+    class="globalFilterLabel__value"
+  >
+    Warning
+  </span>
+</div>
+`;
+
+exports[`error 1`] = `
+<div>
+  
+  machine.os
+  : 
+  <span
+    class="globalFilterLabel__value"
+  >
+    Error
+  </span>
+</div>
+`;
+
+exports[`warning 1`] = `
+<div>
+  
+  machine.os
+  : 
+  <span
+    class="globalFilterLabel__value"
+  >
+    Warning
+  </span>
+</div>
+`;
diff --git a/src/plugins/data/public/ui/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
similarity index 98%
rename from src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_editor_utils.test.ts
rename to src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts
index 32e82df91086..7790bd601dcf 100644
--- a/src/plugins/data/public/ui/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
@@ -13,8 +13,8 @@ import {
   rangeFilter,
   stubIndexPattern,
   stubFields,
-} from '../../../../stubs';
-import { toggleFilterNegated } from '../../../../../common';
+} from '../../../../../data/common/stubs';
+import { toggleFilterNegated } from '../../../../../data/common';
 import {
   getFieldFromFilter,
   getFilterableFields,
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_editor_utils.ts b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.ts
similarity index 98%
rename from src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_editor_utils.ts
rename to src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.ts
index 7d433bb1f273..3b8fb867c361 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_editor_utils.ts
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.ts
@@ -11,7 +11,7 @@ import { Filter, FieldFilter } from '@kbn/es-query';
 import { ES_FIELD_TYPES } from '@kbn/field-types';
 import isSemverValid from 'semver/functions/valid';
 import { FILTER_OPERATORS, Operator } from './filter_operators';
-import { isFilterable, IIndexPattern, IFieldType, IpAddress } from '../../../../../common';
+import { isFilterable, IIndexPattern, IFieldType, IpAddress } from '../../../../../data/common';
 
 export function getFieldFromFilter(filter: FieldFilter, indexPattern: IIndexPattern) {
   return indexPattern.fields.find((field) => field.name === filter.meta.key);
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.test.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.test.tsx
new file mode 100644
index 000000000000..b3756701aaa9
--- /dev/null
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.test.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import FilterLabel from './filter_label';
+import { render } from '@testing-library/react';
+import { phraseFilter } from '../../../../../data/common/stubs';
+
+test('alias', () => {
+  const filter = {
+    ...phraseFilter,
+    meta: {
+      ...phraseFilter.meta,
+      alias: 'geo.coordinates in US',
+    },
+  };
+  const { container } = render(<FilterLabel filter={filter} />);
+  expect(container).toMatchSnapshot();
+});
+
+test('alias with warning status', () => {
+  const filter = {
+    ...phraseFilter,
+    meta: {
+      ...phraseFilter.meta,
+      alias: 'geo.coordinates in US',
+      negate: true,
+    },
+  };
+  const { container } = render(
+    <FilterLabel filter={filter} valueLabel={'Warning'} filterLabelStatus={'warn'} />
+  );
+  expect(container).toMatchSnapshot();
+});
+
+test('alias with error status', () => {
+  const filter = {
+    ...phraseFilter,
+    meta: {
+      ...phraseFilter.meta,
+      alias: 'geo.coordinates in US',
+      negate: true,
+    },
+  };
+  const { container } = render(
+    <FilterLabel filter={filter} valueLabel={'Error'} filterLabelStatus={'error'} />
+  );
+  expect(container).toMatchSnapshot();
+});
+
+test('warning', () => {
+  const { container } = render(<FilterLabel filter={phraseFilter} valueLabel={'Warning'} />);
+  expect(container).toMatchSnapshot();
+});
+
+test('error', () => {
+  const { container } = render(<FilterLabel filter={phraseFilter} valueLabel={'Error'} />);
+  expect(container).toMatchSnapshot();
+});
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_label.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.tsx
similarity index 94%
rename from src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_label.tsx
rename to src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.tsx
index d0924258831c..099f211deef0 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_label.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_label.tsx
@@ -10,7 +10,7 @@ import React, { Fragment } from 'react';
 import { EuiTextColor } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { existsOperator, isOneOfOperator } from './filter_operators';
-import { Filter, FILTERS } from '../../../../../common';
+import { Filter, FILTERS } from '../../../../../data/common';
 import type { FilterLabelStatus } from '../../filter_item';
 
 export interface FilterLabelProps {
@@ -29,7 +29,7 @@ export default function FilterLabel({
   hideAlias,
 }: FilterLabelProps) {
   const prefixText = filter.meta.negate
-    ? ` ${i18n.translate('data.filter.filterBar.negatedFilterPrefix', {
+    ? ` ${i18n.translate('unifiedSearch.filter.filterBar.negatedFilterPrefix', {
         defaultMessage: 'NOT ',
       })}`
     : '';
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_operators.ts b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_operators.ts
similarity index 76%
rename from src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_operators.ts
rename to src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_operators.ts
index 0be9c200c8d8..515a4e7f85f6 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_editor/lib/filter_operators.ts
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_operators.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { FILTERS } from '@kbn/es-query';
 import { ES_FIELD_TYPES } from '@kbn/field-types';
-import { IFieldType } from '../../../../../../data_views/common';
+import { IFieldType } from '../../../../../data_views/common';
 
 export interface Operator {
   message: string;
@@ -29,7 +29,7 @@ export interface Operator {
 }
 
 export const isOperator = {
-  message: i18n.translate('data.filter.filterEditor.isOperatorOptionLabel', {
+  message: i18n.translate('unifiedSearch.filter.filterEditor.isOperatorOptionLabel', {
     defaultMessage: 'is',
   }),
   type: FILTERS.PHRASE,
@@ -37,7 +37,7 @@ export const isOperator = {
 };
 
 export const isNotOperator = {
-  message: i18n.translate('data.filter.filterEditor.isNotOperatorOptionLabel', {
+  message: i18n.translate('unifiedSearch.filter.filterEditor.isNotOperatorOptionLabel', {
     defaultMessage: 'is not',
   }),
   type: FILTERS.PHRASE,
@@ -45,7 +45,7 @@ export const isNotOperator = {
 };
 
 export const isOneOfOperator = {
-  message: i18n.translate('data.filter.filterEditor.isOneOfOperatorOptionLabel', {
+  message: i18n.translate('unifiedSearch.filter.filterEditor.isOneOfOperatorOptionLabel', {
     defaultMessage: 'is one of',
   }),
   type: FILTERS.PHRASES,
@@ -54,7 +54,7 @@ export const isOneOfOperator = {
 };
 
 export const isNotOneOfOperator = {
-  message: i18n.translate('data.filter.filterEditor.isNotOneOfOperatorOptionLabel', {
+  message: i18n.translate('unifiedSearch.filter.filterEditor.isNotOneOfOperatorOptionLabel', {
     defaultMessage: 'is not one of',
   }),
   type: FILTERS.PHRASES,
@@ -63,7 +63,7 @@ export const isNotOneOfOperator = {
 };
 
 export const isBetweenOperator = {
-  message: i18n.translate('data.filter.filterEditor.isBetweenOperatorOptionLabel', {
+  message: i18n.translate('unifiedSearch.filter.filterEditor.isBetweenOperatorOptionLabel', {
     defaultMessage: 'is between',
   }),
   type: FILTERS.RANGE,
@@ -79,7 +79,7 @@ export const isBetweenOperator = {
 };
 
 export const isNotBetweenOperator = {
-  message: i18n.translate('data.filter.filterEditor.isNotBetweenOperatorOptionLabel', {
+  message: i18n.translate('unifiedSearch.filter.filterEditor.isNotBetweenOperatorOptionLabel', {
     defaultMessage: 'is not between',
   }),
   type: FILTERS.RANGE,
@@ -95,7 +95,7 @@ export const isNotBetweenOperator = {
 };
 
 export const existsOperator = {
-  message: i18n.translate('data.filter.filterEditor.existsOperatorOptionLabel', {
+  message: i18n.translate('unifiedSearch.filter.filterEditor.existsOperatorOptionLabel', {
     defaultMessage: 'exists',
   }),
   type: FILTERS.EXISTS,
@@ -103,7 +103,7 @@ export const existsOperator = {
 };
 
 export const doesNotExistOperator = {
-  message: i18n.translate('data.filter.filterEditor.doesNotExistOperatorOptionLabel', {
+  message: i18n.translate('unifiedSearch.filter.filterEditor.doesNotExistOperatorOptionLabel', {
     defaultMessage: 'does not exist',
   }),
   type: FILTERS.EXISTS,
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_suggestor.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx
similarity index 94%
rename from src/plugins/data/public/ui/filter_bar/filter_editor/phrase_suggestor.tsx
rename to src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx
index ba39ee78dafa..18464f04de0b 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_suggestor.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { debounce } from 'lodash';
 
-import { withKibana, KibanaReactContextValue } from '../../../../../kibana_react/public';
-import { IDataPluginServices, IIndexPattern, IFieldType } from '../../..';
-import { UI_SETTINGS } from '../../../../common';
+import { withKibana, KibanaReactContextValue } from '../../../../kibana_react/public';
+import { IIndexPattern, IFieldType, UI_SETTINGS } from '../../../../data/common';
+import { IDataPluginServices } from '../../../../data/public';
 
 export interface PhraseSuggestorProps {
   kibana: KibanaReactContextValue<IDataPluginServices>;
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_value_input.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_value_input.tsx
similarity index 90%
rename from src/plugins/data/public/ui/filter_bar/filter_editor/phrase_value_input.tsx
rename to src/plugins/unified_search/public/filter_bar/filter_editor/phrase_value_input.tsx
index 32a713361dbd..6b8667b5043f 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_value_input.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_value_input.tsx
@@ -13,7 +13,7 @@ import React from 'react';
 import { GenericComboBox, GenericComboBoxProps } from './generic_combo_box';
 import { PhraseSuggestorUI, PhraseSuggestorProps } from './phrase_suggestor';
 import { ValueInputType } from './value_input_type';
-import { withKibana } from '../../../../../kibana_react/public';
+import { withKibana } from '../../../../kibana_react/public';
 
 interface Props extends PhraseSuggestorProps {
   value?: string;
@@ -28,7 +28,7 @@ class PhraseValueInputUI extends PhraseSuggestorUI<Props> {
       <EuiFormRow
         fullWidth={this.props.fullWidth}
         label={this.props.intl.formatMessage({
-          id: 'data.filter.filterEditor.valueInputLabel',
+          id: 'unifiedSearch.filter.filterEditor.valueInputLabel',
           defaultMessage: 'Value',
         })}
       >
@@ -38,7 +38,7 @@ class PhraseValueInputUI extends PhraseSuggestorUI<Props> {
           <ValueInputType
             fullWidth={this.props.fullWidth}
             placeholder={this.props.intl.formatMessage({
-              id: 'data.filter.filterEditor.valueInputPlaceholder',
+              id: 'unifiedSearch.filter.filterEditor.valueInputPlaceholder',
               defaultMessage: 'Enter a value',
             })}
             value={this.props.value}
@@ -60,7 +60,7 @@ class PhraseValueInputUI extends PhraseSuggestorUI<Props> {
       <StringComboBox
         fullWidth={fullWidth}
         placeholder={intl.formatMessage({
-          id: 'data.filter.filterEditor.valueSelectPlaceholder',
+          id: 'unifiedSearch.filter.filterEditor.valueSelectPlaceholder',
           defaultMessage: 'Select a value',
         })}
         options={options}
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/phrases_values_input.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/phrases_values_input.tsx
similarity index 90%
rename from src/plugins/data/public/ui/filter_bar/filter_editor/phrases_values_input.tsx
rename to src/plugins/unified_search/public/filter_bar/filter_editor/phrases_values_input.tsx
index 5bf8a655dc36..0a89ba59d329 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_editor/phrases_values_input.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/phrases_values_input.tsx
@@ -12,7 +12,7 @@ import { uniq } from 'lodash';
 import React from 'react';
 import { GenericComboBox, GenericComboBoxProps } from './generic_combo_box';
 import { PhraseSuggestorUI, PhraseSuggestorProps } from './phrase_suggestor';
-import { withKibana } from '../../../../../kibana_react/public';
+import { withKibana } from '../../../../kibana_react/public';
 
 interface Props extends PhraseSuggestorProps {
   values?: string[];
@@ -30,14 +30,14 @@ class PhrasesValuesInputUI extends PhraseSuggestorUI<Props> {
       <EuiFormRow
         fullWidth={fullWidth}
         label={intl.formatMessage({
-          id: 'data.filter.filterEditor.valuesSelectLabel',
+          id: 'unifiedSearch.filter.filterEditor.valuesSelectLabel',
           defaultMessage: 'Values',
         })}
       >
         <StringComboBox
           fullWidth={fullWidth}
           placeholder={intl.formatMessage({
-            id: 'data.filter.filterEditor.valuesSelectPlaceholder',
+            id: 'unifiedSearch.filter.filterEditor.valuesSelectPlaceholder',
             defaultMessage: 'Select values',
           })}
           options={options}
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/range_value_input.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/range_value_input.tsx
similarity index 89%
rename from src/plugins/data/public/ui/filter_bar/filter_editor/range_value_input.tsx
rename to src/plugins/unified_search/public/filter_bar/filter_editor/range_value_input.tsx
index 6561761dc623..bb36682cb607 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_editor/range_value_input.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/range_value_input.tsx
@@ -11,8 +11,8 @@ import { EuiFormControlLayoutDelimited } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n-react';
 import { get } from 'lodash';
 import React from 'react';
-import { useKibana } from '../../../../../kibana_react/public';
-import { IFieldType } from '../../..';
+import { useKibana } from '../../../../kibana_react/public';
+import { IFieldType } from '../../../../data/common';
 import { ValueInputType } from './value_input_type';
 
 interface RangeParams {
@@ -62,7 +62,7 @@ function RangeValueInputUI(props: Props) {
       <EuiFormControlLayoutDelimited
         fullWidth={props.fullWidth}
         aria-label={props.intl.formatMessage({
-          id: 'data.filter.filterEditor.rangeInputLabel',
+          id: 'unifiedSearch.filter.filterEditor.rangeInputLabel',
           defaultMessage: 'Range',
         })}
         startControl={
@@ -75,7 +75,7 @@ function RangeValueInputUI(props: Props) {
               onFromChange(formatDateChange(value));
             }}
             placeholder={props.intl.formatMessage({
-              id: 'data.filter.filterEditor.rangeStartInputPlaceholder',
+              id: 'unifiedSearch.filter.filterEditor.rangeStartInputPlaceholder',
               defaultMessage: 'Start of the range',
             })}
           />
@@ -90,7 +90,7 @@ function RangeValueInputUI(props: Props) {
               onToChange(formatDateChange(value));
             }}
             placeholder={props.intl.formatMessage({
-              id: 'data.filter.filterEditor.rangeEndInputPlaceholder',
+              id: 'unifiedSearch.filter.filterEditor.rangeEndInputPlaceholder',
               defaultMessage: 'End of the range',
             })}
           />
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/value_input_type.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/value_input_type.tsx
similarity index 95%
rename from src/plugins/data/public/ui/filter_bar/filter_editor/value_input_type.tsx
rename to src/plugins/unified_search/public/filter_bar/filter_editor/value_input_type.tsx
index 9b00c71472f3..3b6f8a6879df 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_editor/value_input_type.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/value_input_type.tsx
@@ -11,7 +11,7 @@ import { InjectedIntl, injectI18n } from '@kbn/i18n-react';
 import { isEmpty } from 'lodash';
 import React, { Component } from 'react';
 import { validateParams } from './lib/filter_editor_utils';
-import { IFieldType } from '../../../../../data_views/common';
+import { IFieldType } from '../../../../data_views/common';
 
 interface Props {
   value?: string | number;
@@ -94,14 +94,14 @@ class ValueInputTypeUI extends Component<Props> {
               {
                 value: 'true',
                 text: this.props.intl.formatMessage({
-                  id: 'data.filter.filterEditor.trueOptionLabel',
+                  id: 'unifiedSearch.filter.filterEditor.trueOptionLabel',
                   defaultMessage: 'true',
                 }),
               },
               {
                 value: 'false',
                 text: this.props.intl.formatMessage({
-                  id: 'data.filter.filterEditor.falseOptionLabel',
+                  id: 'unifiedSearch.filter.filterEditor.falseOptionLabel',
                   defaultMessage: 'false',
                 }),
               },
diff --git a/src/plugins/data/public/ui/filter_bar/filter_item.tsx b/src/plugins/unified_search/public/filter_bar/filter_item.tsx
similarity index 90%
rename from src/plugins/data/public/ui/filter_bar/filter_item.tsx
rename to src/plugins/unified_search/public/filter_bar/filter_item.tsx
index 5f5707242584..4f71718d13d0 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_item.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_item.tsx
@@ -20,9 +20,9 @@ import React, { MouseEvent, useState, useEffect, HTMLAttributes } from 'react';
 import { IUiSettingsClient } from 'src/core/public';
 import { FilterEditor } from './filter_editor';
 import { FilterView } from './filter_view';
-import { IIndexPattern } from '../..';
-import { getDisplayValueFromFilter, getIndexPatternFromFilter } from '../../query';
-import { getIndexPatterns } from '../../services';
+import { IIndexPattern } from '../../../data/common';
+import { getIndexPatternFromFilter, getDisplayValueFromFilter } from '../../../data/public';
+import { getIndexPatterns } from '../services';
 
 type PanelOptions = 'pinFilter' | 'editFilter' | 'negateFilter' | 'disableFilter' | 'deleteFilter';
 
@@ -164,11 +164,11 @@ export function FilterItem(props: FilterItemProps) {
       {
         name: isFilterPinned(filter)
           ? props.intl.formatMessage({
-              id: 'data.filter.filterBar.unpinFilterButtonLabel',
+              id: 'unifiedSearch.filter.filterBar.unpinFilterButtonLabel',
               defaultMessage: 'Unpin',
             })
           : props.intl.formatMessage({
-              id: 'data.filter.filterBar.pinFilterButtonLabel',
+              id: 'unifiedSearch.filter.filterBar.pinFilterButtonLabel',
               defaultMessage: 'Pin across all apps',
             }),
         icon: 'pin',
@@ -180,7 +180,7 @@ export function FilterItem(props: FilterItemProps) {
       },
       {
         name: props.intl.formatMessage({
-          id: 'data.filter.filterBar.editFilterButtonLabel',
+          id: 'unifiedSearch.filter.filterBar.editFilterButtonLabel',
           defaultMessage: 'Edit filter',
         }),
         icon: 'pencil',
@@ -190,11 +190,11 @@ export function FilterItem(props: FilterItemProps) {
       {
         name: negate
           ? props.intl.formatMessage({
-              id: 'data.filter.filterBar.includeFilterButtonLabel',
+              id: 'unifiedSearch.filter.filterBar.includeFilterButtonLabel',
               defaultMessage: 'Include results',
             })
           : props.intl.formatMessage({
-              id: 'data.filter.filterBar.excludeFilterButtonLabel',
+              id: 'unifiedSearch.filter.filterBar.excludeFilterButtonLabel',
               defaultMessage: 'Exclude results',
             }),
         icon: negate ? 'plusInCircle' : 'minusInCircle',
@@ -207,11 +207,11 @@ export function FilterItem(props: FilterItemProps) {
       {
         name: disabled
           ? props.intl.formatMessage({
-              id: 'data.filter.filterBar.enableFilterButtonLabel',
+              id: 'unifiedSearch.filter.filterBar.enableFilterButtonLabel',
               defaultMessage: 'Re-enable',
             })
           : props.intl.formatMessage({
-              id: 'data.filter.filterBar.disableFilterButtonLabel',
+              id: 'unifiedSearch.filter.filterBar.disableFilterButtonLabel',
               defaultMessage: 'Temporarily disable',
             }),
         icon: `${disabled ? 'eye' : 'eyeClosed'}`,
@@ -223,7 +223,7 @@ export function FilterItem(props: FilterItemProps) {
       },
       {
         name: props.intl.formatMessage({
-          id: 'data.filter.filterBar.deleteFilterButtonLabel',
+          id: 'unifiedSearch.filter.filterBar.deleteFilterButtonLabel',
           defaultMessage: 'Delete',
         }),
         icon: 'trash',
@@ -298,12 +298,12 @@ export function FilterItem(props: FilterItemProps) {
     if (indexPatternExists === false) {
       label.status = FILTER_ITEM_ERROR;
       label.title = props.intl.formatMessage({
-        id: 'data.filter.filterBar.labelErrorText',
+        id: 'unifiedSearch.filter.filterBar.labelErrorText',
         defaultMessage: `Error`,
       });
       label.message = props.intl.formatMessage(
         {
-          id: 'data.filter.filterBar.labelErrorInfo',
+          id: 'unifiedSearch.filter.filterBar.labelErrorInfo',
           defaultMessage: 'Index pattern {indexPattern} not found',
         },
         {
@@ -316,7 +316,7 @@ export function FilterItem(props: FilterItemProps) {
       } catch (e) {
         label.status = FILTER_ITEM_ERROR;
         label.title = props.intl.formatMessage({
-          id: 'data.filter.filterBar.labelErrorText',
+          id: 'unifiedSearch.filter.filterBar.labelErrorText',
           defaultMessage: `Error`,
         });
         label.message = e.message;
@@ -324,12 +324,12 @@ export function FilterItem(props: FilterItemProps) {
     } else {
       label.status = FILTER_ITEM_WARNING;
       label.title = props.intl.formatMessage({
-        id: 'data.filter.filterBar.labelWarningText',
+        id: 'unifiedSearch.filter.filterBar.labelWarningText',
         defaultMessage: `Warning`,
       });
       label.message = props.intl.formatMessage(
         {
-          id: 'data.filter.filterBar.labelWarningInfo',
+          id: 'unifiedSearch.filter.filterBar.labelWarningInfo',
           defaultMessage: 'Field {fieldName} does not exist in current view',
         },
         {
diff --git a/src/plugins/data/public/ui/filter_bar/filter_options.tsx b/src/plugins/unified_search/public/filter_bar/filter_options.tsx
similarity index 85%
rename from src/plugins/data/public/ui/filter_bar/filter_options.tsx
rename to src/plugins/unified_search/public/filter_bar/filter_options.tsx
index c3a217c8479d..d2e229c98871 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_options.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_options.tsx
@@ -50,7 +50,7 @@ class FilterOptionsUI extends Component<Props, State> {
       items: [
         {
           name: this.props.intl.formatMessage({
-            id: 'data.filter.options.enableAllFiltersButtonLabel',
+            id: 'unifiedSearch.filter.options.enableAllFiltersButtonLabel',
             defaultMessage: 'Enable all',
           }),
           icon: 'eye',
@@ -62,7 +62,7 @@ class FilterOptionsUI extends Component<Props, State> {
         },
         {
           name: this.props.intl.formatMessage({
-            id: 'data.filter.options.disableAllFiltersButtonLabel',
+            id: 'unifiedSearch.filter.options.disableAllFiltersButtonLabel',
             defaultMessage: 'Disable all',
           }),
           icon: 'eyeClosed',
@@ -74,7 +74,7 @@ class FilterOptionsUI extends Component<Props, State> {
         },
         {
           name: this.props.intl.formatMessage({
-            id: 'data.filter.options.pinAllFiltersButtonLabel',
+            id: 'unifiedSearch.filter.options.pinAllFiltersButtonLabel',
             defaultMessage: 'Pin all',
           }),
           icon: 'pin',
@@ -86,7 +86,7 @@ class FilterOptionsUI extends Component<Props, State> {
         },
         {
           name: this.props.intl.formatMessage({
-            id: 'data.filter.options.unpinAllFiltersButtonLabel',
+            id: 'unifiedSearch.filter.options.unpinAllFiltersButtonLabel',
             defaultMessage: 'Unpin all',
           }),
           icon: 'pin',
@@ -98,7 +98,7 @@ class FilterOptionsUI extends Component<Props, State> {
         },
         {
           name: this.props.intl.formatMessage({
-            id: 'data.filter.options.invertNegatedFiltersButtonLabel',
+            id: 'unifiedSearch.filter.options.invertNegatedFiltersButtonLabel',
             defaultMessage: 'Invert inclusion',
           }),
           icon: 'invert',
@@ -110,7 +110,7 @@ class FilterOptionsUI extends Component<Props, State> {
         },
         {
           name: this.props.intl.formatMessage({
-            id: 'data.filter.options.invertDisabledFiltersButtonLabel',
+            id: 'unifiedSearch.filter.options.invertDisabledFiltersButtonLabel',
             defaultMessage: 'Invert enabled/disabled',
           }),
           icon: 'eye',
@@ -122,7 +122,7 @@ class FilterOptionsUI extends Component<Props, State> {
         },
         {
           name: this.props.intl.formatMessage({
-            id: 'data.filter.options.deleteAllFiltersButtonLabel',
+            id: 'unifiedSearch.filter.options.deleteAllFiltersButtonLabel',
             defaultMessage: 'Remove all',
           }),
           icon: 'trash',
@@ -146,11 +146,11 @@ class FilterOptionsUI extends Component<Props, State> {
             onClick={this.togglePopover}
             iconType="filter"
             aria-label={this.props.intl.formatMessage({
-              id: 'data.filter.options.changeAllFiltersButtonLabel',
+              id: 'unifiedSearch.filter.options.changeAllFiltersButtonLabel',
               defaultMessage: 'Change all filters',
             })}
             title={this.props.intl.formatMessage({
-              id: 'data.filter.options.changeAllFiltersButtonLabel',
+              id: 'unifiedSearch.filter.options.changeAllFiltersButtonLabel',
               defaultMessage: 'Change all filters',
             })}
             data-test-subj="showFilterActions"
@@ -163,7 +163,7 @@ class FilterOptionsUI extends Component<Props, State> {
       >
         <EuiPopoverTitle paddingSize="m">
           <FormattedMessage
-            id="data.filter.searchBar.changeAllFiltersTitle"
+            id="unifiedSearch.filter.searchBar.changeAllFiltersTitle"
             defaultMessage="Change all filters"
           />
         </EuiPopoverTitle>
diff --git a/src/plugins/data/public/ui/filter_bar/filter_view/index.tsx b/src/plugins/unified_search/public/filter_bar/filter_view/index.tsx
similarity index 71%
rename from src/plugins/data/public/ui/filter_bar/filter_view/index.tsx
rename to src/plugins/unified_search/public/filter_bar/filter_view/index.tsx
index e5345462b7df..69ef9edee580 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_view/index.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_view/index.tsx
@@ -38,18 +38,18 @@ export const FilterView: FC<Props> = ({
 
   let title =
     errorMessage ||
-    i18n.translate('data.filter.filterBar.moreFilterActionsMessage', {
+    i18n.translate('unifiedSearch.filter.filterBar.moreFilterActionsMessage', {
       defaultMessage: 'Filter: {innerText}. Select for more filter actions.',
       values: { innerText },
     });
 
   if (isFilterPinned(filter)) {
-    title = `${i18n.translate('data.filter.filterBar.pinnedFilterPrefix', {
+    title = `${i18n.translate('unifiedSearch.filter.filterBar.pinnedFilterPrefix', {
       defaultMessage: 'Pinned',
     })} ${title}`;
   }
   if (filter.meta.disabled) {
-    title = `${i18n.translate('data.filter.filterBar.disabledFilterPrefix', {
+    title = `${i18n.translate('unifiedSearch.filter.filterBar.disabledFilterPrefix', {
       defaultMessage: 'Disabled',
     })} ${title}`;
   }
@@ -59,9 +59,12 @@ export const FilterView: FC<Props> = ({
         title,
         color: 'hollow',
         onClick,
-        onClickAriaLabel: i18n.translate('data.filter.filterBar.filterItemReadOnlyBadgeAriaLabel', {
-          defaultMessage: 'Filter entry',
-        }),
+        onClickAriaLabel: i18n.translate(
+          'unifiedSearch.filter.filterBar.filterItemReadOnlyBadgeAriaLabel',
+          {
+            defaultMessage: 'Filter entry',
+          }
+        ),
         iconOnClick,
       }
     : {
@@ -75,14 +78,20 @@ export const FilterView: FC<Props> = ({
           tabIndex: -1,
         },
         iconOnClick,
-        iconOnClickAriaLabel: i18n.translate('data.filter.filterBar.filterItemBadgeIconAriaLabel', {
-          defaultMessage: 'Delete {filter}',
-          values: { filter: innerText },
-        }),
+        iconOnClickAriaLabel: i18n.translate(
+          'unifiedSearch.filter.filterBar.filterItemBadgeIconAriaLabel',
+          {
+            defaultMessage: 'Delete {filter}',
+            values: { filter: innerText },
+          }
+        ),
         onClick,
-        onClickAriaLabel: i18n.translate('data.filter.filterBar.filterItemBadgeAriaLabel', {
-          defaultMessage: 'Filter actions',
-        }),
+        onClickAriaLabel: i18n.translate(
+          'unifiedSearch.filter.filterBar.filterItemBadgeAriaLabel',
+          {
+            defaultMessage: 'Filter actions',
+          }
+        ),
       };
 
   return (
diff --git a/src/plugins/data/public/ui/filter_bar/index.tsx b/src/plugins/unified_search/public/filter_bar/index.tsx
similarity index 79%
rename from src/plugins/data/public/ui/filter_bar/index.tsx
rename to src/plugins/unified_search/public/filter_bar/index.tsx
index b3c02b2863c8..70a108f35979 100644
--- a/src/plugins/data/public/ui/filter_bar/index.tsx
+++ b/src/plugins/unified_search/public/filter_bar/index.tsx
@@ -10,6 +10,13 @@ import React from 'react';
 
 const Fallback = () => <div />;
 
+const LazyFilterBar = React.lazy(() => import('./filter_bar'));
+export const FilterBar = (props: React.ComponentProps<typeof LazyFilterBar>) => (
+  <React.Suspense fallback={<Fallback />}>
+    <LazyFilterBar {...props} />
+  </React.Suspense>
+);
+
 const LazyFilterLabel = React.lazy(() => import('./filter_editor/lib/filter_label'));
 export const FilterLabel = (props: React.ComponentProps<typeof LazyFilterLabel>) => (
   <React.Suspense fallback={<Fallback />}>
diff --git a/src/plugins/data/public/ui/_index.scss b/src/plugins/unified_search/public/index.scss
old mode 100644
new mode 100755
similarity index 72%
rename from src/plugins/data/public/ui/_index.scss
rename to src/plugins/unified_search/public/index.scss
index 1ca49963f3de..7f7704c64e9b
--- a/src/plugins/data/public/ui/_index.scss
+++ b/src/plugins/unified_search/public/index.scss
@@ -1,10 +1,7 @@
-
-@import './filter_bar/index';
-
 @import './typeahead/index';
 
 @import './saved_query_management/index';
 
 @import './query_string_input/index';
 
-@import './shard_failure_modal/shard_failure_modal';
\ No newline at end of file
+@import './filter_bar/index';
diff --git a/src/plugins/unified_search/public/index.ts b/src/plugins/unified_search/public/index.ts
new file mode 100755
index 000000000000..3eb528dc07ba
--- /dev/null
+++ b/src/plugins/unified_search/public/index.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { PluginInitializerContext } from '../../../core/public';
+import { ConfigSchema } from '../config';
+import { UnifiedSearchPublicPlugin } from './plugin';
+
+export type { IndexPatternSelectProps } from './index_pattern_select';
+export type { QueryStringInputProps } from './query_string_input';
+export { QueryStringInput } from './query_string_input';
+export type { StatefulSearchBarProps, SearchBarProps } from './search_bar';
+export type { UnifiedSearchPublicPluginStart } from './types';
+export { SearchBar } from './search_bar';
+export { FilterLabel, FilterItem } from './filter_bar';
+
+export type { ApplyGlobalFilterActionContext } from './actions';
+export { ACTION_GLOBAL_APPLY_FILTER } from './actions';
+
+// This exports static code and TypeScript types,
+// as well as, Kibana Platform `plugin()` initializer.
+export function plugin(initializerContext: PluginInitializerContext<ConfigSchema>) {
+  return new UnifiedSearchPublicPlugin(initializerContext);
+}
diff --git a/src/plugins/data/public/ui/index_pattern_select/create_index_pattern_select.tsx b/src/plugins/unified_search/public/index_pattern_select/create_index_pattern_select.tsx
similarity index 92%
rename from src/plugins/data/public/ui/index_pattern_select/create_index_pattern_select.tsx
rename to src/plugins/unified_search/public/index_pattern_select/create_index_pattern_select.tsx
index 16b36534c748..4a86ab32db9e 100644
--- a/src/plugins/data/public/ui/index_pattern_select/create_index_pattern_select.tsx
+++ b/src/plugins/unified_search/public/index_pattern_select/create_index_pattern_select.tsx
@@ -9,7 +9,7 @@
 import _ from 'lodash';
 import React from 'react';
 
-import { IndexPatternsContract } from 'src/plugins/data/public';
+import { IndexPatternsContract } from '../../../data/public';
 import { IndexPatternSelect, IndexPatternSelectProps } from './';
 
 // Takes in stateful runtime dependencies and pre-wires them to the component
diff --git a/src/plugins/data/public/ui/index_pattern_select/index.tsx b/src/plugins/unified_search/public/index_pattern_select/index.tsx
similarity index 100%
rename from src/plugins/data/public/ui/index_pattern_select/index.tsx
rename to src/plugins/unified_search/public/index_pattern_select/index.tsx
diff --git a/src/plugins/data/public/ui/index_pattern_select/index_pattern_select.tsx b/src/plugins/unified_search/public/index_pattern_select/index_pattern_select.tsx
similarity index 98%
rename from src/plugins/data/public/ui/index_pattern_select/index_pattern_select.tsx
rename to src/plugins/unified_search/public/index_pattern_select/index_pattern_select.tsx
index 2b45d8efc4d9..7555d00bac8b 100644
--- a/src/plugins/data/public/ui/index_pattern_select/index_pattern_select.tsx
+++ b/src/plugins/unified_search/public/index_pattern_select/index_pattern_select.tsx
@@ -11,8 +11,7 @@ import React, { Component } from 'react';
 
 import { Required } from '@kbn/utility-types';
 import { EuiComboBox, EuiComboBoxProps } from '@elastic/eui';
-
-import { IndexPatternsContract } from 'src/plugins/data/public';
+import { IndexPatternsContract } from '../../../data/public';
 
 export type IndexPatternSelectProps = Required<
   Omit<
diff --git a/src/plugins/unified_search/public/mocks.ts b/src/plugins/unified_search/public/mocks.ts
new file mode 100644
index 000000000000..eacbb72cc55a
--- /dev/null
+++ b/src/plugins/unified_search/public/mocks.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { UnifiedSearchPublicPlugin } from './plugin';
+
+export type Setup = jest.Mocked<ReturnType<UnifiedSearchPublicPlugin['setup']>>;
+export type Start = jest.Mocked<ReturnType<UnifiedSearchPublicPlugin['start']>>;
+
+const createStartContract = (): Start => {
+  return {
+    ui: {
+      IndexPatternSelect: jest.fn(),
+      SearchBar: jest.fn().mockReturnValue(null),
+    },
+  };
+};
+
+export const unifiedSearchPluginMock = {
+  createStartContract,
+};
diff --git a/src/plugins/unified_search/public/plugin.ts b/src/plugins/unified_search/public/plugin.ts
new file mode 100755
index 000000000000..9a7121ddc911
--- /dev/null
+++ b/src/plugins/unified_search/public/plugin.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import './index.scss';
+
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
+import { Storage, IStorageWrapper } from '../../kibana_utils/public';
+import { ConfigSchema } from '../config';
+import { setIndexPatterns, setTheme, setOverlays } from './services';
+import type { UsageCollectionSetup } from '../../usage_collection/public';
+import { createSearchBar } from './search_bar';
+import { createIndexPatternSelect } from './index_pattern_select';
+import { UnifiedSearchPluginSetup, UnifiedSearchPublicPluginStart } from './types';
+import type { UnifiedSearchStartDependencies, UnifiedSearchSetupDependencies } from './types';
+import { createFilterAction } from './actions/apply_filter_action';
+import { ACTION_GLOBAL_APPLY_FILTER } from './actions';
+import { APPLY_FILTER_TRIGGER } from '../../data/public';
+
+export class UnifiedSearchPublicPlugin
+  implements Plugin<UnifiedSearchPluginSetup, UnifiedSearchPublicPluginStart>
+{
+  private readonly storage: IStorageWrapper;
+  private usageCollection: UsageCollectionSetup | undefined;
+
+  constructor(initializerContext: PluginInitializerContext<ConfigSchema>) {
+    this.storage = new Storage(window.localStorage);
+  }
+
+  public setup(
+    core: CoreSetup,
+    { uiActions, data }: UnifiedSearchSetupDependencies
+  ): UnifiedSearchPluginSetup {
+    const { query } = data;
+    uiActions.registerAction(
+      createFilterAction(query.filterManager, query.timefilter.timefilter, core.theme)
+    );
+
+    return {};
+  }
+
+  public start(
+    core: CoreStart,
+    { data, dataViews, uiActions }: UnifiedSearchStartDependencies
+  ): UnifiedSearchPublicPluginStart {
+    setTheme(core.theme);
+    setOverlays(core.overlays);
+    setIndexPatterns(dataViews);
+
+    const SearchBar = createSearchBar({
+      core,
+      data,
+      storage: this.storage,
+      usageCollection: this.usageCollection,
+    });
+
+    uiActions.addTriggerAction(
+      APPLY_FILTER_TRIGGER,
+      uiActions.getAction(ACTION_GLOBAL_APPLY_FILTER)
+    );
+
+    return {
+      ui: {
+        IndexPatternSelect: createIndexPatternSelect(dataViews),
+        SearchBar,
+      },
+    };
+  }
+
+  public stop() {}
+}
diff --git a/src/plugins/data/public/ui/query_string_input/_index.scss b/src/plugins/unified_search/public/query_string_input/_index.scss
similarity index 100%
rename from src/plugins/data/public/ui/query_string_input/_index.scss
rename to src/plugins/unified_search/public/query_string_input/_index.scss
diff --git a/src/plugins/data/public/ui/query_string_input/_query_bar.scss b/src/plugins/unified_search/public/query_string_input/_query_bar.scss
similarity index 100%
rename from src/plugins/data/public/ui/query_string_input/_query_bar.scss
rename to src/plugins/unified_search/public/query_string_input/_query_bar.scss
diff --git a/src/plugins/data/public/ui/query_string_input/fetch_index_patterns.ts b/src/plugins/unified_search/public/query_string_input/fetch_index_patterns.ts
similarity index 94%
rename from src/plugins/data/public/ui/query_string_input/fetch_index_patterns.ts
rename to src/plugins/unified_search/public/query_string_input/fetch_index_patterns.ts
index 5eca12cd5502..4d37e5375337 100644
--- a/src/plugins/data/public/ui/query_string_input/fetch_index_patterns.ts
+++ b/src/plugins/unified_search/public/query_string_input/fetch_index_patterns.ts
@@ -7,7 +7,7 @@
  */
 
 import { isEmpty } from 'lodash';
-import { IndexPatternsContract } from '../..';
+import { IndexPatternsContract } from '../../../data/public';
 
 export async function fetchIndexPatterns(
   indexPatternsService: IndexPatternsContract,
diff --git a/src/plugins/data/public/query/lib/from_user.test.ts b/src/plugins/unified_search/public/query_string_input/from_user.test.ts
similarity index 96%
rename from src/plugins/data/public/query/lib/from_user.test.ts
rename to src/plugins/unified_search/public/query_string_input/from_user.test.ts
index 38a0c9efbb59..35f6e576181a 100644
--- a/src/plugins/data/public/query/lib/from_user.test.ts
+++ b/src/plugins/unified_search/public/query_string_input/from_user.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { fromUser } from '../';
+import { fromUser } from './from_user';
 
 describe('user input helpers', function () {
   describe('user input parser', function () {
diff --git a/src/plugins/data/public/query/lib/from_user.ts b/src/plugins/unified_search/public/query_string_input/from_user.ts
similarity index 100%
rename from src/plugins/data/public/query/lib/from_user.ts
rename to src/plugins/unified_search/public/query_string_input/from_user.ts
diff --git a/src/plugins/data/public/ui/query_string_input/index.tsx b/src/plugins/unified_search/public/query_string_input/index.tsx
similarity index 94%
rename from src/plugins/data/public/ui/query_string_input/index.tsx
rename to src/plugins/unified_search/public/query_string_input/index.tsx
index 655640d2cd87..d0f22a2f41c5 100644
--- a/src/plugins/data/public/ui/query_string_input/index.tsx
+++ b/src/plugins/unified_search/public/query_string_input/index.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { withKibana } from '../../../../kibana_react/public';
+import { withKibana } from '../../../kibana_react/public';
 import type { QueryBarTopRowProps } from './query_bar_top_row';
 import type { QueryStringInputProps } from './query_string_input';
 
@@ -21,6 +21,7 @@ export const QueryBarTopRow = (props: QueryBarTopRowProps) => (
 );
 
 const LazyQueryStringInputUI = withKibana(React.lazy(() => import('./query_string_input')));
+
 export const QueryStringInput = (props: QueryStringInputProps) => (
   <React.Suspense fallback={<Fallback />}>
     <LazyQueryStringInputUI {...props} />
diff --git a/src/plugins/data/public/ui/query_string_input/language_switcher.test.tsx b/src/plugins/unified_search/public/query_string_input/language_switcher.test.tsx
similarity index 97%
rename from src/plugins/data/public/ui/query_string_input/language_switcher.test.tsx
rename to src/plugins/unified_search/public/query_string_input/language_switcher.test.tsx
index 67d36f465568..8106c9daf281 100644
--- a/src/plugins/data/public/ui/query_string_input/language_switcher.test.tsx
+++ b/src/plugins/unified_search/public/query_string_input/language_switcher.test.tsx
@@ -8,8 +8,8 @@
 
 import React from 'react';
 import { QueryLanguageSwitcher, QueryLanguageSwitcherProps } from './language_switcher';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
-import { coreMock } from '../../../../../core/public/mocks';
+import { KibanaContextProvider } from '../../../kibana_react/public';
+import { coreMock } from '../../../../core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { EuiButtonEmpty, EuiIcon, EuiPopover } from '@elastic/eui';
 const startMock = coreMock.createStart();
diff --git a/src/plugins/data/public/ui/query_string_input/language_switcher.tsx b/src/plugins/unified_search/public/query_string_input/language_switcher.tsx
similarity index 80%
rename from src/plugins/data/public/ui/query_string_input/language_switcher.tsx
rename to src/plugins/unified_search/public/query_string_input/language_switcher.tsx
index 3d66edd6a022..0454d3066cd1 100644
--- a/src/plugins/data/public/ui/query_string_input/language_switcher.tsx
+++ b/src/plugins/unified_search/public/query_string_input/language_switcher.tsx
@@ -22,7 +22,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
-import { useKibana } from '../../../../kibana_react/public';
+import { useKibana } from '../../../kibana_react/public';
 
 export interface QueryLanguageSwitcherProps {
   language: string;
@@ -43,20 +43,23 @@ export const QueryLanguageSwitcher = React.memo(function QueryLanguageSwitcher({
   const kueryQuerySyntaxDocs = kibana.services.docLinks!.links.query.kueryQuerySyntax;
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
   const luceneLabel = (
-    <FormattedMessage id="data.query.queryBar.luceneLanguageName" defaultMessage="Lucene" />
+    <FormattedMessage
+      id="unifiedSearch.query.queryBar.luceneLanguageName"
+      defaultMessage="Lucene"
+    />
   );
   const kqlLabel = (
-    <FormattedMessage id="data.query.queryBar.kqlLanguageName" defaultMessage="KQL" />
+    <FormattedMessage id="unifiedSearch.query.queryBar.kqlLanguageName" defaultMessage="KQL" />
   );
 
   const kqlFullName = (
     <FormattedMessage
-      id="data.query.queryBar.kqlFullLanguageName"
+      id="unifiedSearch.query.queryBar.kqlFullLanguageName"
       defaultMessage="Kibana Query Language"
     />
   );
 
-  const kqlModeTitle = i18n.translate('data.query.queryBar.languageSwitcher.toText', {
+  const kqlModeTitle = i18n.translate('unifiedSearch.query.queryBar.languageSwitcher.toText', {
     defaultMessage: 'Switch to Kibana Query Language for search',
   });
 
@@ -91,7 +94,7 @@ export const QueryLanguageSwitcher = React.memo(function QueryLanguageSwitcher({
     >
       <EuiPopoverTitle>
         <FormattedMessage
-          id="data.query.queryBar.syntaxOptionsTitle"
+          id="unifiedSearch.query.queryBar.syntaxOptionsTitle"
           defaultMessage="Syntax options"
         />
       </EuiPopoverTitle>
@@ -99,7 +102,7 @@ export const QueryLanguageSwitcher = React.memo(function QueryLanguageSwitcher({
         <EuiText size="s">
           <p>
             <FormattedMessage
-              id="data.query.queryBar.syntaxOptionsDescription"
+              id="unifiedSearch.query.queryBar.syntaxOptionsDescription"
               defaultMessage="The {docsLink} (KQL) offers a simplified query
               syntax and support for scripted fields. KQL also provides autocomplete.
               If you turn off KQL, {nonKqlModeHelpText}"
@@ -112,7 +115,7 @@ export const QueryLanguageSwitcher = React.memo(function QueryLanguageSwitcher({
                 nonKqlModeHelpText:
                   nonKqlModeHelpText ||
                   i18n.translate(
-                    'data.query.queryBar.syntaxOptionsDescription.nonKqlModeHelpText',
+                    'unifiedSearch.query.queryBar.syntaxOptionsDescription.nonKqlModeHelpText',
                     {
                       defaultMessage: 'Kibana uses Lucene.',
                     }
@@ -131,9 +134,15 @@ export const QueryLanguageSwitcher = React.memo(function QueryLanguageSwitcher({
               name="popswitch"
               label={
                 language === 'kuery' ? (
-                  <FormattedMessage id="data.query.queryBar.kqlOnLabel" defaultMessage="On" />
+                  <FormattedMessage
+                    id="unifiedSearch.query.queryBar.kqlOnLabel"
+                    defaultMessage="On"
+                  />
                 ) : (
-                  <FormattedMessage id="data.query.queryBar.kqlOffLabel" defaultMessage="Off" />
+                  <FormattedMessage
+                    id="unifiedSearch.query.queryBar.kqlOffLabel"
+                    defaultMessage="Off"
+                  />
                 )
               }
               checked={language === 'kuery'}
diff --git a/src/plugins/data/public/query/lib/match_pairs.ts b/src/plugins/unified_search/public/query_string_input/match_pairs.ts
similarity index 100%
rename from src/plugins/data/public/query/lib/match_pairs.ts
rename to src/plugins/unified_search/public/query_string_input/match_pairs.ts
diff --git a/src/plugins/data/public/ui/query_string_input/no_data_popover.test.tsx b/src/plugins/unified_search/public/query_string_input/no_data_popover.test.tsx
similarity index 100%
rename from src/plugins/data/public/ui/query_string_input/no_data_popover.test.tsx
rename to src/plugins/unified_search/public/query_string_input/no_data_popover.test.tsx
diff --git a/src/plugins/data/public/ui/query_string_input/no_data_popover.tsx b/src/plugins/unified_search/public/query_string_input/no_data_popover.tsx
similarity index 84%
rename from src/plugins/data/public/ui/query_string_input/no_data_popover.tsx
rename to src/plugins/unified_search/public/query_string_input/no_data_popover.tsx
index 672d992dc7d7..e417f274fa55 100644
--- a/src/plugins/data/public/ui/query_string_input/no_data_popover.tsx
+++ b/src/plugins/unified_search/public/query_string_input/no_data_popover.tsx
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { ReactElement, useEffect, useState } from 'react';
 import React from 'react';
-import { EuiButtonEmpty, EuiText, EuiTourStep } from '@elastic/eui';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { ReactElement, useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
+import { EuiButtonEmpty, EuiText, EuiTourStep } from '@elastic/eui';
+import { IStorageWrapper } from '../../../kibana_utils/public';
 
 const NO_DATA_POPOVER_STORAGE_KEY = 'data.noDataPopover';
 
@@ -43,7 +43,7 @@ export function NoDataPopover({
       content={
         <EuiText size="s">
           <p style={{ maxWidth: 300 }}>
-            {i18n.translate('data.noDataPopover.content', {
+            {i18n.translate('unifiedSearch.noDataPopover.content', {
               defaultMessage:
                 "This time range doesn't contain any data. Increase or adjust the time range to see more fields and create charts.",
             })}
@@ -56,8 +56,10 @@ export function NoDataPopover({
       step={1}
       stepsTotal={1}
       isStepOpen={noDataPopoverVisible}
-      subtitle={i18n.translate('data.noDataPopover.subtitle', { defaultMessage: 'Tip' })}
-      title={i18n.translate('data.noDataPopover.title', { defaultMessage: 'Empty dataset' })}
+      subtitle={i18n.translate('unifiedSearch.noDataPopover.subtitle', { defaultMessage: 'Tip' })}
+      title={i18n.translate('unifiedSearch.noDataPopover.title', {
+        defaultMessage: 'Empty dataset',
+      })}
       footerAction={
         <EuiButtonEmpty
           size="xs"
@@ -70,7 +72,7 @@ export function NoDataPopover({
             setNoDataPopoverVisible(false);
           }}
         >
-          {i18n.translate('data.noDataPopover.dismissAction', {
+          {i18n.translate('unifiedSearch.noDataPopover.dismissAction', {
             defaultMessage: "Don't show again",
           })}
         </EuiButtonEmpty>
diff --git a/src/plugins/data/public/ui/query_string_input/query_bar_top_row.test.tsx b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
similarity index 95%
rename from src/plugins/data/public/ui/query_string_input/query_bar_top_row.test.tsx
rename to src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
index 9f99049d3e78..e8ca82782d11 100644
--- a/src/plugins/data/public/ui/query_string_input/query_bar_top_row.test.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
@@ -14,12 +14,12 @@ import { render } from '@testing-library/react';
 import { EMPTY } from 'rxjs';
 
 import QueryBarTopRow from './query_bar_top_row';
-import { coreMock } from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../mocks';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
+import { coreMock } from '../../../../core/public/mocks';
+import { dataPluginMock } from '../../../data/public/mocks';
+import { KibanaContextProvider } from '../../../kibana_react/public';
 import { I18nProvider } from '@kbn/i18n-react';
-import { stubIndexPattern } from '../../stubs';
-import { UI_SETTINGS } from '../../../common';
+import { stubIndexPattern } from '../../../data/public/stubs';
+import { UI_SETTINGS } from '../../../data/common';
 const startMock = coreMock.createStart();
 
 const mockTimeHistory = {
diff --git a/src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
similarity index 96%
rename from src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx
rename to src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
index 424347834c3d..ddba035b91fd 100644
--- a/src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
@@ -13,7 +13,6 @@ import deepEqual from 'fast-deep-equal';
 import useObservable from 'react-use/lib/useObservable';
 import { EMPTY } from 'rxjs';
 import { map } from 'rxjs/operators';
-
 import {
   EuiFlexGroup,
   EuiFlexItem,
@@ -24,14 +23,20 @@ import {
   EuiSuperUpdateButton,
   OnRefreshProps,
 } from '@elastic/eui';
-import { IDataPluginServices, IIndexPattern, TimeRange, TimeHistoryContract, Query } from '../..';
-import { useKibana, withKibana } from '../../../../kibana_react/public';
+import {
+  IDataPluginServices,
+  IIndexPattern,
+  TimeRange,
+  TimeHistoryContract,
+  Query,
+  getQueryLog,
+} from '../../../data/public';
+import type { PersistedLog } from '../../../data/public';
+import { useKibana, withKibana } from '../../../kibana_react/public';
 import QueryStringInputUI from './query_string_input';
-import { UI_SETTINGS } from '../../../common';
-import { getQueryLog } from '../../query';
-import type { PersistedLog } from '../../query';
+import { UI_SETTINGS } from '../../../data/common';
 import { NoDataPopover } from './no_data_popover';
-import { shallowEqual } from '../../utils/shallow_equal';
+import { shallowEqual } from '../utils';
 
 const SuperDatePicker = React.memo(
   EuiSuperDatePicker as any
diff --git a/src/plugins/data/public/ui/query_string_input/query_string_input.test.mocks.ts b/src/plugins/unified_search/public/query_string_input/query_string_input.test.mocks.ts
similarity index 89%
rename from src/plugins/data/public/ui/query_string_input/query_string_input.test.mocks.ts
rename to src/plugins/unified_search/public/query_string_input/query_string_input.test.mocks.ts
index 9e9498fa465c..f8c80473d4f0 100644
--- a/src/plugins/data/public/ui/query_string_input/query_string_input.test.mocks.ts
+++ b/src/plugins/unified_search/public/query_string_input/query_string_input.test.mocks.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { stubIndexPattern } from '../../stubs';
+import { stubIndexPattern } from '../../../data/public/stubs';
 
 export const mockPersistedLog = {
   add: jest.fn(),
@@ -21,7 +21,7 @@ export const mockFetchIndexPatterns = jest
   .fn()
   .mockReturnValue(Promise.resolve([stubIndexPattern]));
 
-jest.mock('../../query/persisted_log', () => ({
+jest.mock('../../../data/public/query/persisted_log', () => ({
   PersistedLog: mockPersistedLogFactory,
 }));
 
diff --git a/src/plugins/data/public/ui/query_string_input/query_string_input.test.tsx b/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx
similarity index 97%
rename from src/plugins/data/public/ui/query_string_input/query_string_input.test.tsx
rename to src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx
index 764ad45c78d3..4a48b3cc4242 100644
--- a/src/plugins/data/public/ui/query_string_input/query_string_input.test.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx
@@ -23,10 +23,10 @@ import { EuiTextArea, EuiIcon } from '@elastic/eui';
 import { QueryLanguageSwitcher } from './language_switcher';
 import QueryStringInputUI from './query_string_input';
 
-import { coreMock } from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../mocks';
-import { stubIndexPattern } from '../../stubs';
-import { KibanaContextProvider, withKibana } from 'src/plugins/kibana_react/public';
+import { coreMock } from '../../../../core/public/mocks';
+import { dataPluginMock } from '../../../data/public/mocks';
+import { stubIndexPattern } from '../../../data/public/stubs';
+import { KibanaContextProvider, withKibana } from '../../../kibana_react/public';
 
 jest.useFakeTimers();
 
diff --git a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx b/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
similarity index 95%
rename from src/plugins/data/public/ui/query_string_input/query_string_input.tsx
rename to src/plugins/unified_search/public/query_string_input/query_string_input.tsx
index 6464f02dd7cb..1a075812ac20 100644
--- a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
@@ -10,6 +10,7 @@ import React, { PureComponent } from 'react';
 import { i18n } from '@kbn/i18n';
 
 import classNames from 'classnames';
+import { METRIC_TYPE } from '@kbn/analytics';
 
 import {
   EuiButton,
@@ -26,21 +27,27 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { compact, debounce, isEqual, isFunction } from 'lodash';
-import { Toast } from 'src/core/public';
-import { METRIC_TYPE } from '@kbn/analytics';
-
-import { IDataPluginServices, IIndexPattern, Query } from '../..';
-import { QuerySuggestion, QuerySuggestionTypes } from '../../autocomplete';
-import { KibanaReactContextValue, toMountPoint } from '../../../../kibana_react/public';
+import { Toast } from '../../../../core/public';
+import {
+  IDataPluginServices,
+  IIndexPattern,
+  Query,
+  QuerySuggestion,
+  QuerySuggestionTypes,
+  getQueryLog,
+} from '../../../data/public';
+import { matchPairs } from './match_pairs';
+import { toUser } from './to_user';
+import { fromUser } from './from_user';
+import type { PersistedLog } from '../../../data/public';
+import { getFieldSubtypeNested, KIBANA_USER_QUERY_LANGUAGE_KEY } from '../../../data/common';
+import { KibanaReactContextValue, toMountPoint } from '../../../kibana_react/public';
 import { fetchIndexPatterns } from './fetch_index_patterns';
 import { QueryLanguageSwitcher } from './language_switcher';
-import { getQueryLog, matchPairs, toUser, fromUser } from '../../query';
-import type { PersistedLog } from '../../query';
 import type { SuggestionsListSize } from '../typeahead/suggestions_component';
-import { SuggestionsComponent } from '..';
-import { getFieldSubtypeNested, KIBANA_USER_QUERY_LANGUAGE_KEY } from '../../../common';
+import { SuggestionsComponent } from '../typeahead';
 import { onRaf } from '../utils';
-import { getTheme } from '../../services';
+import { getTheme } from '../services';
 
 export interface QueryStringInputProps {
   indexPatterns: Array<IIndexPattern | string>;
@@ -455,14 +462,14 @@ export default class QueryStringInputUI extends PureComponent<Props, State> {
 
       if (notifications && docLinks) {
         const toast = notifications.toasts.add({
-          title: i18n.translate('data.query.queryBar.KQLNestedQuerySyntaxInfoTitle', {
+          title: i18n.translate('unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoTitle', {
             defaultMessage: 'KQL nested query syntax',
           }),
           text: toMountPoint(
             <div>
               <p>
                 <FormattedMessage
-                  id="data.query.queryBar.KQLNestedQuerySyntaxInfoText"
+                  id="unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoText"
                   defaultMessage="It looks like you're querying on a nested field.
                   You can construct KQL syntax for nested queries in different ways, depending on the results you want.
                   Learn more in our {link}."
@@ -470,7 +477,7 @@ export default class QueryStringInputUI extends PureComponent<Props, State> {
                     link: (
                       <EuiLink href={docLinks.links.query.kueryQuerySyntax} target="_blank">
                         <FormattedMessage
-                          id="data.query.queryBar.KQLNestedQuerySyntaxInfoDocLinkText"
+                          id="unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoDocLinkText"
                           defaultMessage="docs"
                         />
                       </EuiLink>
@@ -482,7 +489,7 @@ export default class QueryStringInputUI extends PureComponent<Props, State> {
                 <EuiFlexItem grow={false}>
                   <EuiButton size="s" onClick={() => onKQLNestedQuerySyntaxInfoOptOut(toast)}>
                     <FormattedMessage
-                      id="data.query.queryBar.KQLNestedQuerySyntaxInfoOptOutText"
+                      id="unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoOptOutText"
                       defaultMessage="Don't show again"
                     />
                   </EuiButton>
@@ -705,7 +712,7 @@ export default class QueryStringInputUI extends PureComponent<Props, State> {
           <div
             {...ariaCombobox}
             style={{ position: 'relative', width: '100%' }}
-            aria-label={i18n.translate('data.query.queryBar.comboboxAriaLabel', {
+            aria-label={i18n.translate('unifiedSearch.query.queryBar.comboboxAriaLabel', {
               defaultMessage: 'Search and filter the {pageType} page',
               values: { pageType: this.services.appName },
             })}
@@ -717,7 +724,7 @@ export default class QueryStringInputUI extends PureComponent<Props, State> {
               <EuiTextArea
                 placeholder={
                   this.props.placeholder ||
-                  i18n.translate('data.query.queryBar.searchInputPlaceholder', {
+                  i18n.translate('unifiedSearch.query.queryBar.searchInputPlaceholder', {
                     defaultMessage: 'Search',
                   })
                 }
@@ -738,7 +745,7 @@ export default class QueryStringInputUI extends PureComponent<Props, State> {
                 inputRef={this.assignInputRef}
                 autoComplete="off"
                 spellCheck={false}
-                aria-label={i18n.translate('data.query.queryBar.searchInputAriaLabel', {
+                aria-label={i18n.translate('unifiedSearch.query.queryBar.searchInputAriaLabel', {
                   defaultMessage: 'Start typing to search and filter the {pageType} page',
                   values: { pageType: this.services.appName },
                 })}
@@ -769,7 +776,7 @@ export default class QueryStringInputUI extends PureComponent<Props, State> {
                   <button
                     type="button"
                     className="euiFormControlLayoutClearButton"
-                    title={i18n.translate('data.query.queryBar.clearInputLabel', {
+                    title={i18n.translate('unifiedSearch.query.queryBar.clearInputLabel', {
                       defaultMessage: 'Clear input',
                     })}
                     onClick={() => {
diff --git a/src/plugins/data/public/query/lib/to_user.test.ts b/src/plugins/unified_search/public/query_string_input/to_user.test.ts
similarity index 96%
rename from src/plugins/data/public/query/lib/to_user.test.ts
rename to src/plugins/unified_search/public/query_string_input/to_user.test.ts
index be04a9cca7d4..5190d6ff188c 100644
--- a/src/plugins/data/public/query/lib/to_user.test.ts
+++ b/src/plugins/unified_search/public/query_string_input/to_user.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { toUser } from '../';
+import { toUser } from './to_user';
 
 describe('user input helpers', () => {
   describe('model presentation formatter', () => {
diff --git a/src/plugins/data/public/query/lib/to_user.ts b/src/plugins/unified_search/public/query_string_input/to_user.ts
similarity index 100%
rename from src/plugins/data/public/query/lib/to_user.ts
rename to src/plugins/unified_search/public/query_string_input/to_user.ts
diff --git a/src/plugins/data/public/ui/saved_query_form/index.ts b/src/plugins/unified_search/public/saved_query_form/index.ts
similarity index 100%
rename from src/plugins/data/public/ui/saved_query_form/index.ts
rename to src/plugins/unified_search/public/saved_query_form/index.ts
diff --git a/src/plugins/data/public/ui/saved_query_form/save_query_form.tsx b/src/plugins/unified_search/public/saved_query_form/save_query_form.tsx
similarity index 84%
rename from src/plugins/data/public/ui/saved_query_form/save_query_form.tsx
rename to src/plugins/unified_search/public/saved_query_form/save_query_form.tsx
index c7a79658fac8..5aee148bb58b 100644
--- a/src/plugins/data/public/ui/saved_query_form/save_query_form.tsx
+++ b/src/plugins/unified_search/public/saved_query_form/save_query_form.tsx
@@ -23,7 +23,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { sortBy, isEqual } from 'lodash';
-import { SavedQuery, SavedQueryService } from '../..';
+import { SavedQuery, SavedQueryService } from '../../../data/public';
 
 interface Props {
   savedQuery?: SavedQuery;
@@ -66,14 +66,14 @@ export function SaveQueryForm({
   const [formErrors, setFormErrors] = useState<string[]>([]);
 
   const titleConflictErrorText = i18n.translate(
-    'data.search.searchBar.savedQueryForm.titleConflictText',
+    'unifiedSearch.search.searchBar.savedQueryForm.titleConflictText',
     {
       defaultMessage: 'Name conflicts with an existing saved query',
     }
   );
 
   const savedQueryDescriptionText = i18n.translate(
-    'data.search.searchBar.savedQueryDescriptionText',
+    'unifiedSearch.search.searchBar.savedQueryDescriptionText',
     {
       defaultMessage: 'Save query text and filters that you want to use again.',
     }
@@ -147,10 +147,10 @@ export function SaveQueryForm({
         <EuiText color="subdued">{savedQueryDescriptionText}</EuiText>
       </EuiFormRow>
       <EuiFormRow
-        label={i18n.translate('data.search.searchBar.savedQueryNameLabelText', {
+        label={i18n.translate('unifiedSearch.search.searchBar.savedQueryNameLabelText', {
           defaultMessage: 'Name',
         })}
-        helpText={i18n.translate('data.search.searchBar.savedQueryNameHelpText', {
+        helpText={i18n.translate('unifiedSearch.search.searchBar.savedQueryNameHelpText', {
           defaultMessage:
             'Name is required, it cannot contain leading or trailing whitespace and must be unique.',
         })}
@@ -168,7 +168,7 @@ export function SaveQueryForm({
       </EuiFormRow>
 
       <EuiFormRow
-        label={i18n.translate('data.search.searchBar.savedQueryDescriptionLabelText', {
+        label={i18n.translate('unifiedSearch.search.searchBar.savedQueryDescriptionLabelText', {
           defaultMessage: 'Description',
         })}
       >
@@ -185,9 +185,12 @@ export function SaveQueryForm({
         <EuiFormRow>
           <EuiSwitch
             name="shouldIncludeFilters"
-            label={i18n.translate('data.search.searchBar.savedQueryIncludeFiltersLabelText', {
-              defaultMessage: 'Include filters',
-            })}
+            label={i18n.translate(
+              'unifiedSearch.search.searchBar.savedQueryIncludeFiltersLabelText',
+              {
+                defaultMessage: 'Include filters',
+              }
+            )}
             checked={shouldIncludeFilters}
             onChange={() => {
               setShouldIncludeFilters(!shouldIncludeFilters);
@@ -201,9 +204,12 @@ export function SaveQueryForm({
         <EuiFormRow>
           <EuiSwitch
             name="shouldIncludeTimefilter"
-            label={i18n.translate('data.search.searchBar.savedQueryIncludeTimeFilterLabelText', {
-              defaultMessage: 'Include time filter',
-            })}
+            label={i18n.translate(
+              'unifiedSearch.search.searchBar.savedQueryIncludeTimeFilterLabelText',
+              {
+                defaultMessage: 'Include time filter',
+              }
+            )}
             checked={shouldIncludeTimefilter}
             onChange={() => {
               setIncludeTimefilter(!shouldIncludeTimefilter);
@@ -219,7 +225,7 @@ export function SaveQueryForm({
     <EuiModal onClose={onClose} initialFocus="[name=title]">
       <EuiModalHeader>
         <EuiModalHeaderTitle>
-          {i18n.translate('data.search.searchBar.savedQueryFormTitle', {
+          {i18n.translate('unifiedSearch.search.searchBar.savedQueryFormTitle', {
             defaultMessage: 'Save query',
           })}
         </EuiModalHeaderTitle>
@@ -229,7 +235,7 @@ export function SaveQueryForm({
 
       <EuiModalFooter>
         <EuiButtonEmpty onClick={onClose} data-test-subj="savedQueryFormCancelButton">
-          {i18n.translate('data.search.searchBar.savedQueryFormCancelButtonText', {
+          {i18n.translate('unifiedSearch.search.searchBar.savedQueryFormCancelButtonText', {
             defaultMessage: 'Cancel',
           })}
         </EuiButtonEmpty>
@@ -240,7 +246,7 @@ export function SaveQueryForm({
           data-test-subj="savedQueryFormSaveButton"
           disabled={hasErrors || !enabledSaveButton}
         >
-          {i18n.translate('data.search.searchBar.savedQueryFormSaveButtonText', {
+          {i18n.translate('unifiedSearch.search.searchBar.savedQueryFormSaveButtonText', {
             defaultMessage: 'Save',
           })}
         </EuiButton>
diff --git a/src/plugins/data/public/ui/saved_query_management/_index.scss b/src/plugins/unified_search/public/saved_query_management/_index.scss
similarity index 100%
rename from src/plugins/data/public/ui/saved_query_management/_index.scss
rename to src/plugins/unified_search/public/saved_query_management/_index.scss
diff --git a/src/plugins/data/public/ui/saved_query_management/_saved_query_list_item.scss b/src/plugins/unified_search/public/saved_query_management/_saved_query_list_item.scss
similarity index 100%
rename from src/plugins/data/public/ui/saved_query_management/_saved_query_list_item.scss
rename to src/plugins/unified_search/public/saved_query_management/_saved_query_list_item.scss
diff --git a/src/plugins/data/public/ui/saved_query_management/_saved_query_management_component.scss b/src/plugins/unified_search/public/saved_query_management/_saved_query_management_component.scss
similarity index 100%
rename from src/plugins/data/public/ui/saved_query_management/_saved_query_management_component.scss
rename to src/plugins/unified_search/public/saved_query_management/_saved_query_management_component.scss
diff --git a/src/plugins/data/public/ui/saved_query_management/index.ts b/src/plugins/unified_search/public/saved_query_management/index.ts
similarity index 100%
rename from src/plugins/data/public/ui/saved_query_management/index.ts
rename to src/plugins/unified_search/public/saved_query_management/index.ts
diff --git a/src/plugins/data/public/ui/saved_query_management/saved_query_list_item.tsx b/src/plugins/unified_search/public/saved_query_management/saved_query_list_item.tsx
similarity index 77%
rename from src/plugins/data/public/ui/saved_query_management/saved_query_list_item.tsx
rename to src/plugins/unified_search/public/saved_query_management/saved_query_list_item.tsx
index b7ba3215eb5a..a99c49515aee 100644
--- a/src/plugins/data/public/ui/saved_query_management/saved_query_list_item.tsx
+++ b/src/plugins/unified_search/public/saved_query_management/saved_query_list_item.tsx
@@ -11,7 +11,7 @@ import { EuiListGroupItem, EuiConfirmModal, EuiIconTip } from '@elastic/eui';
 import React, { Fragment, useState } from 'react';
 import classNames from 'classnames';
 import { i18n } from '@kbn/i18n';
-import { SavedQuery } from '../..';
+import { SavedQuery } from '../../../data/public';
 
 interface Props {
   savedQuery: SavedQuery;
@@ -32,17 +32,20 @@ export const SavedQueryListItem = ({
 
   const selectButtonAriaLabelText = isSelected
     ? i18n.translate(
-        'data.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel',
+        'unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel',
         {
           defaultMessage:
             'Saved query button selected {savedQueryName}. Press to clear any changes.',
           values: { savedQueryName: savedQuery.attributes.title },
         }
       )
-    : i18n.translate('data.search.searchBar.savedQueryPopoverSavedQueryListItemButtonAriaLabel', {
-        defaultMessage: 'Saved query button {savedQueryName}',
-        values: { savedQueryName: savedQuery.attributes.title },
-      });
+    : i18n.translate(
+        'unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemButtonAriaLabel',
+        {
+          defaultMessage: 'Saved query button {savedQueryName}',
+          values: { savedQueryName: savedQuery.attributes.title },
+        }
+      );
 
   const selectButtonDataTestSubj = isSelected
     ? `load-saved-query-${savedQuery.attributes.title}-button saved-query-list-item-selected`
@@ -60,7 +63,7 @@ export const SavedQueryListItem = ({
           type="iInCircle"
           content={savedQuery.attributes.description}
           aria-label={i18n.translate(
-            'data.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel',
+            'unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel',
             {
               defaultMessage: '{savedQueryName} description',
               values: { savedQueryName: savedQuery.attributes.title },
@@ -94,14 +97,14 @@ export const SavedQueryListItem = ({
                 iconType: 'trash',
                 iconSize: 's',
                 'aria-label': i18n.translate(
-                  'data.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel',
+                  'unifiedSearch.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel',
                   {
                     defaultMessage: 'Delete saved query {savedQueryName}',
                     values: { savedQueryName: savedQuery.attributes.title },
                   }
                 ),
                 title: i18n.translate(
-                  'data.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel',
+                  'unifiedSearch.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel',
                   {
                     defaultMessage: 'Delete saved query {savedQueryName}',
                     values: { savedQueryName: savedQuery.attributes.title },
@@ -115,20 +118,23 @@ export const SavedQueryListItem = ({
 
       {showDeletionConfirmationModal && (
         <EuiConfirmModal
-          title={i18n.translate('data.search.searchBar.savedQueryPopoverConfirmDeletionTitle', {
-            defaultMessage: 'Delete "{savedQueryName}"?',
-            values: {
-              savedQueryName: savedQuery.attributes.title,
-            },
-          })}
+          title={i18n.translate(
+            'unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionTitle',
+            {
+              defaultMessage: 'Delete "{savedQueryName}"?',
+              values: {
+                savedQueryName: savedQuery.attributes.title,
+              },
+            }
+          )}
           confirmButtonText={i18n.translate(
-            'data.search.searchBar.savedQueryPopoverConfirmDeletionConfirmButtonText',
+            'unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionConfirmButtonText',
             {
               defaultMessage: 'Delete',
             }
           )}
           cancelButtonText={i18n.translate(
-            'data.search.searchBar.savedQueryPopoverConfirmDeletionCancelButtonText',
+            'unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionCancelButtonText',
             {
               defaultMessage: 'Cancel',
             }
diff --git a/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx b/src/plugins/unified_search/public/saved_query_management/saved_query_management_component.tsx
similarity index 86%
rename from src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx
rename to src/plugins/unified_search/public/saved_query_management/saved_query_management_component.tsx
index 95bfdb0680d9..29d7bda08cbc 100644
--- a/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx
+++ b/src/plugins/unified_search/public/saved_query_management/saved_query_management_component.tsx
@@ -24,7 +24,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import React, { useCallback, useEffect, useState, Fragment, useRef } from 'react';
 import { sortBy } from 'lodash';
-import { SavedQuery, SavedQueryService } from '../..';
+import { SavedQuery, SavedQueryService } from '../../../data/public';
 import { SavedQueryListItem } from './saved_query_list_item';
 
 const perPage = 50;
@@ -123,21 +123,21 @@ export function SavedQueryManagementComponent({
   );
 
   const savedQueryDescriptionText = i18n.translate(
-    'data.search.searchBar.savedQueryDescriptionText',
+    'unifiedSearch.search.searchBar.savedQueryDescriptionText',
     {
       defaultMessage: 'Save query text and filters that you want to use again.',
     }
   );
 
   const noSavedQueriesDescriptionText =
-    i18n.translate('data.search.searchBar.savedQueryNoSavedQueriesText', {
+    i18n.translate('unifiedSearch.search.searchBar.savedQueryNoSavedQueriesText', {
       defaultMessage: 'There are no saved queries.',
     }) +
     ' ' +
     savedQueryDescriptionText;
 
   const savedQueryPopoverTitleText = i18n.translate(
-    'data.search.searchBar.savedQueryPopoverTitleText',
+    'unifiedSearch.search.searchBar.savedQueryPopoverTitleText',
     {
       defaultMessage: 'Saved Queries',
     }
@@ -150,10 +150,10 @@ export function SavedQueryManagementComponent({
   const savedQueryPopoverButton = (
     <EuiButtonEmpty
       onClick={handleTogglePopover}
-      aria-label={i18n.translate('data.search.searchBar.savedQueryPopoverButtonText', {
+      aria-label={i18n.translate('unifiedSearch.search.searchBar.savedQueryPopoverButtonText', {
         defaultMessage: 'See saved queries',
       })}
-      title={i18n.translate('data.search.searchBar.savedQueryPopoverButtonText', {
+      title={i18n.translate('unifiedSearch.search.searchBar.savedQueryPopoverButtonText', {
         defaultMessage: 'See saved queries',
       })}
       data-test-subj="saved-query-management-popover-button"
@@ -250,7 +250,7 @@ export function SavedQueryManagementComponent({
                       fill
                       onClick={handleSave}
                       aria-label={i18n.translate(
-                        'data.search.searchBar.savedQueryPopoverSaveChangesButtonAriaLabel',
+                        'unifiedSearch.search.searchBar.savedQueryPopoverSaveChangesButtonAriaLabel',
                         {
                           defaultMessage: 'Save changes to {title}',
                           values: { title: loadedSavedQuery.attributes.title },
@@ -259,7 +259,7 @@ export function SavedQueryManagementComponent({
                       data-test-subj="saved-query-management-save-changes-button"
                     >
                       {i18n.translate(
-                        'data.search.searchBar.savedQueryPopoverSaveChangesButtonText',
+                        'unifiedSearch.search.searchBar.savedQueryPopoverSaveChangesButtonText',
                         {
                           defaultMessage: 'Save changes',
                         }
@@ -271,7 +271,7 @@ export function SavedQueryManagementComponent({
                       size="s"
                       onClick={handleSaveAsNew}
                       aria-label={i18n.translate(
-                        'data.search.searchBar.savedQueryPopoverSaveAsNewButtonAriaLabel',
+                        'unifiedSearch.search.searchBar.savedQueryPopoverSaveAsNewButtonAriaLabel',
                         {
                           defaultMessage: 'Save as new saved query',
                         }
@@ -279,7 +279,7 @@ export function SavedQueryManagementComponent({
                       data-test-subj="saved-query-management-save-as-new-button"
                     >
                       {i18n.translate(
-                        'data.search.searchBar.savedQueryPopoverSaveAsNewButtonText',
+                        'unifiedSearch.search.searchBar.savedQueryPopoverSaveAsNewButtonText',
                         {
                           defaultMessage: 'Save as new',
                         }
@@ -295,14 +295,17 @@ export function SavedQueryManagementComponent({
                     fill
                     onClick={handleSave}
                     aria-label={i18n.translate(
-                      'data.search.searchBar.savedQueryPopoverSaveButtonAriaLabel',
+                      'unifiedSearch.search.searchBar.savedQueryPopoverSaveButtonAriaLabel',
                       { defaultMessage: 'Save a new saved query' }
                     )}
                     data-test-subj="saved-query-management-save-button"
                   >
-                    {i18n.translate('data.search.searchBar.savedQueryPopoverSaveButtonText', {
-                      defaultMessage: 'Save current query',
-                    })}
+                    {i18n.translate(
+                      'unifiedSearch.search.searchBar.savedQueryPopoverSaveButtonText',
+                      {
+                        defaultMessage: 'Save current query',
+                      }
+                    )}
                   </EuiButton>
                 </EuiFlexItem>
               )}
@@ -314,14 +317,17 @@ export function SavedQueryManagementComponent({
                     flush="left"
                     onClick={onClearSavedQuery}
                     aria-label={i18n.translate(
-                      'data.search.searchBar.savedQueryPopoverClearButtonAriaLabel',
+                      'unifiedSearch.search.searchBar.savedQueryPopoverClearButtonAriaLabel',
                       { defaultMessage: 'Clear current saved query' }
                     )}
                     data-test-subj="saved-query-management-clear-button"
                   >
-                    {i18n.translate('data.search.searchBar.savedQueryPopoverClearButtonText', {
-                      defaultMessage: 'Clear',
-                    })}
+                    {i18n.translate(
+                      'unifiedSearch.search.searchBar.savedQueryPopoverClearButtonText',
+                      {
+                        defaultMessage: 'Clear',
+                      }
+                    )}
                   </EuiButtonEmpty>
                 )}
               </EuiFlexItem>
diff --git a/src/plugins/data/public/ui/search_bar/create_search_bar.tsx b/src/plugins/unified_search/public/search_bar/create_search_bar.tsx
similarity index 94%
rename from src/plugins/data/public/ui/search_bar/create_search_bar.tsx
rename to src/plugins/unified_search/public/search_bar/create_search_bar.tsx
index fda6a74e4b50..a3491c1540ff 100644
--- a/src/plugins/data/public/ui/search_bar/create_search_bar.tsx
+++ b/src/plugins/unified_search/public/search_bar/create_search_bar.tsx
@@ -8,19 +8,18 @@
 
 import _ from 'lodash';
 import React, { useEffect, useRef } from 'react';
-import { CoreStart } from 'src/core/public';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
-import { QueryStart, SavedQuery } from '../../query';
+import { CoreStart } from '../../../../core/public';
+import { IStorageWrapper } from '../../../kibana_utils/public';
+import { KibanaContextProvider } from '../../../kibana_react/public';
+import { QueryStart, SavedQuery, DataPublicPluginStart } from '../../../data/public';
+import { Filter, Query, TimeRange } from '../../../data/common';
 import { SearchBar } from '.';
 import type { SearchBarOwnProps } from '.';
 import { useFilterManager } from './lib/use_filter_manager';
 import { useTimefilter } from './lib/use_timefilter';
 import { useSavedQuery } from './lib/use_saved_query';
-import { DataPublicPluginStart } from '../../types';
-import { Filter, Query, TimeRange } from '../../../common';
 import { useQueryStringManager } from './lib/use_query_string_manager';
-import { UsageCollectionSetup } from '../../../../usage_collection/public';
+import { UsageCollectionSetup } from '../../../usage_collection/public';
 
 interface StatefulSearchBarDeps {
   core: CoreStart;
diff --git a/src/plugins/data/public/ui/search_bar/index.tsx b/src/plugins/unified_search/public/search_bar/index.tsx
similarity index 89%
rename from src/plugins/data/public/ui/search_bar/index.tsx
rename to src/plugins/unified_search/public/search_bar/index.tsx
index b31b53fd399f..75fa878b5426 100644
--- a/src/plugins/data/public/ui/search_bar/index.tsx
+++ b/src/plugins/unified_search/public/search_bar/index.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { injectI18n } from '@kbn/i18n-react';
-import { withKibana } from '../../../../kibana_react/public';
+import { withKibana } from '../../../kibana_react/public';
 import type { SearchBarProps } from './search_bar';
 
 const Fallback = () => <div />;
@@ -23,3 +23,4 @@ const WrappedSearchBar = (props: SearchBarProps) => (
 export const SearchBar = injectI18n(withKibana(WrappedSearchBar));
 export type { StatefulSearchBarProps } from './create_search_bar';
 export type { SearchBarProps, SearchBarOwnProps } from './search_bar';
+export { createSearchBar } from './create_search_bar';
diff --git a/src/plugins/data/public/ui/search_bar/lib/clear_saved_query.test.ts b/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.test.ts
similarity index 87%
rename from src/plugins/data/public/ui/search_bar/lib/clear_saved_query.test.ts
rename to src/plugins/unified_search/public/search_bar/lib/clear_saved_query.test.ts
index 4b5465dea72a..e43833e25dfe 100644
--- a/src/plugins/data/public/ui/search_bar/lib/clear_saved_query.test.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.test.ts
@@ -7,9 +7,8 @@
  */
 
 import { clearStateFromSavedQuery } from './clear_saved_query';
-
-import { dataPluginMock } from '../../../mocks';
-import { DataPublicPluginStart } from '../../../types';
+import { dataPluginMock } from '../../../../data/public/mocks';
+import { DataPublicPluginStart } from '../../../../data/public';
 
 describe('clearStateFromSavedQuery', () => {
   let dataMock: jest.Mocked<DataPublicPluginStart>;
diff --git a/src/plugins/data/public/ui/search_bar/lib/clear_saved_query.ts b/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.ts
similarity index 90%
rename from src/plugins/data/public/ui/search_bar/lib/clear_saved_query.ts
rename to src/plugins/unified_search/public/search_bar/lib/clear_saved_query.ts
index 2d6394a701a7..685dff385342 100644
--- a/src/plugins/data/public/ui/search_bar/lib/clear_saved_query.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/clear_saved_query.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { QueryStart } from '../../../query';
+import { QueryStart } from '../../../../data/public';
 
 export const clearStateFromSavedQuery = (queryService: QueryStart) => {
   queryService.filterManager.removeAll();
diff --git a/src/plugins/data/public/ui/search_bar/lib/populate_state_from_saved_query.test.ts b/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.test.ts
similarity index 91%
rename from src/plugins/data/public/ui/search_bar/lib/populate_state_from_saved_query.test.ts
rename to src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.test.ts
index 46de3c104da5..c9813097839b 100644
--- a/src/plugins/data/public/ui/search_bar/lib/populate_state_from_saved_query.test.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.test.ts
@@ -7,12 +7,10 @@
  */
 
 import { populateStateFromSavedQuery } from './populate_state_from_saved_query';
-
-import { dataPluginMock } from '../../../mocks';
-import { DataPublicPluginStart } from '../../../types';
-import { SavedQuery } from '../../..';
-import { FilterStateStore } from '../../../../common';
-import { getFilter } from '../../../query/filter_manager/test_helpers/get_stub_filter';
+import { dataPluginMock } from '../../../../data/public/mocks';
+import { DataPublicPluginStart, SavedQuery } from '../../../../data/public';
+import { getFilter } from '../../test_helpers/get_stub_filter';
+import { FilterStateStore } from '../../../../data/common';
 
 describe('populateStateFromSavedQuery', () => {
   let dataMock: jest.Mocked<DataPublicPluginStart>;
diff --git a/src/plugins/data/public/ui/search_bar/lib/populate_state_from_saved_query.ts b/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.ts
similarity index 94%
rename from src/plugins/data/public/ui/search_bar/lib/populate_state_from_saved_query.ts
rename to src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.ts
index 9485477ae725..20023150ff26 100644
--- a/src/plugins/data/public/ui/search_bar/lib/populate_state_from_saved_query.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/populate_state_from_saved_query.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { QueryStart, SavedQuery } from '../../../query';
+import { QueryStart, SavedQuery } from '../../../../data/public';
 
 export const populateStateFromSavedQuery = (queryService: QueryStart, savedQuery: SavedQuery) => {
   const {
diff --git a/src/plugins/data/public/ui/search_bar/lib/use_filter_manager.ts b/src/plugins/unified_search/public/search_bar/lib/use_filter_manager.ts
similarity index 94%
rename from src/plugins/data/public/ui/search_bar/lib/use_filter_manager.ts
rename to src/plugins/unified_search/public/search_bar/lib/use_filter_manager.ts
index 82797f6f24c0..871e1112761a 100644
--- a/src/plugins/data/public/ui/search_bar/lib/use_filter_manager.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/use_filter_manager.ts
@@ -8,7 +8,7 @@
 
 import { useState, useEffect } from 'react';
 import { Subscription } from 'rxjs';
-import { DataPublicPluginStart, Filter } from '../../..';
+import { DataPublicPluginStart, Filter } from '../../../../data/public';
 
 interface UseFilterManagerProps {
   filters?: Filter[];
diff --git a/src/plugins/data/public/ui/search_bar/lib/use_query_string_manager.ts b/src/plugins/unified_search/public/search_bar/lib/use_query_string_manager.ts
similarity index 92%
rename from src/plugins/data/public/ui/search_bar/lib/use_query_string_manager.ts
rename to src/plugins/unified_search/public/search_bar/lib/use_query_string_manager.ts
index 20c4b683b325..a9fc57ecbca3 100644
--- a/src/plugins/data/public/ui/search_bar/lib/use_query_string_manager.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/use_query_string_manager.ts
@@ -8,8 +8,8 @@
 
 import { useState, useEffect, useMemo } from 'react';
 import { Subscription } from 'rxjs';
-import { Query } from '../../..';
-import type { QueryStringContract } from '../../../query/query_string';
+import { Query } from '../../../../data/public';
+import type { QueryStringContract } from '../../../../data/public';
 
 interface UseQueryStringProps {
   query?: Query;
diff --git a/src/plugins/data/public/ui/search_bar/lib/use_saved_query.ts b/src/plugins/unified_search/public/search_bar/lib/use_saved_query.ts
similarity index 92%
rename from src/plugins/data/public/ui/search_bar/lib/use_saved_query.ts
rename to src/plugins/unified_search/public/search_bar/lib/use_saved_query.ts
index 22a04fde9a5c..bf6e46a096b5 100644
--- a/src/plugins/data/public/ui/search_bar/lib/use_saved_query.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/use_saved_query.ts
@@ -8,9 +8,10 @@
 
 import { useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
+
 import { CoreStart } from 'kibana/public';
-import { SavedQuery } from '../../../query';
-import { DataPublicPluginStart } from '../../..';
+import { SavedQuery } from '../../../../data/public';
+import { DataPublicPluginStart } from '../../../../data/public';
 import { populateStateFromSavedQuery } from './populate_state_from_saved_query';
 import { clearStateFromSavedQuery } from './clear_saved_query';
 
@@ -47,7 +48,7 @@ export const useSavedQuery = (props: UseSavedQueriesProps): UseSavedQueriesRetur
         clearStateFromSavedQuery(props.queryService);
         // notify of saving error
         props.notifications.toasts.addWarning({
-          title: i18n.translate('data.search.unableToGetSavedQueryToastTitle', {
+          title: i18n.translate('unifiedSearch.search.unableToGetSavedQueryToastTitle', {
             defaultMessage: 'Unable to load saved query {savedQueryId}',
             values: { savedQueryId },
           }),
diff --git a/src/plugins/data/public/ui/search_bar/lib/use_timefilter.ts b/src/plugins/unified_search/public/search_bar/lib/use_timefilter.ts
similarity index 98%
rename from src/plugins/data/public/ui/search_bar/lib/use_timefilter.ts
rename to src/plugins/unified_search/public/search_bar/lib/use_timefilter.ts
index 373068e04968..e8396bff7d27 100644
--- a/src/plugins/data/public/ui/search_bar/lib/use_timefilter.ts
+++ b/src/plugins/unified_search/public/search_bar/lib/use_timefilter.ts
@@ -8,7 +8,7 @@
 
 import { useState, useEffect } from 'react';
 import { Subscription } from 'rxjs';
-import { DataPublicPluginStart, TimeRange, RefreshInterval } from 'src/plugins/data/public';
+import { DataPublicPluginStart, TimeRange, RefreshInterval } from '../../../../data/public';
 
 interface UseTimefilterProps {
   dateRangeFrom?: string;
diff --git a/src/plugins/data/public/ui/search_bar/search_bar.test.tsx b/src/plugins/unified_search/public/search_bar/search_bar.test.tsx
similarity index 96%
rename from src/plugins/data/public/ui/search_bar/search_bar.test.tsx
rename to src/plugins/unified_search/public/search_bar/search_bar.test.tsx
index 8d57f8a2bd16..727947dab984 100644
--- a/src/plugins/data/public/ui/search_bar/search_bar.test.tsx
+++ b/src/plugins/unified_search/public/search_bar/search_bar.test.tsx
@@ -9,14 +9,14 @@
 import React from 'react';
 import SearchBar from './search_bar';
 
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '../../../kibana_react/public';
 import { I18nProvider } from '@kbn/i18n-react';
 
-import { coreMock } from '../../../../../core/public/mocks';
+import { coreMock } from '../../../../core/public/mocks';
 const startMock = coreMock.createStart();
 
 import { mount } from 'enzyme';
-import { IIndexPattern } from '../..';
+import { IIndexPattern } from '../../../data/public';
 
 const mockTimeHistory = {
   get: () => {
@@ -24,7 +24,7 @@ const mockTimeHistory = {
   },
 };
 
-jest.mock('../filter_bar/filter_bar', () => {
+jest.mock('../filter_bar', () => {
   return {
     FilterBar: () => <div className="filterBar" />,
   };
diff --git a/src/plugins/data/public/ui/search_bar/search_bar.tsx b/src/plugins/unified_search/public/search_bar/search_bar.tsx
similarity index 97%
rename from src/plugins/data/public/ui/search_bar/search_bar.tsx
rename to src/plugins/unified_search/public/search_bar/search_bar.tsx
index 1ee3a97f45a3..f6dddef2909e 100644
--- a/src/plugins/data/public/ui/search_bar/search_bar.tsx
+++ b/src/plugins/unified_search/public/search_bar/search_bar.tsx
@@ -16,13 +16,14 @@ import memoizeOne from 'memoize-one';
 
 import { METRIC_TYPE } from '@kbn/analytics';
 import { Query, Filter } from '@kbn/es-query';
-import { withKibana, KibanaReactContextValue } from '../../../../kibana_react/public';
+import { withKibana, KibanaReactContextValue } from '../../../kibana_react/public';
 
 import QueryBarTopRow from '../query_string_input/query_bar_top_row';
-import type { SavedQueryAttributes, TimeHistoryContract, SavedQuery } from '../../query';
-import { IDataPluginServices } from '../../types';
-import { TimeRange, IIndexPattern } from '../../../common';
-import { FilterBar } from '../filter_bar/filter_bar';
+import type { TimeHistoryContract, SavedQuery } from '../../../data/public';
+import type { SavedQueryAttributes } from '../../../data/common';
+import { IDataPluginServices } from '../../../data/public';
+import { FilterBar } from '../filter_bar';
+import { TimeRange, IIndexPattern } from '../../../data/common';
 import { SavedQueryMeta, SaveQueryForm } from '../saved_query_form';
 import { SavedQueryManagementComponent } from '../saved_query_management';
 
diff --git a/src/plugins/unified_search/public/services.ts b/src/plugins/unified_search/public/services.ts
new file mode 100644
index 000000000000..eb2008a107b3
--- /dev/null
+++ b/src/plugins/unified_search/public/services.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { ThemeServiceStart, OverlayStart } from 'src/core/public';
+import { createGetterSetter } from '../../kibana_utils/public';
+import { DataViewsContract } from '../../data_views/public';
+
+export const [getIndexPatterns, setIndexPatterns] =
+  createGetterSetter<DataViewsContract>('IndexPatterns');
+
+export const [getTheme, setTheme] = createGetterSetter<ThemeServiceStart>('Theme');
+
+export const [getOverlays, setOverlays] = createGetterSetter<OverlayStart>('Overlays');
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
new file mode 100644
index 000000000000..037c89774b6c
--- /dev/null
+++ b/src/plugins/unified_search/public/test_helpers/get_stub_filter.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { Filter, FilterStateStore } from '../../../data/public';
+
+export function getFilter(
+  store: FilterStateStore,
+  disabled: boolean,
+  negated: boolean,
+  queryKey: string,
+  queryValue: any
+): Filter {
+  return {
+    $state: {
+      store,
+    },
+    meta: {
+      index: 'logstash-*',
+      disabled,
+      negate: negated,
+      alias: null,
+    },
+    query: {
+      match: {
+        [queryKey]: queryValue,
+      },
+    },
+  };
+}
diff --git a/src/plugins/data/public/ui/typeahead/__snapshots__/suggestion_component.test.tsx.snap b/src/plugins/unified_search/public/typeahead/__snapshots__/suggestion_component.test.tsx.snap
similarity index 100%
rename from src/plugins/data/public/ui/typeahead/__snapshots__/suggestion_component.test.tsx.snap
rename to src/plugins/unified_search/public/typeahead/__snapshots__/suggestion_component.test.tsx.snap
diff --git a/src/plugins/data/public/ui/typeahead/_index.scss b/src/plugins/unified_search/public/typeahead/_index.scss
similarity index 100%
rename from src/plugins/data/public/ui/typeahead/_index.scss
rename to src/plugins/unified_search/public/typeahead/_index.scss
diff --git a/src/plugins/data/public/ui/typeahead/_suggestion.scss b/src/plugins/unified_search/public/typeahead/_suggestion.scss
similarity index 100%
rename from src/plugins/data/public/ui/typeahead/_suggestion.scss
rename to src/plugins/unified_search/public/typeahead/_suggestion.scss
diff --git a/src/plugins/data/public/ui/typeahead/constants.ts b/src/plugins/unified_search/public/typeahead/constants.ts
similarity index 100%
rename from src/plugins/data/public/ui/typeahead/constants.ts
rename to src/plugins/unified_search/public/typeahead/constants.ts
diff --git a/src/plugins/data/public/ui/typeahead/index.tsx b/src/plugins/unified_search/public/typeahead/index.tsx
similarity index 100%
rename from src/plugins/data/public/ui/typeahead/index.tsx
rename to src/plugins/unified_search/public/typeahead/index.tsx
diff --git a/src/plugins/data/public/ui/typeahead/suggestion_component.test.tsx b/src/plugins/unified_search/public/typeahead/suggestion_component.test.tsx
similarity index 97%
rename from src/plugins/data/public/ui/typeahead/suggestion_component.test.tsx
rename to src/plugins/unified_search/public/typeahead/suggestion_component.test.tsx
index 56b156c3062b..39d140a10229 100644
--- a/src/plugins/data/public/ui/typeahead/suggestion_component.test.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestion_component.test.tsx
@@ -8,7 +8,7 @@
 
 import { mount, shallow } from 'enzyme';
 import React from 'react';
-import { QuerySuggestion, QuerySuggestionTypes } from '../../autocomplete';
+import { QuerySuggestion, QuerySuggestionTypes } from '../../../data/public';
 import { SuggestionComponent } from './suggestion_component';
 
 const noop = () => {
diff --git a/src/plugins/data/public/ui/typeahead/suggestion_component.tsx b/src/plugins/unified_search/public/typeahead/suggestion_component.tsx
similarity index 98%
rename from src/plugins/data/public/ui/typeahead/suggestion_component.tsx
rename to src/plugins/unified_search/public/typeahead/suggestion_component.tsx
index 938fdb5c9fb2..dc5b94800f97 100644
--- a/src/plugins/data/public/ui/typeahead/suggestion_component.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestion_component.tsx
@@ -9,7 +9,7 @@
 import { EuiIcon } from '@elastic/eui';
 import classNames from 'classnames';
 import React, { useCallback } from 'react';
-import { QuerySuggestion } from '../../autocomplete';
+import { QuerySuggestion } from '../../../data/public';
 import { SuggestionOnClick, SuggestionOnMouseEnter } from './types';
 
 function getEuiIconType(type: string) {
diff --git a/src/plugins/data/public/ui/typeahead/suggestions_component.test.tsx b/src/plugins/unified_search/public/typeahead/suggestions_component.test.tsx
similarity index 98%
rename from src/plugins/data/public/ui/typeahead/suggestions_component.test.tsx
rename to src/plugins/unified_search/public/typeahead/suggestions_component.test.tsx
index d34f48e2957a..947b1a0be4d1 100644
--- a/src/plugins/data/public/ui/typeahead/suggestions_component.test.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestions_component.test.tsx
@@ -8,7 +8,7 @@
 
 import { mount, shallow } from 'enzyme';
 import React from 'react';
-import { QuerySuggestion, QuerySuggestionTypes } from '../../autocomplete';
+import { QuerySuggestion, QuerySuggestionTypes } from '../../../data/public';
 import { SuggestionComponent } from './suggestion_component';
 import SuggestionsComponent from './suggestions_component';
 
diff --git a/src/plugins/data/public/ui/typeahead/suggestions_component.tsx b/src/plugins/unified_search/public/typeahead/suggestions_component.tsx
similarity index 98%
rename from src/plugins/data/public/ui/typeahead/suggestions_component.tsx
rename to src/plugins/unified_search/public/typeahead/suggestions_component.tsx
index a5ee6f31ada3..9446653df2ee 100644
--- a/src/plugins/data/public/ui/typeahead/suggestions_component.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestions_component.tsx
@@ -6,13 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { isEmpty } from 'lodash';
 import React, { PureComponent, ReactNode } from 'react';
+import { isEmpty } from 'lodash';
 import classNames from 'classnames';
+
 import styled from 'styled-components';
 
 import useRafState from 'react-use/lib/useRafState';
-import { QuerySuggestion } from '../../autocomplete';
+import { QuerySuggestion } from '../../../data/public';
 import { SuggestionComponent } from './suggestion_component';
 import {
   SUGGESTIONS_LIST_REQUIRED_BOTTOM_SPACE,
@@ -20,8 +21,7 @@ import {
   SUGGESTIONS_LIST_REQUIRED_WIDTH,
 } from './constants';
 import { SuggestionOnClick, SuggestionOnMouseEnter } from './types';
-import { onRaf } from '../utils';
-import { shallowEqual } from '../../utils/shallow_equal';
+import { onRaf, shallowEqual } from '../utils';
 
 interface SuggestionsComponentProps {
   index: number | null;
diff --git a/src/plugins/data/public/ui/typeahead/types.ts b/src/plugins/unified_search/public/typeahead/types.ts
similarity index 90%
rename from src/plugins/data/public/ui/typeahead/types.ts
rename to src/plugins/unified_search/public/typeahead/types.ts
index 16a18bc68430..25d490980004 100644
--- a/src/plugins/data/public/ui/typeahead/types.ts
+++ b/src/plugins/unified_search/public/typeahead/types.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { QuerySuggestion } from '../../autocomplete';
+import { QuerySuggestion } from '../../../data/public';
 
 export type SuggestionOnClick = (suggestion: QuerySuggestion, index: number) => void;
 
diff --git a/src/plugins/unified_search/public/types.ts b/src/plugins/unified_search/public/types.ts
new file mode 100755
index 000000000000..b5de235e7a56
--- /dev/null
+++ b/src/plugins/unified_search/public/types.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import type { DataViewsPublicPluginStart } from '../../data_views/public';
+import type { FieldFormatsStart } from '../../field_formats/public';
+import { IndexPatternSelectProps, StatefulSearchBarProps } from './index';
+import type { DataPublicPluginStart } from '../../data/public';
+import type { UiActionsSetup, UiActionsStart } from '../../ui_actions/public';
+
+export interface UnifiedSearchSetupDependencies {
+  uiActions: UiActionsSetup;
+  data: DataPublicPluginStart;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface UnifiedSearchPluginSetup {}
+
+export interface UnifiedSearchStartDependencies {
+  dataViews: DataViewsPublicPluginStart;
+  fieldFormats: FieldFormatsStart;
+  data: DataPublicPluginStart;
+  uiActions: UiActionsStart;
+}
+
+/**
+ * Unified search plugin prewired UI components
+ */
+export interface UnifiedSearchPublicPluginStartUi {
+  IndexPatternSelect: React.ComponentType<IndexPatternSelectProps>;
+  SearchBar: React.ComponentType<StatefulSearchBarProps>;
+}
+
+/**
+ * Unified search plugin public Start contract
+ */
+export interface UnifiedSearchPublicPluginStart {
+  /**
+   * prewired UI components
+   * {@link DataPublicPluginStartUi}
+   */
+  ui: UnifiedSearchPublicPluginStartUi;
+}
diff --git a/src/plugins/data/public/ui/utils/index.ts b/src/plugins/unified_search/public/utils/index.ts
similarity index 89%
rename from src/plugins/data/public/ui/utils/index.ts
rename to src/plugins/unified_search/public/utils/index.ts
index 38c04459aae2..5dffd3798399 100644
--- a/src/plugins/data/public/ui/utils/index.ts
+++ b/src/plugins/unified_search/public/utils/index.ts
@@ -7,3 +7,4 @@
  */
 
 export { onRaf } from './on_raf';
+export { shallowEqual } from './shallow_equal';
diff --git a/src/plugins/data/public/ui/utils/on_raf.ts b/src/plugins/unified_search/public/utils/on_raf.ts
similarity index 100%
rename from src/plugins/data/public/ui/utils/on_raf.ts
rename to src/plugins/unified_search/public/utils/on_raf.ts
diff --git a/src/plugins/unified_search/public/utils/shallow_equal.ts b/src/plugins/unified_search/public/utils/shallow_equal.ts
new file mode 100644
index 000000000000..e0387e07a163
--- /dev/null
+++ b/src/plugins/unified_search/public/utils/shallow_equal.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/**
+ * Shallow Equal check adapted from react-redux
+ * Copy-pasted to avoid importing copy of react-redux into data plugin async chunk
+ **/
+export function shallowEqual(objA: unknown, objB: unknown): boolean {
+  if (Object.is(objA, objB)) return true;
+
+  if (typeof objA !== 'object' || objA === null || typeof objB !== 'object' || objB === null) {
+    return false;
+  }
+
+  const keysA = Object.keys(objA);
+  const keysB = Object.keys(objB);
+
+  if (keysA.length !== keysB.length) return false;
+
+  for (let i = 0; i < keysA.length; i++) {
+    if (
+      !Object.prototype.hasOwnProperty.call(objB, keysA[i]) ||
+      // @ts-ignore
+      !Object.is(objA[keysA[i]], objB[keysA[i]])
+    ) {
+      return false;
+    }
+  }
+
+  return true;
+}
diff --git a/src/plugins/unified_search/tsconfig.json b/src/plugins/unified_search/tsconfig.json
new file mode 100644
index 000000000000..3ff1ba630ac2
--- /dev/null
+++ b/src/plugins/unified_search/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": [
+    "public/**/*",
+    "config.ts",
+    "public/**/*.json"
+  ],
+  "references": [
+    { "path": "../../core/tsconfig.json" },
+    { "path": "../data/tsconfig.json" },
+    { "path": "../data_views/tsconfig.json" },
+    { "path": "../usage_collection/tsconfig.json" },
+    { "path": "../kibana_utils/tsconfig.json" },
+    { "path": "../kibana_react/tsconfig.json" },
+    { "path": "../field_formats/tsconfig.json" },
+  ]
+}
diff --git a/src/plugins/vis_default_editor/kibana.json b/src/plugins/vis_default_editor/kibana.json
index ea05fe7809a6..e6a56bd65fcc 100644
--- a/src/plugins/vis_default_editor/kibana.json
+++ b/src/plugins/vis_default_editor/kibana.json
@@ -3,7 +3,7 @@
   "version": "kibana",
   "ui": true,
   "optionalPlugins": ["visualizations"],
-  "requiredBundles": ["kibanaUtils", "kibanaReact", "data", "fieldFormats", "discover", "esUiShared"],
+  "requiredBundles": ["unifiedSearch", "kibanaUtils", "kibanaReact", "data", "fieldFormats", "discover", "esUiShared"],
   "owner": {
     "name": "Vis Editors",
     "githubTeam": "kibana-vis-editors"
diff --git a/src/plugins/vis_default_editor/public/components/controls/filter.tsx b/src/plugins/vis_default_editor/public/components/controls/filter.tsx
index 0498062db45a..120c3b8871c4 100644
--- a/src/plugins/vis_default_editor/public/components/controls/filter.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/filter.tsx
@@ -10,12 +10,9 @@ import React, { useState } from 'react';
 import { EuiForm, EuiButtonIcon, EuiFieldText, EuiFormRow, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import {
-  IAggConfig,
-  Query,
-  QueryStringInput,
-  DataPublicPluginStart,
-} from '../../../../data/public';
+import { IAggConfig, Query, DataPublicPluginStart } from '../../../../data/public';
+import { QueryStringInput } from '../../../../unified_search/public';
+
 import { useKibana } from '../../../../kibana_react/public';
 
 interface FilterRowProps {
diff --git a/src/plugins/vis_default_editor/tsconfig.json b/src/plugins/vis_default_editor/tsconfig.json
index 018fc252e99a..c2e677108c08 100644
--- a/src/plugins/vis_default_editor/tsconfig.json
+++ b/src/plugins/vis_default_editor/tsconfig.json
@@ -16,6 +16,7 @@
     { "path": "../discover/tsconfig.json" },
     { "path": "../kibana_utils/tsconfig.json" },
     { "path": "../kibana_react/tsconfig.json" },
-    { "path": "../field_formats/tsconfig.json" }
+    { "path": "../field_formats/tsconfig.json" },
+    { "path": "../unified_search/tsconfig.json" }
   ]
 }
diff --git a/src/plugins/vis_types/timeseries/kibana.json b/src/plugins/vis_types/timeseries/kibana.json
index f5d808ab152d..8f12e7c4d3ca 100644
--- a/src/plugins/vis_types/timeseries/kibana.json
+++ b/src/plugins/vis_types/timeseries/kibana.json
@@ -6,7 +6,7 @@
   "ui": true,
   "requiredPlugins": ["charts", "data", "expressions", "visualizations", "inspector", "dataViews"],
   "optionalPlugins": ["home","usageCollection"],
-  "requiredBundles": ["kibanaUtils", "kibanaReact", "fieldFormats"],
+  "requiredBundles": ["unifiedSearch", "kibanaUtils", "kibanaReact", "fieldFormats"],
   "owner": {
     "name": "Vis Editors",
     "githubTeam": "kibana-vis-editors"
diff --git a/src/plugins/vis_types/timeseries/public/application/components/query_bar_wrapper.tsx b/src/plugins/vis_types/timeseries/public/application/components/query_bar_wrapper.tsx
index ad6abe46ac85..0a4971d66476 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/query_bar_wrapper.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/query_bar_wrapper.tsx
@@ -11,7 +11,7 @@ import React, { useContext, useEffect, useState } from 'react';
 import { CoreStartContext } from '../contexts/query_input_bar_context';
 import type { IndexPatternValue } from '../../../common/types';
 
-import { QueryStringInput, QueryStringInputProps } from '../../../../../../plugins/data/public';
+import { QueryStringInput, QueryStringInputProps } from '../../../../../unified_search/public';
 import { getDataViewsStart } from '../../services';
 import { fetchIndexPattern, isStringTypeIndexPattern } from '../../../common/index_patterns_utils';
 
diff --git a/src/plugins/vis_types/timeseries/tsconfig.json b/src/plugins/vis_types/timeseries/tsconfig.json
index 87d85626c7ab..43d66c3bd030 100644
--- a/src/plugins/vis_types/timeseries/tsconfig.json
+++ b/src/plugins/vis_types/timeseries/tsconfig.json
@@ -24,5 +24,6 @@
     { "path": "../../kibana_utils/tsconfig.json" },
     { "path": "../../kibana_react/tsconfig.json" },
     { "path": "../../usage_collection/tsconfig.json" },
+    { "path": "../../unified_search/tsconfig.json" }
   ]
 }
diff --git a/test/tsconfig.json b/test/tsconfig.json
index ace3842ead79..e870042ec2e0 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -42,6 +42,7 @@
     { "path": "../src/plugins/kibana_usage_collection/tsconfig.json" },
     { "path": "../src/plugins/kibana_utils/tsconfig.json" },
     { "path": "../src/plugins/navigation/tsconfig.json" },
+    { "path": "../src/plugins/unified_search/tsconfig.json" },
     { "path": "../src/plugins/newsfeed/tsconfig.json" },
     { "path": "../src/plugins/saved_objects/tsconfig.json" },
     { "path": "../src/plugins/saved_objects_management/tsconfig.json" },
diff --git a/x-pack/examples/exploratory_view_example/public/plugin.ts b/x-pack/examples/exploratory_view_example/public/plugin.ts
index 50832d36c6fc..6b7e2a93918d 100644
--- a/x-pack/examples/exploratory_view_example/public/plugin.ts
+++ b/x-pack/examples/exploratory_view_example/public/plugin.ts
@@ -6,9 +6,9 @@
  */
 
 import { Plugin, CoreSetup, AppNavLinkStatus } from '../../../../src/core/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { ObservabilityPublicStart } from '../../../plugins/observability/public';
-import { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
+import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
+import type { ObservabilityPublicStart } from '../../../plugins/observability/public';
+import type { DeveloperExamplesSetup } from '../../../../examples/developer_examples/public';
 import { mount } from './mount';
 
 export interface SetupDependencies {
diff --git a/x-pack/examples/ui_actions_enhanced_examples/kibana.json b/x-pack/examples/ui_actions_enhanced_examples/kibana.json
index 4fa62668dd55..90b517c94a4d 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/kibana.json
+++ b/x-pack/examples/ui_actions_enhanced_examples/kibana.json
@@ -16,7 +16,8 @@
     "discover",
     "dashboard",
     "dashboardEnhanced",
-    "developerExamples"
+    "developerExamples",
+    "unifiedSearch"
   ],
   "optionalPlugins": [],
   "requiredBundles": ["dashboardEnhanced", "embeddable", "kibanaUtils", "kibanaReact"]
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/drilldown.tsx b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/drilldown.tsx
index 4635d4694ed1..4e0d69084fc3 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/drilldown.tsx
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/drilldown.tsx
@@ -14,10 +14,8 @@ import { CollectConfigContainer } from './collect_config_container';
 import { SAMPLE_DASHBOARD_TO_DISCOVER_DRILLDOWN } from './constants';
 import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../../plugins/ui_actions_enhanced/public';
 import { txtGoToDiscover } from './i18n';
-import {
-  ApplyGlobalFilterActionContext,
-  APPLY_FILTER_TRIGGER,
-} from '../../../../../../src/plugins/data/public';
+import { APPLY_FILTER_TRIGGER } from '../../../../../../src/plugins/data/public';
+import { ApplyGlobalFilterActionContext } from '../../../../../../src/plugins/unified_search/public';
 
 const isOutputWithIndexPatterns = (
   output: unknown
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/types.ts b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/types.ts
index 4cb3ce3a5ab8..1047668fd995 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/types.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/drilldowns/dashboard_to_discover_drilldown/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { CollectConfigProps as CollectConfigPropsBase } from '../../../../../../src/plugins/kibana_utils/public';
-import { ApplyGlobalFilterActionContext } from '../../../../../../src/plugins/data/public';
+import { ApplyGlobalFilterActionContext } from '../../../../../../src/plugins/unified_search/public';
 import { IEmbeddable } from '../../../../../../src/plugins/embeddable/public';
 
 export type ActionContext = ApplyGlobalFilterActionContext & { embeddable: IEmbeddable };
diff --git a/x-pack/plugins/cloud_security_posture/kibana.json b/x-pack/plugins/cloud_security_posture/kibana.json
index 29f3813c211c..5c7f40891ea2 100755
--- a/x-pack/plugins/cloud_security_posture/kibana.json
+++ b/x-pack/plugins/cloud_security_posture/kibana.json
@@ -10,6 +10,6 @@
   "description": "The cloud security posture plugin",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["navigation", "data", "fleet"],
+  "requiredPlugins": ["navigation", "data", "fleet", "unifiedSearch"],
   "requiredBundles": ["kibanaReact"]
 }
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx
index 1094d5fa847d..6d66542380e6 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings.test.tsx
@@ -10,10 +10,10 @@ import { render, screen } from '@testing-library/react';
 import { useKubebeatDataView } from '../../common/api/use_kubebeat_data_view';
 import { Findings } from './findings';
 import { TestProvider } from '../../test/test_provider';
-import {
-  dataPluginMock,
-  type Start as DataPluginStart,
-} from '../../../../../../src/plugins/data/public/mocks';
+import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
+import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
+import { UnifiedSearchPublicPluginStart } from '../../../../../../src/plugins/unified_search/public';
+import { unifiedSearchPluginMock } from '../../../../../../src/plugins/unified_search/public/mocks';
 import { createStubDataView } from '../../../../../../src/plugins/data_views/public/data_views/data_view.stub';
 import { CSP_KUBEBEAT_INDEX_PATTERN } from '../../../common/constants';
 import * as TEST_SUBJECTS from './test_subjects';
@@ -27,8 +27,14 @@ beforeEach(() => {
   jest.restoreAllMocks();
 });
 
-const Wrapper = ({ data = dataPluginMock.createStartContract() }: { data: DataPluginStart }) => (
-  <TestProvider deps={{ data }}>
+const Wrapper = ({
+  data = dataPluginMock.createStartContract(),
+  unifiedSearch = unifiedSearchPluginMock.createStartContract(),
+}: {
+  data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
+}) => (
+  <TestProvider deps={{ data, unifiedSearch }}>
     <Findings />
   </TestProvider>
 );
@@ -36,6 +42,7 @@ const Wrapper = ({ data = dataPluginMock.createStartContract() }: { data: DataPl
 describe('<Findings />', () => {
   it("renders the success state component when 'kubebeat' DataView exists and request status is 'success'", async () => {
     const data = dataPluginMock.createStartContract();
+    const unifiedSearch = unifiedSearchPluginMock.createStartContract();
     const source = await data.search.searchSource.create();
 
     (useCisKubernetesIntegration as jest.Mock).mockImplementation(() => ({
@@ -54,7 +61,7 @@ describe('<Findings />', () => {
       }),
     } as UseQueryResult<DataView>);
 
-    render(<Wrapper data={data} />);
+    render(<Wrapper data={data} unifiedSearch={unifiedSearch} />);
 
     expect(await screen.findByTestId(TEST_SUBJECTS.FINDINGS_CONTAINER)).toBeInTheDocument();
   });
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_search_bar.tsx b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_search_bar.tsx
index c4e16cb873e3..11b62da5fce5 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_search_bar.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/findings/findings_search_bar.tsx
@@ -29,7 +29,7 @@ export const FindingsSearchBar = ({
   setQuery,
 }: FindingsSearchBarProps & { dataView: DataView }) => {
   const {
-    data: {
+    unifiedSearch: {
       ui: { SearchBar },
     },
   } = useKibana<CspClientPluginStartDeps>().services;
diff --git a/x-pack/plugins/cloud_security_posture/public/types.ts b/x-pack/plugins/cloud_security_posture/public/types.ts
index c01ec0df41e2..7fc100ebeffb 100755
--- a/x-pack/plugins/cloud_security_posture/public/types.ts
+++ b/x-pack/plugins/cloud_security_posture/public/types.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
 import type {
   DataPublicPluginSetup,
   DataPublicPluginStart,
@@ -25,6 +26,6 @@ export interface CspClientPluginSetupDeps {
 export interface CspClientPluginStartDeps {
   // required
   data: DataPublicPluginStart;
-
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   // optional
 }
diff --git a/x-pack/plugins/dashboard_enhanced/kibana.json b/x-pack/plugins/dashboard_enhanced/kibana.json
index 35f8e535eb33..eb9e5241503d 100644
--- a/x-pack/plugins/dashboard_enhanced/kibana.json
+++ b/x-pack/plugins/dashboard_enhanced/kibana.json
@@ -8,6 +8,6 @@
   "server": true,
   "ui": true,
   "configPath": ["xpack", "dashboardEnhanced"],
-  "requiredPlugins": ["dashboard", "data", "embeddable", "share", "uiActionsEnhanced"],
+  "requiredPlugins": ["dashboard", "data", "embeddable", "share", "uiActionsEnhanced", "unifiedSearch"],
   "requiredBundles": ["embeddable", "embeddableEnhanced", "kibanaReact", "kibanaUtils"]
 }
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx
index 2ceff7713f62..6c4a9d31c583 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.test.tsx
@@ -10,7 +10,7 @@ import { EmbeddableToDashboardDrilldown } from './embeddable_to_dashboard_drilld
 import { AbstractDashboardDrilldownConfig as Config } from '../abstract_dashboard_drilldown';
 import { savedObjectsServiceMock } from '../../../../../../../src/core/public/mocks';
 import { FilterStateStore, Query, TimeRange } from '../../../../../../../src/plugins/data/common';
-import { ApplyGlobalFilterActionContext } from '../../../../../../../src/plugins/data/public';
+import { ApplyGlobalFilterActionContext } from '../../../../../../../src/plugins/unified_search/public';
 import {
   DashboardAppLocatorDefinition,
   DashboardAppLocatorParams,
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx
index b5085054b319..d3478013b96d 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/embeddable_to_dashboard_drilldown/embeddable_to_dashboard_drilldown.tsx
@@ -12,7 +12,6 @@ import {
 } from '../../../../../../../src/plugins/dashboard/public';
 import { setStateToKbnUrl } from '../../../../../../../src/plugins/kibana_utils/public';
 import {
-  ApplyGlobalFilterActionContext,
   APPLY_FILTER_TRIGGER,
   isQuery,
   isTimeRange,
@@ -20,6 +19,7 @@ import {
   TimeRange,
   extractTimeRange,
 } from '../../../../../../../src/plugins/data/public';
+import { ApplyGlobalFilterActionContext } from '../../../../../../../src/plugins/unified_search/public';
 import { IEmbeddable, EmbeddableInput } from '../../../../../../../src/plugins/embeddable/public';
 import {
   AbstractDashboardDrilldown,
diff --git a/x-pack/plugins/data_visualizer/kibana.json b/x-pack/plugins/data_visualizer/kibana.json
index aee54c216150..f3fbc867e77c 100644
--- a/x-pack/plugins/data_visualizer/kibana.json
+++ b/x-pack/plugins/data_visualizer/kibana.json
@@ -12,7 +12,8 @@
     "discover",
     "fileUpload",
     "uiActions",
-    "charts"
+    "charts",
+    "unifiedSearch"
   ],
   "optionalPlugins": [
     "security",
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx
index c6366570f0fb..138c9e50b90a 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx
@@ -67,8 +67,8 @@ export const SearchPanel: FC<Props> = ({
     services: {
       uiSettings,
       notifications: { toasts },
-      data: {
-        query: queryManager,
+      data: { query: queryManager },
+      unifiedSearch: {
         ui: { SearchBar },
       },
     },
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
index e30520d49598..bdb2d7b77d0e 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
@@ -274,6 +274,7 @@ export const IndexDataVisualizer: FC<{ additionalLinks: ResultLink[] }> = ({ add
     dataViewFieldEditor,
     uiActions,
     charts,
+    unifiedSearch,
   } = getPluginsStart();
   const services = {
     data,
@@ -287,6 +288,7 @@ export const IndexDataVisualizer: FC<{ additionalLinks: ResultLink[] }> = ({ add
     dataViewFieldEditor,
     uiActions,
     charts,
+    unifiedSearch,
     ...coreStart,
   };
 
diff --git a/x-pack/plugins/data_visualizer/public/plugin.ts b/x-pack/plugins/data_visualizer/public/plugin.ts
index 06ec021d28ba..f73d155c87d3 100644
--- a/x-pack/plugins/data_visualizer/public/plugin.ts
+++ b/x-pack/plugins/data_visualizer/public/plugin.ts
@@ -17,6 +17,7 @@ import { setStartServices } from './kibana_services';
 import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
 import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
 import type { FileUploadPluginStart } from '../../file_upload/public';
+import type { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
 import type { MapsStartApi } from '../../maps/public';
 import type { SecurityPluginSetup } from '../../security/public';
 import type { LensPublicStart } from '../../lens/public';
@@ -37,6 +38,7 @@ export interface DataVisualizerSetupDependencies {
 }
 export interface DataVisualizerStartDependencies {
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   fileUpload: FileUploadPluginStart;
   maps: MapsStartApi;
   embeddable: EmbeddableStart;
diff --git a/x-pack/plugins/data_visualizer/tsconfig.json b/x-pack/plugins/data_visualizer/tsconfig.json
index 5d35b5d542b8..504d3fbd9d8a 100644
--- a/x-pack/plugins/data_visualizer/tsconfig.json
+++ b/x-pack/plugins/data_visualizer/tsconfig.json
@@ -25,6 +25,8 @@
     { "path": "../file_upload/tsconfig.json" },
     { "path": "../lens/tsconfig.json" },
     { "path": "../maps/tsconfig.json" },
+    { "path": "../../../src/plugins/embeddable/tsconfig.json" },
+    { "path": "../../../src/plugins/unified_search/tsconfig.json" },
     { "path": "../cloud/tsconfig.json" },
     { "path": "../../../src/plugins/embeddable/tsconfig.json" }
   ]
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
index df85390ba049..94ebece3a77d 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
@@ -10,10 +10,8 @@ import {
   DiscoverAppLocatorParams,
   SearchInput,
 } from '../../../../../../src/plugins/discover/public';
-import {
-  ApplyGlobalFilterActionContext,
-  extractTimeRange,
-} from '../../../../../../src/plugins/data/public';
+import { ApplyGlobalFilterActionContext } from '../../../../../../src/plugins/unified_search/public';
+import { extractTimeRange } from '../../../../../../src/plugins/data/public';
 import { IEmbeddable } from '../../../../../../src/plugins/embeddable/public';
 import { KibanaLocation } from '../../../../../../src/plugins/share/public';
 import * as shared from './shared';
diff --git a/x-pack/plugins/drilldowns/url_drilldown/tsconfig.json b/x-pack/plugins/drilldowns/url_drilldown/tsconfig.json
index 85a215254bb7..419c3875435d 100644
--- a/x-pack/plugins/drilldowns/url_drilldown/tsconfig.json
+++ b/x-pack/plugins/drilldowns/url_drilldown/tsconfig.json
@@ -14,6 +14,7 @@
     { "path": "../../../../src/plugins/expressions/tsconfig.json" },
     { "path": "../../../../src/plugins/kibana_react/tsconfig.json" },
     { "path": "../../../../src/plugins/kibana_utils/tsconfig.json" },
-    { "path": "../../../../src/plugins/ui_actions/tsconfig.json" }
+    { "path": "../../../../src/plugins/ui_actions/tsconfig.json" },
+    { "path": "../../../../src/plugins/data/tsconfig.json" }
   ]
 }
diff --git a/x-pack/plugins/file_upload/public/plugin.ts b/x-pack/plugins/file_upload/public/plugin.ts
index d9d2b188162b..38f19675028d 100644
--- a/x-pack/plugins/file_upload/public/plugin.ts
+++ b/x-pack/plugins/file_upload/public/plugin.ts
@@ -17,7 +17,7 @@ import {
   analyzeFile,
 } from './api';
 import { setStartServices } from './kibana_services';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
+import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
 import { getMaxBytes, getMaxBytesFormatted } from './importer/get_max_bytes';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
diff --git a/x-pack/plugins/fleet/kibana.json b/x-pack/plugins/fleet/kibana.json
index ec03442ce860..67ee2daf6372 100644
--- a/x-pack/plugins/fleet/kibana.json
+++ b/x-pack/plugins/fleet/kibana.json
@@ -11,5 +11,5 @@
   "requiredPlugins": ["licensing", "data", "encryptedSavedObjects", "navigation", "customIntegrations", "share", "spaces", "security"],
   "optionalPlugins": ["features", "cloud", "usageCollection", "home", "globalSearch", "telemetry"],
   "extraPublicDirs": ["common"],
-  "requiredBundles": ["kibanaReact", "cloud", "esUiShared", "home", "infra", "kibanaUtils", "usageCollection"]
+  "requiredBundles": ["kibanaReact", "cloud", "esUiShared", "home", "infra", "kibanaUtils", "usageCollection", "unifiedSearch"]
 }
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx b/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx
index 59d10a87accf..6537bbea98c9 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.tsx
@@ -10,7 +10,7 @@ import React, { useState, useEffect, useMemo } from 'react';
 import { fromKueryExpression } from '@kbn/es-query';
 
 import type { FieldSpec } from '../../../../../../../src/plugins/data/common';
-import { QueryStringInput } from '../../../../../../../src/plugins/data/public';
+import { QueryStringInput } from '../../../../../../../src/plugins/unified_search/public';
 import { useStartServices } from '../hooks';
 import { INDEX_NAME, AGENTS_PREFIX } from '../constants';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/query_bar.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/query_bar.tsx
index 65e2e6fb4eae..8a0d8fec58f1 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/query_bar.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/query_bar.tsx
@@ -9,7 +9,7 @@ import React, { memo, useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 
 import type { FieldSpec } from '../../../../../../../../../../../src/plugins/data/common';
-import { QueryStringInput } from '../../../../../../../../../../../src/plugins/data/public';
+import { QueryStringInput } from '../../../../../../../../../../../src/plugins/unified_search/public';
 import { useStartServices } from '../../../../../hooks';
 
 import {
diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json
index 972a2d375924..d0361f455057 100644
--- a/x-pack/plugins/fleet/tsconfig.json
+++ b/x-pack/plugins/fleet/tsconfig.json
@@ -38,5 +38,6 @@
     { "path": "../../../src/plugins/es_ui_shared/tsconfig.json" },
     { "path": "../infra/tsconfig.json" },
     { "path": "../../../src/plugins/kibana_utils/tsconfig.json" },
+    { "path": "../../../src/plugins/unified_search/tsconfig.json" }
   ]
 }
diff --git a/x-pack/plugins/graph/kibana.json b/x-pack/plugins/graph/kibana.json
index b4b1e9c21a23..86ff0cf5d6c4 100644
--- a/x-pack/plugins/graph/kibana.json
+++ b/x-pack/plugins/graph/kibana.json
@@ -20,6 +20,7 @@
     "graph"
   ],
   "requiredBundles": [
+    "unifiedSearch",
     "kibanaUtils",
     "kibanaReact",
     "home"
diff --git a/x-pack/plugins/graph/public/components/search_bar.test.tsx b/x-pack/plugins/graph/public/components/search_bar.test.tsx
index 7feab56b2e27..9a5b464e01e8 100644
--- a/x-pack/plugins/graph/public/components/search_bar.test.tsx
+++ b/x-pack/plugins/graph/public/components/search_bar.test.tsx
@@ -17,7 +17,7 @@ import {
   SavedObjectsStart,
 } from 'kibana/public';
 import { act } from 'react-dom/test-utils';
-import { QueryStringInput } from '../../../../../src/plugins/data/public';
+import { QueryStringInput } from '../../../../../src/plugins/unified_search/public';
 import type { DataView } from '../../../../../src/plugins/data_views/public';
 
 import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
diff --git a/x-pack/plugins/graph/public/components/search_bar.tsx b/x-pack/plugins/graph/public/components/search_bar.tsx
index 89a82b5eb848..f28f9245db23 100644
--- a/x-pack/plugins/graph/public/components/search_bar.tsx
+++ b/x-pack/plugins/graph/public/components/search_bar.tsx
@@ -23,11 +23,8 @@ import {
 } from '../state_management';
 
 import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import {
-  QueryStringInput,
-  IDataPluginServices,
-  Query,
-} from '../../../../../src/plugins/data/public';
+import { IDataPluginServices, Query } from '../../../../../src/plugins/data/public';
+import { QueryStringInput } from '../../../../../src/plugins/unified_search/public';
 import { TooltipWrapper } from './tooltip_wrapper';
 import type { DataView } from '../../../../../src/plugins/data_views/public';
 
diff --git a/x-pack/plugins/graph/tsconfig.json b/x-pack/plugins/graph/tsconfig.json
index bd7e4907ed4e..38711a903fe5 100644
--- a/x-pack/plugins/graph/tsconfig.json
+++ b/x-pack/plugins/graph/tsconfig.json
@@ -24,6 +24,7 @@
     { "path": "../../../src/plugins/home/tsconfig.json"},
     { "path": "../../../src/plugins/kibana_utils/tsconfig.json" },
     { "path": "../../../src/plugins/kibana_react/tsconfig.json" },
-    { "path": "../spaces/tsconfig.json" }
+    { "path": "../spaces/tsconfig.json" },
+    { "path": "../../../src/plugins/unified_search/tsconfig.json" }
   ]
 }
diff --git a/x-pack/plugins/infra/kibana.json b/x-pack/plugins/infra/kibana.json
index c70099e33149..c2a04c7a0ff3 100644
--- a/x-pack/plugins/infra/kibana.json
+++ b/x-pack/plugins/infra/kibana.json
@@ -22,6 +22,7 @@
   "ui": true,
   "configPath": ["xpack", "infra"],
   "requiredBundles": [
+    "unifiedSearch",
     "observability",
     "licenseManagement",
     "kibanaUtils",
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
index babd79a29854..05396f780aef 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import React, { ChangeEvent, useCallback, useEffect, useMemo, useState } from 'react';
 import {
   EuiButtonEmpty,
   EuiButtonIcon,
@@ -22,7 +22,6 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { debounce, omit } from 'lodash';
-import React, { ChangeEvent, useCallback, useEffect, useMemo, useState } from 'react';
 import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import {
   ForLastExpression,
@@ -87,7 +86,7 @@ type Props = Omit<
     },
     AlertContextMeta
   >,
-  'defaultActionGroupId' | 'actionGroups' | 'charts' | 'data'
+  'defaultActionGroupId' | 'actionGroups' | 'charts' | 'data' | 'unifiedSearch'
 >;
 
 export const defaultExpression = {
diff --git a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx
index 51629b656a7e..bd4f0de2bfec 100644
--- a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx
@@ -39,7 +39,7 @@ type AlertParams = RuleTypeParams &
 
 type Props = Omit<
   RuleTypeParamsExpressionProps<AlertParams, AlertContextMeta>,
-  'defaultActionGroupId' | 'actionGroups' | 'charts' | 'data'
+  'defaultActionGroupId' | 'actionGroups' | 'charts' | 'data' | 'unifiedSearch'
 >;
 
 export const defaultExpression = {
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
index 6fed2cd65595..c7cb031b7551 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import React, { ChangeEvent, useCallback, useEffect, useMemo, useState } from 'react';
 import {
   EuiAccordion,
   EuiButtonEmpty,
@@ -21,7 +21,6 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { debounce } from 'lodash';
-import React, { ChangeEvent, useCallback, useEffect, useMemo, useState } from 'react';
 import {
   ForLastExpression,
   IErrorObject,
@@ -43,7 +42,7 @@ const FILTER_TYPING_DEBOUNCE_MS = 500;
 
 type Props = Omit<
   RuleTypeParamsExpressionProps<RuleTypeParams & AlertParams, AlertContextMeta>,
-  'defaultActionGroupId' | 'actionGroups' | 'charts' | 'data'
+  'defaultActionGroupId' | 'actionGroups' | 'charts' | 'data' | 'unifiedSearch'
 >;
 
 const defaultExpression = {
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
index 706e8a98e997..f9f352c23569 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
@@ -9,7 +9,7 @@ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { Query } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
 import React, { useContext } from 'react';
-import { QueryStringInput } from '../../../../../../../src/plugins/data/public';
+import { QueryStringInput } from '../../../../../../../src/plugins/unified_search/public';
 import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { LogCustomizationMenu } from '../../../components/logging/log_customization_menu';
 import { LogDatepicker } from '../../../components/logging/log_datepicker';
diff --git a/x-pack/plugins/infra/tsconfig.json b/x-pack/plugins/infra/tsconfig.json
index b45bd15adb3f..b508b8fb6da8 100644
--- a/x-pack/plugins/infra/tsconfig.json
+++ b/x-pack/plugins/infra/tsconfig.json
@@ -31,6 +31,7 @@
     { "path": "../ml/tsconfig.json" },
     { "path": "../observability/tsconfig.json" },
     { "path": "../spaces/tsconfig.json" },
-    { "path": "../triggers_actions_ui/tsconfig.json" }
+    { "path": "../triggers_actions_ui/tsconfig.json" },
+    { "path": "../../../src/plugins/unified_search/tsconfig.json" }
   ]
 }
diff --git a/x-pack/plugins/lens/kibana.json b/x-pack/plugins/lens/kibana.json
index a2093e78f18f..237a25ce78a9 100644
--- a/x-pack/plugins/lens/kibana.json
+++ b/x-pack/plugins/lens/kibana.json
@@ -41,6 +41,7 @@
     "common/constants"
   ],
   "requiredBundles": [
+    "unifiedSearch",
     "savedObjects",
     "kibanaUtils",
     "kibanaReact",
@@ -52,4 +53,4 @@
     "githubTeam": "kibana-vis-editors"
   },
   "description": "Visualization editor allowing to quickly and easily configure compelling visualizations to use on dashboards and canvas workpads. Exposes components to embed visualizations and link into the Lens editor from within other apps in Kibana."
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.test.tsx
index 9984bc4c22ab..109a3a4c8024 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.test.tsx
@@ -13,14 +13,14 @@ import { createMockedIndexPattern } from '../../../mocks';
 import { FilterPopover } from './filter_popover';
 import { LabelInput } from '../shared_components';
 import { QueryInput } from '../../../query_input';
-import { QueryStringInput } from '../../../../../../../../src/plugins/data/public';
+import { QueryStringInput } from '../../../../../../../../src/plugins/unified_search/public';
 
 jest.mock('.', () => ({
   isQueryValid: () => true,
   defaultLabel: 'label',
 }));
 
-jest.mock('../../../../../../../../src/plugins/data/public', () => ({
+jest.mock('../../../../../../../../src/plugins/unified_search/public', () => ({
   QueryStringInput: () => {
     return 'QueryStringInput';
   },
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.test.tsx
index 5a3700c165d2..7be85ddc997f 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.test.tsx
@@ -288,7 +288,7 @@ describe('filters', () => {
   describe('popover param editor', () => {
     // @ts-expect-error
     window['__react-beautiful-dnd-disable-dev-warnings'] = true; // issue with enzyme & react-beautiful-dnd throwing errors: https://github.com/atlassian/react-beautiful-dnd/issues/1593
-    jest.mock('../../../../../../../../src/plugins/data/public', () => ({
+    jest.mock('../../../../../../../../src/plugins/unified_search/public', () => ({
       QueryStringInput: () => {
         return 'QueryStringInput';
       },
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx
index 2379ca8808be..abb0712cd04d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx
@@ -8,7 +8,8 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { isEqual } from 'lodash';
-import { QueryStringInput, Query } from '../../../../../src/plugins/data/public';
+import { Query } from '../../../../../src/plugins/data/public';
+import { QueryStringInput } from '../../../../../src/plugins/unified_search/public';
 import { useDebouncedValue } from '../shared_components';
 
 export const QueryInput = ({
diff --git a/x-pack/plugins/lens/tsconfig.json b/x-pack/plugins/lens/tsconfig.json
index eae553601231..380d387249e1 100644
--- a/x-pack/plugins/lens/tsconfig.json
+++ b/x-pack/plugins/lens/tsconfig.json
@@ -6,41 +6,35 @@
     "declaration": true,
     "declarationMap": true
   },
-  "include": [
-    "*.ts",
-    "common/**/*",
-    "public/**/*",
-    "server/**/*",
-    "../../../typings/**/*"
-  ],
+  "include": ["*.ts", "common/**/*", "public/**/*", "server/**/*", "../../../typings/**/*"],
   "references": [
     { "path": "../spaces/tsconfig.json" },
     { "path": "../../../src/core/tsconfig.json" },
     { "path": "../task_manager/tsconfig.json" },
-    { "path": "../global_search/tsconfig.json"},
-    { "path": "../saved_objects_tagging/tsconfig.json"},
-    { "path": "../../../src/plugins/data/tsconfig.json"},
-    { "path": "../../../src/plugins/data_views/tsconfig.json"},
-    { "path": "../../../src/plugins/data_view_field_editor/tsconfig.json"},
-    { "path": "../../../src/plugins/charts/tsconfig.json"},
-    { "path": "../../../src/plugins/expressions/tsconfig.json"},
+    { "path": "../global_search/tsconfig.json" },
+    { "path": "../saved_objects_tagging/tsconfig.json" },
+    { "path": "../../../src/plugins/data/tsconfig.json" },
+    { "path": "../../../src/plugins/data_views/tsconfig.json" },
+    { "path": "../../../src/plugins/data_view_field_editor/tsconfig.json" },
+    { "path": "../../../src/plugins/charts/tsconfig.json" },
+    { "path": "../../../src/plugins/expressions/tsconfig.json" },
     { "path": "../../../src/plugins/navigation/tsconfig.json" },
     { "path": "../../../src/plugins/url_forwarding/tsconfig.json" },
     { "path": "../../../src/plugins/visualizations/tsconfig.json" },
     { "path": "../../../src/plugins/dashboard/tsconfig.json" },
     { "path": "../../../src/plugins/ui_actions/tsconfig.json" },
-    { "path": "../../../src/plugins/embeddable/tsconfig.json" },
     { "path": "../../../src/plugins/share/tsconfig.json" },
     { "path": "../../../src/plugins/usage_collection/tsconfig.json" },
-    { "path": "../../../src/plugins/saved_objects/tsconfig.json"},
+    { "path": "../../../src/plugins/saved_objects/tsconfig.json" },
     { "path": "../../../src/plugins/kibana_utils/tsconfig.json" },
     { "path": "../../../src/plugins/kibana_react/tsconfig.json" },
-    { "path": "../../../src/plugins/embeddable/tsconfig.json"},
-    { "path": "../../../src/plugins/presentation_util/tsconfig.json"},
-    { "path": "../../../src/plugins/field_formats/tsconfig.json"},
-    { "path": "../../../src/plugins/chart_expressions/expression_xy/tsconfig.json"},
-    { "path": "../../../src/plugins/chart_expressions/expression_heatmap/tsconfig.json"},
-    { "path": "../../../src/plugins/chart_expressions/expression_gauge/tsconfig.json"},
-    { "path": "../../../src/plugins/event_annotation/tsconfig.json" }
+    { "path": "../../../src/plugins/embeddable/tsconfig.json" },
+    { "path": "../../../src/plugins/presentation_util/tsconfig.json" },
+    { "path": "../../../src/plugins/field_formats/tsconfig.json" },
+    { "path": "../../../src/plugins/chart_expressions/expression_xy/tsconfig.json" },
+    { "path": "../../../src/plugins/chart_expressions/expression_heatmap/tsconfig.json" },
+    { "path": "../../../src/plugins/chart_expressions/expression_gauge/tsconfig.json" },
+    { "path": "../../../src/plugins/event_annotation/tsconfig.json" },
+    { "path": "../../../src/plugins/unified_search/tsconfig.json" }
   ]
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/maps/kibana.json b/x-pack/plugins/maps/kibana.json
index a3264a406b75..5a2d1410c8eb 100644
--- a/x-pack/plugins/maps/kibana.json
+++ b/x-pack/plugins/maps/kibana.json
@@ -8,6 +8,7 @@
   "kibanaVersion": "kibana",
   "configPath": ["xpack", "maps"],
   "requiredPlugins": [
+    "unifiedSearch",
     "lens",
     "licensing",
     "features",
@@ -45,6 +46,7 @@
     "kibanaReact",
     "kibanaUtils",
     "usageCollection",
-    "home"
+    "home",
+    "unifiedSearch"
   ]
 }
diff --git a/x-pack/plugins/maps/public/components/draw_forms/distance_filter_form.tsx b/x-pack/plugins/maps/public/components/draw_forms/distance_filter_form.tsx
index ed2b79d911ca..8089a2e3e50c 100644
--- a/x-pack/plugins/maps/public/components/draw_forms/distance_filter_form.tsx
+++ b/x-pack/plugins/maps/public/components/draw_forms/distance_filter_form.tsx
@@ -17,7 +17,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
 import { ActionSelect } from '../action_select';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../src/plugins/data/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../src/plugins/unified_search/public';
 
 interface Props {
   className?: string;
diff --git a/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/geometry_filter_form.tsx b/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/geometry_filter_form.tsx
index 47dd75ca9941..24c9082e7c4b 100644
--- a/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/geometry_filter_form.tsx
+++ b/x-pack/plugins/maps/public/components/draw_forms/geometry_filter_form/geometry_filter_form.tsx
@@ -20,7 +20,7 @@ import { i18n } from '@kbn/i18n';
 import { ES_SPATIAL_RELATIONS } from '../../../../common/constants';
 import { getEsSpatialRelationLabel } from '../../../../common/i18n_getters';
 import { ActionSelect } from '../../action_select';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../src/plugins/data/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../src/plugins/unified_search/public';
 import { Action, ActionExecutionContext } from '../../../../../../../src/plugins/ui_actions/public';
 
 interface Props {
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/filter_editor.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/filter_editor.tsx
index 07550c76b089..79e3ce446722 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/filter_editor.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/filter_editor/filter_editor.tsx
@@ -25,7 +25,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import type { DataView, Query } from 'src/plugins/data/common';
 import { APP_ID } from '../../../../common/constants';
-import { getIndexPatternService, getData } from '../../../kibana_services';
+import { getIndexPatternService, getData, getSearchBar } from '../../../kibana_services';
 import { GlobalFilterCheckbox } from '../../../components/global_filter_checkbox';
 import { GlobalTimeCheckbox } from '../../../components/global_time_checkbox';
 import { ILayer } from '../../../classes/layers/layer';
@@ -122,7 +122,7 @@ export class FilterEditor extends Component<Props, State> {
 
   _renderQueryPopover() {
     const layerQuery = this.props.layer.getQuery();
-    const { SearchBar } = getData().ui;
+    const SearchBar = getSearchBar();
 
     return (
       <EuiPopover
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/where_expression.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/where_expression.tsx
index 883be0e890cb..79effb98f2c9 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/where_expression.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/where_expression.tsx
@@ -11,7 +11,7 @@ import { EuiButton, EuiPopover, EuiExpression, EuiFormHelpText } from '@elastic/
 import { FormattedMessage } from '@kbn/i18n-react';
 import { DataView, Query } from 'src/plugins/data/common';
 import { APP_ID } from '../../../../../common/constants';
-import { getData } from '../../../../kibana_services';
+import { getData, getSearchBar } from '../../../../kibana_services';
 
 interface Props {
   indexPattern: DataView;
@@ -46,7 +46,7 @@ export class WhereExpression extends Component<Props, State> {
   };
 
   render() {
-    const { SearchBar } = getData().ui;
+    const SearchBar = getSearchBar();
     const { whereQuery, indexPattern } = this.props;
     const expressionValue =
       whereQuery && whereQuery.query
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_geometry_filter_form.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_geometry_filter_form.tsx
index 89680078cf1e..97186854a44d 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_geometry_filter_form.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_geometry_filter_form.tsx
@@ -13,7 +13,7 @@ import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
 import { Geometry, Polygon } from 'geojson';
 import rison, { RisonObject } from 'rison-node';
 import { URL_MAX_LENGTH } from '../../../../../../../../src/core/public';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../../src/plugins/data/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../../src/plugins/unified_search/public';
 import {
   createSpatialFilterWithGeometry,
   PreIndexedShape,
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.test.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.test.tsx
index 3c7278a38717..ab505bc02327 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { FeatureProperties } from './feature_properties';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../../src/plugins/data/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../../src/plugins/unified_search/public';
 import { ITooltipProperty } from '../../../../classes/tooltips/tooltip_property';
 import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
 
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx
index 25e1a69805d9..edd2802a7eea 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx
@@ -19,7 +19,7 @@ import { i18n } from '@kbn/i18n';
 import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
 import { GeoJsonProperties } from 'geojson';
 import { Filter } from '@kbn/es-query';
-import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../../src/plugins/data/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../../src/plugins/unified_search/public';
 import { isUrlDrilldown } from '../../../../trigger_actions/trigger_utils';
 import { RawValue } from '../../../../../common/constants';
 import { ITooltipProperty } from '../../../../classes/tooltips/tooltip_property';
diff --git a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
index 54d6d546ee46..5485e6e7ce73 100644
--- a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
+++ b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
@@ -25,12 +25,8 @@ import {
   omitGenericEmbeddableInput,
 } from '../../../../../src/plugins/embeddable/public';
 import { ActionExecutionContext } from '../../../../../src/plugins/ui_actions/public';
-import {
-  ACTION_GLOBAL_APPLY_FILTER,
-  APPLY_FILTER_TRIGGER,
-  TimeRange,
-  Query,
-} from '../../../../../src/plugins/data/public';
+import { APPLY_FILTER_TRIGGER, TimeRange, Query } from '../../../../../src/plugins/data/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../src/plugins/unified_search/public';
 import { createExtentFilter } from '../../common/elasticsearch_util';
 import {
   replaceLayerList,
diff --git a/x-pack/plugins/maps/public/kibana_services.ts b/x-pack/plugins/maps/public/kibana_services.ts
index 88338dd508ee..8d7492829c40 100644
--- a/x-pack/plugins/maps/public/kibana_services.ts
+++ b/x-pack/plugins/maps/public/kibana_services.ts
@@ -37,7 +37,9 @@ export const getInspector = () => pluginsStart.inspector;
 export const getFileUpload = () => pluginsStart.fileUpload;
 export const getUiSettings = () => coreStart.uiSettings;
 export const getIsDarkMode = () => getUiSettings().get('theme:darkMode', false);
-export const getIndexPatternSelectComponent = () => pluginsStart.data.ui.IndexPatternSelect;
+export const getIndexPatternSelectComponent = () =>
+  pluginsStart.unifiedSearch.ui.IndexPatternSelect;
+export const getSearchBar = () => pluginsStart.unifiedSearch.ui.SearchBar;
 export const getHttp = () => coreStart.http;
 export const getExecutionContext = () => coreStart.executionContext;
 export const getTimeFilter = () => pluginsStart.data.query.timefilter.timefilter;
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
index bef5cd7039f7..2aa661f2c466 100644
--- a/x-pack/plugins/maps/public/plugin.ts
+++ b/x-pack/plugins/maps/public/plugin.ts
@@ -52,6 +52,7 @@ import { registerSource } from './classes/sources/source_registry';
 import type { SharePluginSetup, SharePluginStart } from '../../../../src/plugins/share/public';
 import type { MapsEmsPluginPublicStart } from '../../../../src/plugins/maps_ems/public';
 import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
+import type { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
 import type { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/public';
 import type { FileUploadPluginStart } from '../../file_upload/public';
 import type { SavedObjectsStart } from '../../../../src/plugins/saved_objects/public';
@@ -95,6 +96,7 @@ export interface MapsPluginSetupDependencies {
 export interface MapsPluginStartDependencies {
   charts: ChartsPluginStart;
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   embeddable: EmbeddableStart;
   fieldFormats: FieldFormatsStart;
   fileUpload: FileUploadPluginStart;
diff --git a/x-pack/plugins/maps/tsconfig.json b/x-pack/plugins/maps/tsconfig.json
index fbbc9cae2e3c..1c8951a6cae3 100644
--- a/x-pack/plugins/maps/tsconfig.json
+++ b/x-pack/plugins/maps/tsconfig.json
@@ -39,6 +39,7 @@
     { "path": "../file_upload/tsconfig.json" },
     { "path": "../saved_objects_tagging/tsconfig.json" },
     { "path": "../security/tsconfig.json" },
-    { "path": "../spaces/tsconfig.json" }
+    { "path": "../spaces/tsconfig.json" },
+    { "path": "../../../src/plugins/unified_search/tsconfig.json" }
   ]
 }
diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json
index 71a1b0b489c9..ffba908dcfe8 100644
--- a/x-pack/plugins/ml/kibana.json
+++ b/x-pack/plugins/ml/kibana.json
@@ -45,7 +45,8 @@
     "kibanaUtils",
     "maps",
     "savedObjects",
-    "usageCollection"
+    "usageCollection",
+    "unifiedSearch"
   ],
   "extraPublicDirs": [
     "common"
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
index f57ce0a8902f..5d8ffd2229d0 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
@@ -14,7 +14,8 @@ import { fromKueryExpression, luceneStringToDsl, toElasticsearchQuery } from '@k
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Dictionary } from '../../../../../../../common/types/common';
 import { DataView } from '../../../../../../../../../../src/plugins/data_views/common';
-import { Query, QueryStringInput } from '../../../../../../../../../../src/plugins/data/public';
+import { Query } from '../../../../../../../../../../src/plugins/data/public';
+import { QueryStringInput } from '../../../../../../../../../../src/plugins/unified_search/public';
 
 import {
   SEARCH_QUERY_LANGUAGE,
diff --git a/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
index afdef906c416..14ddcc7b92dd 100644
--- a/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
@@ -9,7 +9,8 @@ import React, { FC, useState, useEffect } from 'react';
 import { EuiCode, EuiInputPopover } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { fromKueryExpression, luceneStringToDsl, toElasticsearchQuery } from '@kbn/es-query';
-import { Query, QueryStringInput } from '../../../../../../../../src/plugins/data/public';
+import { Query } from '../../../../../../../../src/plugins/data/public';
+import { QueryStringInput } from '../../../../../../../../src/plugins/unified_search/public';
 import type { DataView } from '../../../../../../../../src/plugins/data_views/common';
 import { SEARCH_QUERY_LANGUAGE, ErrorMessage } from '../../../../../common/constants/search';
 import { InfluencersFilterQuery } from '../../../../../common/types/es_client';
diff --git a/x-pack/plugins/ml/tsconfig.json b/x-pack/plugins/ml/tsconfig.json
index 87ba8c50c3a8..a937586369ef 100644
--- a/x-pack/plugins/ml/tsconfig.json
+++ b/x-pack/plugins/ml/tsconfig.json
@@ -30,6 +30,7 @@
     { "path": "../security/tsconfig.json" },
     { "path": "../spaces/tsconfig.json" },
     { "path": "../alerting/tsconfig.json" },
-    { "path": "../triggers_actions_ui/tsconfig.json" }
+    { "path": "../triggers_actions_ui/tsconfig.json" },
+    { "path": "../../../src/plugins/unified_search/tsconfig.json" }
   ]
 }
diff --git a/x-pack/plugins/observability/kibana.json b/x-pack/plugins/observability/kibana.json
index 8eb86125017b..2ba9572dfd24 100644
--- a/x-pack/plugins/observability/kibana.json
+++ b/x-pack/plugins/observability/kibana.json
@@ -29,11 +29,13 @@
     "ruleRegistry",
     "timelines",
     "triggersActionsUi",
-    "inspector"
+    "inspector",
+    "unifiedSearch"
   ],
   "ui": true,
   "server": true,
   "requiredBundles": [
+    "unifiedSearch",
     "data",
     "dataViews",
     "embeddable",
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx
index 0757d7a9eadf..36964e32eb8e 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/rtl_helpers.tsx
@@ -43,11 +43,11 @@ import * as useValuesListHook from '../../../hooks/use_values_list';
 
 import dataViewData from './configurations/test_data/test_data_view.json';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { setIndexPatterns } from '../../../../../../../src/plugins/data/public/services';
+import { setIndexPatterns } from '../../../../../../../src/plugins/unified_search/public/services';
 import type {
   DataView,
   DataViewsContract,
-} from '../../../../../../../src/plugins/data_views/common';
+} from '../../../../../../../src/plugins/data_views/public';
 
 import { AppDataType, SeriesUrl, UrlFilter } from './types';
 import { createStubDataView } from '../../../../../../../src/plugins/data_views/common/stubs';
@@ -151,7 +151,6 @@ export function MockKibanaProvider<ExtraCore extends Partial<CoreStart>>({
   kibanaProps,
 }: MockKibanaProviderProps<ExtraCore>) {
   const dataView = mockDataView;
-
   setIndexPatterns({
     ...[dataView],
     get: async () => dataView,
diff --git a/x-pack/plugins/observability/public/components/shared/filter_value_label/filter_value_label.tsx b/x-pack/plugins/observability/public/components/shared/filter_value_label/filter_value_label.tsx
index f7cfe7b848fc..d65c64fab3e5 100644
--- a/x-pack/plugins/observability/public/components/shared/filter_value_label/filter_value_label.tsx
+++ b/x-pack/plugins/observability/public/components/shared/filter_value_label/filter_value_label.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { injectI18n } from '@kbn/i18n-react';
 import { Filter, buildPhrasesFilter, buildPhraseFilter } from '@kbn/es-query';
-import { FilterItem } from '../../../../../../../src/plugins/data/public';
+import { FilterItem } from '../../../../../../../src/plugins/unified_search/public';
 import type { DataView } from '../../../../../../../src/plugins/data_views/common';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
diff --git a/x-pack/plugins/observability/public/pages/alerts/components/alerts_search_bar.tsx b/x-pack/plugins/observability/public/pages/alerts/components/alerts_search_bar.tsx
index b4058a1befc0..87c422a45de0 100644
--- a/x-pack/plugins/observability/public/pages/alerts/components/alerts_search_bar.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/components/alerts_search_bar.tsx
@@ -7,7 +7,8 @@
 
 import { DataViewBase } from '@kbn/es-query';
 import React, { useMemo, useState } from 'react';
-import { SearchBar, TimeHistory } from '../../../../../../../src/plugins/data/public';
+import { TimeHistory } from '../../../../../../../src/plugins/data/public';
+import { SearchBar } from '../../../../../../../src/plugins/unified_search/public';
 import { Storage } from '../../../../../../../src/plugins/kibana_utils/public';
 import { translations } from '../../../config';
 
diff --git a/x-pack/plugins/observability/tsconfig.json b/x-pack/plugins/observability/tsconfig.json
index dc935f3f7778..16b9fc98a64d 100644
--- a/x-pack/plugins/observability/tsconfig.json
+++ b/x-pack/plugins/observability/tsconfig.json
@@ -28,6 +28,7 @@
     { "path": "../rule_registry/tsconfig.json" },
     { "path": "../spaces/tsconfig.json" },
     { "path": "../timelines/tsconfig.json"},
-    { "path": "../translations/tsconfig.json" }
+    { "path": "../translations/tsconfig.json" },
+    { "path":  "../../../src/plugins/unified_search/tsconfig.json"}
   ]
 }
diff --git a/x-pack/plugins/security_solution/kibana.json b/x-pack/plugins/security_solution/kibana.json
index cf13586a1a03..faece05732b7 100644
--- a/x-pack/plugins/security_solution/kibana.json
+++ b/x-pack/plugins/security_solution/kibana.json
@@ -27,6 +27,7 @@
     "timelines",
     "triggersActionsUi",
     "uiActions",
+    "unifiedSearch",
     "sessionView"
   ],
   "optionalPlugins": [
diff --git a/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx
index 49275e714ce8..63e90848483c 100644
--- a/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx
@@ -11,7 +11,8 @@ import { render, waitFor } from '@testing-library/react';
 import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { DEFAULT_FROM, DEFAULT_TO } from '../../../../common/constants';
 import { TestProviders, mockIndexPattern } from '../../mock';
-import { FilterManager, SearchBar } from '../../../../../../../src/plugins/data/public';
+import { FilterManager } from '../../../../../../../src/plugins/data/public';
+import { SearchBar } from '../../../../../../../src/plugins/unified_search/public';
 import { QueryBar, QueryBarComponentProps } from '.';
 
 const mockUiSettingsForFilterManager = coreMock.createStart().uiSettings;
diff --git a/x-pack/plugins/security_solution/public/common/components/query_bar/index.tsx b/x-pack/plugins/security_solution/public/common/components/query_bar/index.tsx
index 18f60db89595..c82a42b5e2e0 100644
--- a/x-pack/plugins/security_solution/public/common/components/query_bar/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/query_bar/index.tsx
@@ -14,9 +14,9 @@ import {
   TimeHistory,
   TimeRange,
   SavedQuery,
-  SearchBar,
   SavedQueryTimeFilter,
 } from '../../../../../../../src/plugins/data/public';
+import { SearchBar } from '../../../../../../../src/plugins/unified_search/public';
 import { Storage } from '../../../../../../../src/plugins/kibana_utils/public';
 
 export interface QueryBarComponentProps {
diff --git a/x-pack/plugins/security_solution/public/common/components/search_bar/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/search_bar/index.test.tsx
index 749156425bb1..9d24114688e7 100644
--- a/x-pack/plugins/security_solution/public/common/components/search_bar/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/search_bar/index.test.tsx
@@ -26,6 +26,8 @@ jest.mock('../../lib/kibana', () => {
             ...original.useKibana().services.data.query,
             filterManager: mockFilterManager,
           },
+        },
+        unifiedSearch: {
           ui: {
             SearchBar: jest.fn().mockImplementation((props) => (
               <button
diff --git a/x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx b/x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx
index b25db8470a42..aeef2dbfb40d 100644
--- a/x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx
@@ -83,9 +83,11 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
           timefilter: { timefilter },
           filterManager,
         },
-        ui: { SearchBar },
       },
       storage,
+      unifiedSearch: {
+        ui: { SearchBar },
+      },
     } = useKibana().services;
 
     useEffect(() => {
diff --git a/x-pack/plugins/security_solution/public/common/lib/kibana/services.ts b/x-pack/plugins/security_solution/public/common/lib/kibana/services.ts
index 30bd3d6e5989..5a2619a00417 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kibana/services.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/services.ts
@@ -9,7 +9,7 @@ import { CoreStart } from '../../../../../../../src/core/public';
 import { StartPlugins } from '../../../types';
 
 type GlobalServices = Pick<CoreStart, 'http' | 'uiSettings' | 'notifications'> &
-  Pick<StartPlugins, 'data'>;
+  Pick<StartPlugins, 'data' | 'unifiedSearch'>;
 
 export class KibanaServices {
   private static kibanaVersion?: string;
@@ -18,11 +18,12 @@ export class KibanaServices {
   public static init({
     http,
     data,
+    unifiedSearch,
     kibanaVersion,
     uiSettings,
     notifications,
   }: GlobalServices & { kibanaVersion: string }) {
-    this.services = { data, http, uiSettings, notifications };
+    this.services = { data, http, uiSettings, unifiedSearch, notifications };
     this.kibanaVersion = kibanaVersion;
   }
 
diff --git a/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts b/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts
index 947a26d48322..5e296d4bb30e 100644
--- a/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/endpoint/dependencies_start_mock.ts
@@ -10,7 +10,9 @@ import {
   dataPluginMock,
   Start as DataPublicStartMock,
 } from '../../../../../../../src/plugins/data/public/mocks';
+import type { UnifiedSearchPublicPluginStart } from '../../../../../../../src/plugins/unified_search/public';
 import { fleetMock } from '../../../../../fleet/public/mocks';
+import { unifiedSearchPluginMock } from '../../../../../../../src/plugins/unified_search/public/mocks';
 
 type DataMock = Omit<DataPublicStartMock, 'indexPatterns' | 'query'> & {
   indexPatterns: Omit<DataPublicStartMock['indexPatterns'], 'getFieldsForWildcard'> & {
@@ -25,9 +27,6 @@ type DataMock = Omit<DataPublicStartMock, 'indexPatterns' | 'query'> & {
       getUpdates$: jest.Mock;
     };
   };
-  ui: DataPublicStartMock['ui'] & {
-    SearchBar: jest.Mock;
-  };
 };
 
 /**
@@ -36,6 +35,7 @@ type DataMock = Omit<DataPublicStartMock, 'indexPatterns' | 'query'> & {
 export interface DepsStartMock {
   data: DataMock;
   fleet: FleetStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
 }
 
 /**
@@ -54,10 +54,10 @@ export const depsStartMock: () => DepsStartMock = () => {
       }),
     };
   }) as DataMock['query']['filterManager']['getUpdates$'];
-  dataMock.ui.SearchBar = jest.fn();
 
   return {
     data: dataMock,
+    unifiedSearch: unifiedSearchPluginMock.createStartContract(),
     fleet: fleetMock.createStartMock(),
   };
 };
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx
index 7c345c3e07a2..2e34935d0f28 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx
@@ -10,11 +10,8 @@ import { mount, shallow } from 'enzyme';
 import { EuiLoadingSpinner } from '@elastic/eui';
 
 import { coreMock } from '../../../../../../../../src/core/public/mocks';
-import {
-  FilterManager,
-  UI_SETTINGS,
-  FilterLabel,
-} from '../../../../../../../../src/plugins/data/public';
+import { FilterManager, UI_SETTINGS } from '../../../../../../../../src/plugins/data/public';
+import { FilterLabel } from '../../../../../../../../src/plugins/unified_search/public';
 import { DataViewBase, FilterStateStore } from '@kbn/es-query';
 import { SeverityBadge } from '../severity_badge';
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx
index 78a739fd879b..22f2ab5b93ee 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx
@@ -29,11 +29,8 @@ import { assertUnreachable } from '../../../../../common/utility_types';
 import * as i18nSeverity from '../severity_mapping/translations';
 import * as i18nRiskScore from '../risk_score_mapping/translations';
 import { Threshold } from '../../../../../common/detection_engine/schemas/common/schemas';
-import {
-  getDisplayValueFromFilter,
-  FilterLabel,
-} from '../../../../../../../../src/plugins/data/public';
-
+import { getDisplayValueFromFilter } from '../../../../../../../../src/plugins/data/public';
+import { FilterLabel } from '../../../../../../../../src/plugins/unified_search/public';
 import {
   subtechniquesOptions,
   tacticsOptions,
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/search_bar.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/search_bar.tsx
index cc37f220fb53..acb86cb40320 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/search_bar.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/search_bar.tsx
@@ -10,7 +10,8 @@ import { useHistory } from 'react-router-dom';
 import { encode, RisonValue } from 'rison-node';
 import styled from 'styled-components';
 import type { Query } from '@kbn/es-query';
-import { SearchBar, TimeHistory } from '../../../../../../../../../src/plugins/data/public';
+import { TimeHistory } from '../../../../../../../../../src/plugins/data/public';
+import { SearchBar } from '../../../../../../../../../src/plugins/unified_search/public';
 import { Storage } from '../../../../../../../../../src/plugins/kibana_utils/public';
 import { urlFromQueryParams } from '../url_from_query_params';
 import { useEndpointSelector } from '../hooks';
diff --git a/x-pack/plugins/security_solution/public/types.ts b/x-pack/plugins/security_solution/public/types.ts
index 8dbed22a54ba..05538a1ecbb3 100644
--- a/x-pack/plugins/security_solution/public/types.ts
+++ b/x-pack/plugins/security_solution/public/types.ts
@@ -43,6 +43,7 @@ import type { Management } from './management';
 import type { LicensingPluginStart, LicensingPluginSetup } from '../../licensing/public';
 import type { DashboardStart } from '../../../../src/plugins/dashboard/public';
 import type { IndexPatternFieldEditorStart } from '../../../../src/plugins/data_view_field_editor/public';
+import { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
 
 export interface SetupPlugins {
   home?: HomePublicPluginSetup;
@@ -56,6 +57,7 @@ export interface SetupPlugins {
 export interface StartPlugins {
   cases: CasesUiStart;
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
   dashboard?: DashboardStart;
   embeddable: EmbeddableStart;
   inspector: InspectorStart;
diff --git a/x-pack/plugins/security_solution/tsconfig.json b/x-pack/plugins/security_solution/tsconfig.json
index e6b5a7954045..95aaeffad7f7 100644
--- a/x-pack/plugins/security_solution/tsconfig.json
+++ b/x-pack/plugins/security_solution/tsconfig.json
@@ -28,6 +28,7 @@
     { "path": "../../../src/plugins/telemetry/tsconfig.json" },
     { "path": "../../../src/plugins/telemetry_management_section/tsconfig.json" },
     { "path": "../../../src/plugins/data_view_field_editor/tsconfig.json" },
+    { "path": "../../../src/plugins/unified_search/tsconfig.json" },
     { "path": "../actions/tsconfig.json" },
     { "path": "../alerting/tsconfig.json" },
     { "path": "../cases/tsconfig.json" },
diff --git a/x-pack/plugins/stack_alerts/kibana.json b/x-pack/plugins/stack_alerts/kibana.json
index f70ad679deef..abafba8010fb 100644
--- a/x-pack/plugins/stack_alerts/kibana.json
+++ b/x-pack/plugins/stack_alerts/kibana.json
@@ -8,6 +8,7 @@
   "version": "8.2.0",
   "kibanaVersion": "kibana",
   "requiredPlugins": [
+    "unifiedSearch",
     "alerting",
     "features",
     "triggersActionsUi",
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.test.tsx
index 3cddd1ef112f..e35706ce2571 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/es_query_expression.test.tsx
@@ -11,6 +11,7 @@ import { of } from 'rxjs';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import { act } from 'react-dom/test-utils';
 import { dataPluginMock } from 'src/plugins/data/public/mocks';
+import { unifiedSearchPluginMock } from 'src/plugins/unified_search/public/mocks';
 import { chartPluginMock } from 'src/plugins/charts/public/mocks';
 import {
   DataPublicPluginStart,
@@ -98,6 +99,7 @@ const createDataPluginMock = () => {
 };
 
 const dataMock = createDataPluginMock();
+const unifiedSearchMock = unifiedSearchPluginMock.createStartContract();
 const chartsStartMock = chartPluginMock.createStartContract();
 
 const defaultEsQueryExpressionParams: EsQueryAlertParams<SearchType.esQuery> = {
@@ -139,6 +141,7 @@ describe('EsQueryAlertTypeExpression', () => {
 
     const wrapper = mountWithIntl(
       <EsQueryExpression
+        unifiedSearch={unifiedSearchMock}
         ruleInterval="1m"
         ruleThrottle="1m"
         alertNotifyWhen="onThrottleInterval"
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/read_only_filter_items.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/read_only_filter_items.tsx
index b4b0c6ae9ac5..c10e76391b03 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/read_only_filter_items.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/read_only_filter_items.tsx
@@ -10,11 +10,9 @@ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { injectI18n } from '@kbn/i18n-react';
 
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-import {
-  FilterItem,
-  getDisplayValueFromFilter,
-} from '../../../../../../../src/plugins/data/public';
+import { getDisplayValueFromFilter } from '../../../../../../../src/plugins/data/public';
 import { Filter, IIndexPattern } from '../../../../../../../src/plugins/data/common';
+import { FilterItem } from '../../../../../../../src/plugins/unified_search/public';
 
 const FilterItemComponent = injectI18n(FilterItem);
 
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.test.tsx
index 4b18a5a5f96a..1751e52da3ce 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression/search_source_expression.test.tsx
@@ -8,6 +8,7 @@
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 import React from 'react';
 import { dataPluginMock } from 'src/plugins/data/public/mocks';
+import { unifiedSearchPluginMock } from 'src/plugins/unified_search/public/mocks';
 import { DataPublicPluginStart, ISearchStart } from 'src/plugins/data/public';
 import { EsQueryAlertParams, SearchType } from '../types';
 import { SearchSourceExpression } from './search_source_expression';
@@ -21,6 +22,7 @@ const dataMock = dataPluginMock.createStartContract() as DataPublicPluginStart &
   search: ISearchStart & { searchSource: { create: jest.MockedFunction<any> } };
 };
 const chartsStartMock = chartPluginMock.createStartContract();
+const unifiedSearchMock = unifiedSearchPluginMock.createStartContract();
 
 const defaultSearchSourceExpressionParams: EsQueryAlertParams<SearchType.searchSource> = {
   size: 100,
@@ -60,6 +62,7 @@ const setup = async (alertParams: EsQueryAlertParams<SearchType.searchSource>) =
       setRuleParams={() => {}}
       setRuleProperty={() => {}}
       errors={errors}
+      unifiedSearch={unifiedSearchMock}
       data={dataMock}
       defaultActionGroupId=""
       actionGroups={[]}
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/boundary_index_expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/boundary_index_expression.tsx
index 99a53d053199..1a44da5fdee5 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/boundary_index_expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/boundary_index_expression.tsx
@@ -9,6 +9,7 @@ import React, { Fragment, FunctionComponent, useEffect, useRef } from 'react';
 import { EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
+import { UnifiedSearchPublicPluginStart } from 'src/plugins/unified_search/public';
 import { HttpSetup } from 'kibana/public';
 import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { IErrorObject } from '../../../../../../triggers_actions_ui/public';
@@ -27,6 +28,7 @@ interface Props {
   setBoundaryGeoField: (boundaryGeoField?: string) => void;
   setBoundaryNameField: (boundaryNameField?: string) => void;
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
 }
 
 interface KibanaDeps {
@@ -42,11 +44,12 @@ export const BoundaryIndexExpression: FunctionComponent<Props> = ({
   setBoundaryGeoField,
   setBoundaryNameField,
   data,
+  unifiedSearch,
 }) => {
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const BOUNDARY_NAME_ENTITY_TYPES = ['string', 'number', 'ip'];
   const { http } = useKibana<KibanaDeps>().services;
-  const IndexPatternSelect = (data.ui && data.ui.IndexPatternSelect) || null;
+  const IndexPatternSelect = (unifiedSearch.ui && unifiedSearch.ui.IndexPatternSelect) || null;
   const { boundaryGeoField } = ruleParams;
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const nothingSelected: DataViewField = {
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_index_expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_index_expression.tsx
index 34bbdd413c5a..8b189c59f2af 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_index_expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/expressions/entity_index_expression.tsx
@@ -10,6 +10,7 @@ import { EuiFormRow } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
+import { UnifiedSearchPublicPluginStart } from 'src/plugins/unified_search/public';
 import { HttpSetup } from 'kibana/public';
 import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import {
@@ -33,6 +34,7 @@ interface Props {
   indexPattern: DataView;
   isInvalid: boolean;
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
 }
 
 interface KibanaDeps {
@@ -49,9 +51,10 @@ export const EntityIndexExpression: FunctionComponent<Props> = ({
   dateField: timeField,
   geoField,
   data,
+  unifiedSearch,
 }) => {
   const { http } = useKibana<KibanaDeps>().services;
-  const IndexPatternSelect = (data.ui && data.ui.IndexPatternSelect) || null;
+  const IndexPatternSelect = (unifiedSearch.ui && unifiedSearch.ui.IndexPatternSelect) || null;
 
   const usePrevious = <T extends unknown>(value: T): T | undefined => {
     const ref = useRef<T>();
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/geo_containment_alert_type_expression.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/geo_containment_alert_type_expression.test.tsx
index fb44cffe292a..4d8b2a7dcd93 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/geo_containment_alert_type_expression.test.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/geo_containment_alert_type_expression.test.tsx
@@ -12,8 +12,10 @@ import { BoundaryIndexExpression } from './expressions/boundary_index_expression
 import { IErrorObject } from '../../../../../triggers_actions_ui/public';
 import { DataView } from '../../../../../../../src/plugins/data/common';
 import { dataPluginMock } from 'src/plugins/data/public/mocks';
+import { unifiedSearchPluginMock } from 'src/plugins/unified_search/public/mocks';
 
 const dataStartMock = dataPluginMock.createStartContract();
+const unifiedSearchStartMock = unifiedSearchPluginMock.createStartContract();
 
 const alertParams = {
   index: '',
@@ -40,6 +42,7 @@ test('should render EntityIndexExpression', async () => {
       indexPattern={'' as unknown as DataView}
       isInvalid={false}
       data={dataStartMock}
+      unifiedSearch={unifiedSearchStartMock}
     />
   );
 
@@ -59,6 +62,7 @@ test('should render EntityIndexExpression w/ invalid flag if invalid', async ()
       indexPattern={'' as unknown as DataView}
       isInvalid={true}
       data={dataStartMock}
+      unifiedSearch={unifiedSearchStartMock}
     />
   );
 
@@ -76,6 +80,7 @@ test('should render BoundaryIndexExpression', async () => {
       setBoundaryNameField={() => {}}
       boundaryNameField={'testNameField'}
       data={dataStartMock}
+      unifiedSearch={unifiedSearchStartMock}
     />
   );
 
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/index.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/index.tsx
index 27b87546acd6..5196834bc404 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/index.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/index.tsx
@@ -16,7 +16,8 @@ import { EntityIndexExpression } from './expressions/entity_index_expression';
 import { EntityByExpression } from './expressions/entity_by_expression';
 import { BoundaryIndexExpression } from './expressions/boundary_index_expression';
 import { DataView } from '../../../../../../../src/plugins/data/common';
-import { Query, QueryStringInput } from '../../../../../../../src/plugins/data/public';
+import { Query } from '../../../../../../../src/plugins/data/public';
+import { QueryStringInput } from '../../../../../../../src/plugins/unified_search/public';
 
 const DEFAULT_VALUES = {
   TRACKING_EVENT: '',
@@ -45,7 +46,7 @@ function validateQuery(query: Query) {
 
 export const GeoContainmentAlertTypeExpression: React.FunctionComponent<
   RuleTypeParamsExpressionProps<GeoContainmentAlertParams>
-> = ({ ruleParams, ruleInterval, setRuleParams, setRuleProperty, errors, data }) => {
+> = ({ ruleParams, ruleInterval, setRuleParams, setRuleProperty, errors, data, unifiedSearch }) => {
   const {
     index,
     indexId,
@@ -173,6 +174,7 @@ export const GeoContainmentAlertTypeExpression: React.FunctionComponent<
         indexPattern={indexPattern}
         isInvalid={!indexId || !dateField || !geoField}
         data={data}
+        unifiedSearch={unifiedSearch}
       />
       <EntityByExpression
         errors={errors}
@@ -223,6 +225,7 @@ export const GeoContainmentAlertTypeExpression: React.FunctionComponent<
         }
         boundaryNameField={boundaryNameField}
         data={data}
+        unifiedSearch={unifiedSearch}
       />
       <EuiSpacer size="s" />
       <EuiFlexItem>
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.tsx
index d03f142bd258..33855d94b6f1 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/threshold/expression.tsx
@@ -64,7 +64,7 @@ function indexParamToArray(index: string | string[]): string[] {
 }
 
 export const IndexThresholdAlertTypeExpression: React.FunctionComponent<
-  RuleTypeParamsExpressionProps<IndexThresholdAlertParams>
+  Omit<RuleTypeParamsExpressionProps<IndexThresholdAlertParams>, 'unifiedSearch'>
 > = ({ ruleParams, ruleInterval, setRuleParams, setRuleProperty, errors, charts, data }) => {
   const {
     index,
diff --git a/x-pack/plugins/stack_alerts/tsconfig.json b/x-pack/plugins/stack_alerts/tsconfig.json
index ab3864342e57..9df9ddd06cfe 100644
--- a/x-pack/plugins/stack_alerts/tsconfig.json
+++ b/x-pack/plugins/stack_alerts/tsconfig.json
@@ -20,6 +20,7 @@
     { "path": "../../../src/plugins/kibana_react/tsconfig.json" },
     { "path": "../../../src/plugins/saved_objects/tsconfig.json" },
     { "path": "../../../src/plugins/data/tsconfig.json" },
-    { "path": "../transform/tsconfig.json" }
+    { "path": "../transform/tsconfig.json" },
+    { "path": "../../../src/plugins/unified_search/tsconfig.json" }
   ]
 }
diff --git a/x-pack/plugins/transform/kibana.json b/x-pack/plugins/transform/kibana.json
index f47b018dd1d2..e0d549b634a2 100644
--- a/x-pack/plugins/transform/kibana.json
+++ b/x-pack/plugins/transform/kibana.json
@@ -22,6 +22,7 @@
   ],
   "configPath": ["xpack", "transform"],
   "requiredBundles": [
+    "unifiedSearch",
     "esUiShared",
     "discover",
     "kibanaUtils",
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/source_search_bar/source_search_bar.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/source_search_bar/source_search_bar.tsx
index b20909ec9e12..2b4ab9c09e8c 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/source_search_bar/source_search_bar.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/source_search_bar/source_search_bar.tsx
@@ -11,7 +11,7 @@ import { EuiCode, EuiInputPopover } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-import { QueryStringInput } from '../../../../../../../../../src/plugins/data/public';
+import { QueryStringInput } from '../../../../../../../../../src/plugins/unified_search/public';
 
 import { SearchItems } from '../../../../hooks/use_search_items';
 
diff --git a/x-pack/plugins/transform/tsconfig.json b/x-pack/plugins/transform/tsconfig.json
index 9d13498814dc..01bb29d5f437 100644
--- a/x-pack/plugins/transform/tsconfig.json
+++ b/x-pack/plugins/transform/tsconfig.json
@@ -20,5 +20,6 @@
     { "path": "../license_management/tsconfig.json" },
     { "path": "../licensing/tsconfig.json" },
     { "path": "../ml/tsconfig.json" },
+    { "path": "../../../src/plugins/unified_search/tsconfig.json" }
   ]
 }
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index c17975560873..8dfa54e59382 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -1521,72 +1521,7 @@
     "data.aggTypes.buckets.ranges.rangesFormatMessage": "{gte} {from} et {lt} {to}",
     "data.aggTypes.buckets.ranges.rangesFormatMessageArrowRight": "{from} → {to}",
     "data.errors.fetchError": "Vérifiez votre réseau et la configuration de votre proxy. Si le problème persiste, contactez votre administrateur réseau.",
-    "data.filter.applyFilterActionTitle": "Appliquer le filtre à la vue en cours",
-    "data.filter.applyFilters.popupHeader": "Sélectionner les filtres à appliquer",
-    "data.filter.applyFiltersPopup.cancelButtonLabel": "Annuler",
-    "data.filter.applyFiltersPopup.saveButtonLabel": "Appliquer",
-    "data.filter.filterBar.addFilterButtonLabel": "Ajouter un filtre",
-    "data.filter.filterBar.deleteFilterButtonLabel": "Supprimer",
-    "data.filter.filterBar.disabledFilterPrefix": "Désactivé",
-    "data.filter.filterBar.disableFilterButtonLabel": "Désactiver temporairement",
-    "data.filter.filterBar.editFilterButtonLabel": "Modifier le filtre",
-    "data.filter.filterBar.enableFilterButtonLabel": "Réactiver",
-    "data.filter.filterBar.excludeFilterButtonLabel": "Exclure les résultats",
     "data.filter.filterBar.fieldNotFound": "Champ {key} introuvable dans le modèle d'indexation {indexPattern}",
-    "data.filter.filterBar.filterItemBadgeAriaLabel": "Actions de filtrage",
-    "data.filter.filterBar.filterItemBadgeIconAriaLabel": "Supprimer {filter}",
-    "data.filter.filterBar.includeFilterButtonLabel": "Inclure les résultats",
-    "data.filter.filterBar.indexPatternSelectPlaceholder": "Sélectionner un modèle d'indexation",
-    "data.filter.filterBar.labelErrorInfo": "Modèle d'indexation {indexPattern} introuvable",
-    "data.filter.filterBar.labelErrorText": "Erreur",
-    "data.filter.filterBar.labelWarningInfo": "Le champ {fieldName} n'existe pas dans la vue en cours.",
-    "data.filter.filterBar.labelWarningText": "Avertissement",
-    "data.filter.filterBar.moreFilterActionsMessage": "Filtre : {innerText}. Sélectionner pour plus d’actions de filtrage.",
-    "data.filter.filterBar.negatedFilterPrefix": "NON ",
-    "data.filter.filterBar.pinFilterButtonLabel": "Épingler dans toutes les applications",
-    "data.filter.filterBar.pinnedFilterPrefix": "Épinglé",
-    "data.filter.filterBar.unpinFilterButtonLabel": "Désépingler",
-    "data.filter.filterEditor.cancelButtonLabel": "Annuler",
-    "data.filter.filterEditor.createCustomLabelInputLabel": "Étiquette personnalisée",
-    "data.filter.filterEditor.createCustomLabelSwitchLabel": "Créer une étiquette personnalisée ?",
-    "data.filter.filterEditor.doesNotExistOperatorOptionLabel": "n'existe pas",
-    "data.filter.filterEditor.editFilterPopupTitle": "Modifier le filtre",
-    "data.filter.filterEditor.editFilterValuesButtonLabel": "Modifier les valeurs du filtre",
-    "data.filter.filterEditor.editQueryDslButtonLabel": "Modifier en tant que Query DSL",
-    "data.filter.filterEditor.existsOperatorOptionLabel": "existe",
-    "data.filter.filterEditor.falseOptionLabel": "false",
-    "data.filter.filterEditor.fieldSelectLabel": "Champ",
-    "data.filter.filterEditor.fieldSelectPlaceholder": "Sélectionner d'abord un champ",
-    "data.filter.filterEditor.indexPatternSelectLabel": "Modèle d'indexation",
-    "data.filter.filterEditor.isBetweenOperatorOptionLabel": "est entre",
-    "data.filter.filterEditor.isNotBetweenOperatorOptionLabel": "n'est pas entre",
-    "data.filter.filterEditor.isNotOneOfOperatorOptionLabel": "n'est pas l'une des options suivantes",
-    "data.filter.filterEditor.isNotOperatorOptionLabel": "n'est pas",
-    "data.filter.filterEditor.isOneOfOperatorOptionLabel": "est l'une des options suivantes",
-    "data.filter.filterEditor.isOperatorOptionLabel": "est",
-    "data.filter.filterEditor.operatorSelectLabel": "Opérateur",
-    "data.filter.filterEditor.operatorSelectPlaceholderSelect": "Sélectionner",
-    "data.filter.filterEditor.operatorSelectPlaceholderWaiting": "En attente",
-    "data.filter.filterEditor.queryDslLabel": "Query DSL d'Elasticsearch",
-    "data.filter.filterEditor.rangeEndInputPlaceholder": "Fin de la plage",
-    "data.filter.filterEditor.rangeInputLabel": "Plage",
-    "data.filter.filterEditor.rangeStartInputPlaceholder": "Début de la plage",
-    "data.filter.filterEditor.saveButtonLabel": "Enregistrer",
-    "data.filter.filterEditor.trueOptionLabel": "vrai",
-    "data.filter.filterEditor.valueInputLabel": "Valeur",
-    "data.filter.filterEditor.valueInputPlaceholder": "Saisir une valeur",
-    "data.filter.filterEditor.valueSelectPlaceholder": "Sélectionner une valeur",
-    "data.filter.filterEditor.valuesSelectLabel": "Valeurs",
-    "data.filter.filterEditor.valuesSelectPlaceholder": "Sélectionner des valeurs",
-    "data.filter.options.changeAllFiltersButtonLabel": "Changer tous les filtres",
-    "data.filter.options.deleteAllFiltersButtonLabel": "Tout supprimer",
-    "data.filter.options.disableAllFiltersButtonLabel": "Tout désactiver",
-    "data.filter.options.enableAllFiltersButtonLabel": "Tout activer",
-    "data.filter.options.invertDisabledFiltersButtonLabel": "Inverser l’activation/désactivation",
-    "data.filter.options.invertNegatedFiltersButtonLabel": "Inverser l'inclusion",
-    "data.filter.options.pinAllFiltersButtonLabel": "Tout épingler",
-    "data.filter.options.unpinAllFiltersButtonLabel": "Tout désépingler",
-    "data.filter.searchBar.changeAllFiltersTitle": "Changer tous les filtres",
     "data.functions.esaggs.help": "Exécuter l'agrégation AggConfig",
     "data.functions.esaggs.inspector.dataRequest.description": "Cette requête interroge Elasticsearch pour récupérer les données pour la visualisation.",
     "data.functions.esaggs.inspector.dataRequest.title": "Données",
@@ -1624,31 +1559,10 @@
     "data.kueryAutocomplete.lessThanOrEqualOperatorDescription.lessThanOrEqualToText": "inférieur ou égal à",
     "data.kueryAutocomplete.orOperatorDescription": "Nécessite qu’{oneOrMoreArguments} soit ''vrai''.",
     "data.kueryAutocomplete.orOperatorDescription.oneOrMoreArgumentsText": "au moins un argument",
-    "data.noDataPopover.content": "Cette plage temporelle ne contient pas de données. Étendez ou ajustez la plage temporelle pour obtenir plus de champs et pouvoir créer des graphiques.",
-    "data.noDataPopover.dismissAction": "Ne plus afficher",
-    "data.noDataPopover.subtitle": "Conseil",
-    "data.noDataPopover.title": "Ensemble de données vide",
     "data.painlessError.buttonTxt": "Modifier le script",
     "data.painlessError.painlessScriptedFieldErrorMessage": "Erreur d'exécution du champ d'exécution ou du champ scripté sur le modèle d'indexation {indexPatternName}",
     "data.parseEsInterval.invalidEsCalendarIntervalErrorMessage": "Intervalle de calendrier non valide : {interval} ; la valeur doit être 1.",
     "data.parseEsInterval.invalidEsIntervalFormatErrorMessage": "Format d'intervalle non valide : {interval}",
-    "data.query.queryBar.clearInputLabel": "Effacer l'entrée",
-    "data.query.queryBar.comboboxAriaLabel": "Rechercher et filtrer la page {pageType}",
-    "data.query.queryBar.kqlFullLanguageName": "Langage de requête Kibana",
-    "data.query.queryBar.kqlLanguageName": "KQL",
-    "data.query.queryBar.KQLNestedQuerySyntaxInfoDocLinkText": "documents",
-    "data.query.queryBar.KQLNestedQuerySyntaxInfoOptOutText": "Ne plus afficher",
-    "data.query.queryBar.KQLNestedQuerySyntaxInfoText": "Il semblerait que votre requête porte sur un champ imbriqué. Selon le résultat visé, il existe plusieurs façons de construire une syntaxe KQL pour des requêtes imbriquées. Apprenez-en plus avec notre {link}.",
-    "data.query.queryBar.KQLNestedQuerySyntaxInfoTitle": "Syntaxe de requête imbriquée KQL",
-    "data.query.queryBar.kqlOffLabel": "Désactivé",
-    "data.query.queryBar.kqlOnLabel": "Activé",
-    "data.query.queryBar.languageSwitcher.toText": "Passer au langage de requête Kibana pour la recherche",
-    "data.query.queryBar.luceneLanguageName": "Lucene",
-    "data.query.queryBar.searchInputAriaLabel": "Commencer à taper pour rechercher et filtrer la page {pageType}",
-    "data.query.queryBar.searchInputPlaceholder": "Recherche",
-    "data.query.queryBar.syntaxOptionsDescription": "{docsLink} (KQL) offre une syntaxe de requête simplifiée et la prise en charge des champs scriptés. KQL offre également une fonctionnalité de saisie semi-automatique. Si vous désactivez KQL, {nonKqlModeHelpText}.",
-    "data.query.queryBar.syntaxOptionsDescription.nonKqlModeHelpText": "Kibana utilise Lucene.",
-    "data.query.queryBar.syntaxOptionsTitle": "Options de syntaxe",
     "data.search.aggs.aggGroups.bucketsText": "Compartiments",
     "data.search.aggs.aggGroups.metricsText": "Indicateurs",
     "data.search.aggs.aggGroups.noneText": "Aucune",
@@ -2156,34 +2070,6 @@
     "data.search.functions.timerange.mode.help": "Spécifier le mode (absolu ou relatif)",
     "data.search.functions.timerange.to.help": "Spécifier la date de fin",
     "data.search.httpErrorTitle": "Impossible d’extraire vos données",
-    "data.search.searchBar.savedQueryDescriptionLabelText": "Description",
-    "data.search.searchBar.savedQueryDescriptionText": "Enregistrez le texte et les filtres de la requête que vous souhaitez réutiliser.",
-    "data.search.searchBar.savedQueryForm.titleConflictText": "Ce nom est en conflit avec une requête enregistrée existante.",
-    "data.search.searchBar.savedQueryFormCancelButtonText": "Annuler",
-    "data.search.searchBar.savedQueryFormSaveButtonText": "Enregistrer",
-    "data.search.searchBar.savedQueryFormTitle": "Enregistrer la requête",
-    "data.search.searchBar.savedQueryIncludeFiltersLabelText": "Inclure les filtres",
-    "data.search.searchBar.savedQueryIncludeTimeFilterLabelText": "Inclure le filtre temporel",
-    "data.search.searchBar.savedQueryNameHelpText": "Un nom est requis. Le nom ne peut pas contenir d'espace vide au début ou à la fin. Le nom doit être unique.",
-    "data.search.searchBar.savedQueryNameLabelText": "Nom",
-    "data.search.searchBar.savedQueryNoSavedQueriesText": "Aucune requête enregistrée.",
-    "data.search.searchBar.savedQueryPopoverButtonText": "Voir les requêtes enregistrées",
-    "data.search.searchBar.savedQueryPopoverClearButtonAriaLabel": "Effacer la requête enregistrée en cours",
-    "data.search.searchBar.savedQueryPopoverClearButtonText": "Effacer",
-    "data.search.searchBar.savedQueryPopoverConfirmDeletionCancelButtonText": "Annuler",
-    "data.search.searchBar.savedQueryPopoverConfirmDeletionConfirmButtonText": "Supprimer",
-    "data.search.searchBar.savedQueryPopoverConfirmDeletionTitle": "Supprimer \"{savedQueryName}\" ?",
-    "data.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel": "Supprimer la requête enregistrée {savedQueryName}",
-    "data.search.searchBar.savedQueryPopoverSaveAsNewButtonAriaLabel": "Enregistrer en tant que nouvelle requête enregistrée",
-    "data.search.searchBar.savedQueryPopoverSaveAsNewButtonText": "Enregistrer en tant que nouvelle",
-    "data.search.searchBar.savedQueryPopoverSaveButtonAriaLabel": "Enregistrer une nouvelle requête enregistrée",
-    "data.search.searchBar.savedQueryPopoverSaveButtonText": "Enregistrer la requête en cours",
-    "data.search.searchBar.savedQueryPopoverSaveChangesButtonAriaLabel": "Enregistrer les modifications apportées à {title}",
-    "data.search.searchBar.savedQueryPopoverSaveChangesButtonText": "Enregistrer les modifications",
-    "data.search.searchBar.savedQueryPopoverSavedQueryListItemButtonAriaLabel": "Bouton de requête enregistrée {savedQueryName}",
-    "data.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel": "Description de {savedQueryName}",
-    "data.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "Bouton de requête enregistrée {savedQueryName} sélectionné. Appuyez pour effacer les modifications.",
-    "data.search.searchBar.savedQueryPopoverTitleText": "Requêtes enregistrées",
     "data.search.searchSource.fetch.requestTimedOutNotificationMessage": "Les données peuvent être incomplètes parce que votre requête est arrivée à échéance.",
     "data.search.searchSource.fetch.shardsFailedModal.close": "Fermer",
     "data.search.searchSource.fetch.shardsFailedModal.copyToClipboard": "Copier la réponse dans le presse-papiers",
@@ -2222,7 +2108,7 @@
     "data.search.timeoutContactAdmin": "Votre requête a expiré. Contactez l'administrateur système pour accroître le temps d'exécution.",
     "data.search.timeoutIncreaseSetting": "Votre requête a expiré. Augmentez le temps d'exécution en utilisant le paramètre avancé de délai d'expiration de la recherche.",
     "data.search.timeoutIncreaseSettingActionText": "Modifier le paramètre",
-    "data.search.unableToGetSavedQueryToastTitle": "Impossible de charger la requête enregistrée {savedQueryId}",
+    "unifiedSearch.search.unableToGetSavedQueryToastTitle": "Impossible de charger la requête enregistrée {savedQueryId}",
     "data.searchSession.warning.readDocs": "En savoir plus",
     "data.searchSessionIndicator.noCapability": "Vous n'êtes pas autorisé à créer des sessions de recherche.",
     "data.searchSessions.sessionService.sessionEditNameError": "Échec de modification du nom de la session de recherche",
@@ -25539,6 +25425,120 @@
     "xpack.watcher.watchActions.webhook.portIsRequiredValidationMessage": "Le port webhook est requis.",
     "xpack.watcher.watchActions.webhook.usernameIsRequiredIfPasswordValidationMessage": "Le nom d'utilisateur est requis.",
     "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "Ce champ est requis.",
-    "xpack.watcher.watcherDescription": "Détectez les modifications survenant dans vos données en créant, gérant et monitorant des alertes."
+    "xpack.watcher.watcherDescription": "Détectez les modifications survenant dans vos données en créant, gérant et monitorant des alertes.",
+    "unifiedSearch.noDataPopover.content": "Cette plage temporelle ne contient pas de données. Étendez ou ajustez la plage temporelle pour obtenir plus de champs et pouvoir créer des graphiques.",
+    "unifiedSearch.noDataPopover.dismissAction": "Ne plus afficher",
+    "unifiedSearch.noDataPopover.subtitle": "Conseil",
+    "unifiedSearch.noDataPopover.title": "Ensemble de données vide",
+    "unifiedSearch.query.queryBar.clearInputLabel": "Effacer l'entrée",
+    "unifiedSearch.query.queryBar.comboboxAriaLabel": "Rechercher et filtrer la page {pageType}",
+    "unifiedSearch.query.queryBar.kqlFullLanguageName": "Langage de requête Kibana",
+    "unifiedSearch.query.queryBar.kqlLanguageName": "KQL",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoDocLinkText": "documents",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoOptOutText": "Ne plus afficher",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoText": "Il semblerait que votre requête porte sur un champ imbriqué. Selon le résultat visé, il existe plusieurs façons de construire une syntaxe KQL pour des requêtes imbriquées. Apprenez-en plus avec notre {link}.",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoTitle": "Syntaxe de requête imbriquée KQL",
+    "unifiedSearch.query.queryBar.kqlOffLabel": "Désactivé",
+    "unifiedSearch.query.queryBar.kqlOnLabel": "Activé",
+    "unifiedSearch.query.queryBar.languageSwitcher.toText": "Passer au langage de requête Kibana pour la recherche",
+    "unifiedSearch.query.queryBar.luceneLanguageName": "Lucene",
+    "unifiedSearch.query.queryBar.searchInputAriaLabel": "Commencer à taper pour rechercher et filtrer la page {pageType}",
+    "unifiedSearch.query.queryBar.searchInputPlaceholder": "Recherche",
+    "unifiedSearch.query.queryBar.syntaxOptionsDescription": "{docsLink} (KQL) offre une syntaxe de requête simplifiée et la prise en charge des champs scriptés. KQL offre également une fonctionnalité de saisie semi-automatique. Si vous désactivez KQL, {nonKqlModeHelpText}.",
+    "unifiedSearch.query.queryBar.syntaxOptionsDescription.nonKqlModeHelpText": "Kibana utilise Lucene.",
+    "unifiedSearch.search.searchBar.savedQueryDescriptionLabelText": "Description",
+    "unifiedSearch.search.searchBar.savedQueryDescriptionText": "Enregistrez le texte et les filtres de la requête que vous souhaitez réutiliser.",
+    "unifiedSearch.search.searchBar.savedQueryForm.titleConflictText": "Ce nom est en conflit avec une requête enregistrée existante.",
+    "unifiedSearch.search.searchBar.savedQueryFormCancelButtonText": "Annuler",
+    "unifiedSearch.search.searchBar.savedQueryFormSaveButtonText": "Enregistrer",
+    "unifiedSearch.search.searchBar.savedQueryFormTitle": "Enregistrer la requête",
+    "unifiedSearch.search.searchBar.savedQueryIncludeFiltersLabelText": "Inclure les filtres",
+    "unifiedSearch.search.searchBar.savedQueryIncludeTimeFilterLabelText": "Inclure le filtre temporel",
+    "unifiedSearch.search.searchBar.savedQueryNameHelpText": "Un nom est requis. Le nom ne peut pas contenir d'espace vide au début ou à la fin. Le nom doit être unique.",
+    "unifiedSearch.search.searchBar.savedQueryNameLabelText": "Nom",
+    "unifiedSearch.search.searchBar.savedQueryNoSavedQueriesText": "Aucune requête enregistrée.",
+    "unifiedSearch.search.searchBar.savedQueryPopoverButtonText": "Voir les requêtes enregistrées",
+    "unifiedSearch.search.searchBar.savedQueryPopoverClearButtonAriaLabel": "Effacer la requête enregistrée en cours",
+    "unifiedSearch.search.searchBar.savedQueryPopoverClearButtonText": "Effacer",
+    "unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionCancelButtonText": "Annuler",
+    "unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionConfirmButtonText": "Supprimer",
+    "unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionTitle": "Supprimer \"{savedQueryName}\" ?",
+    "unifiedSearch.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel": "Supprimer la requête enregistrée {savedQueryName}",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveAsNewButtonAriaLabel": "Enregistrer en tant que nouvelle requête enregistrée",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveAsNewButtonText": "Enregistrer en tant que nouvelle",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveButtonAriaLabel": "Enregistrer une nouvelle requête enregistrée",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveButtonText": "Enregistrer la requête en cours",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveChangesButtonAriaLabel": "Enregistrer les modifications apportées à {title}",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveChangesButtonText": "Enregistrer les modifications",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemButtonAriaLabel": "Bouton de requête enregistrée {savedQueryName}",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel": "Description de {savedQueryName}",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "Bouton de requête enregistrée {savedQueryName} sélectionné. Appuyez pour effacer les modifications.",
+    "unifiedSearch.search.searchBar.savedQueryPopoverTitleText": "Requêtes enregistrées",
+    "unifiedSearch.query.queryBar.syntaxOptionsTitle": "Options de syntaxe",
+    "unifiedSearch.filter.applyFilterActionTitle": "Appliquer le filtre à la vue en cours",
+    "unifiedSearch.filter.applyFilters.popupHeader": "Sélectionner les filtres à appliquer",
+    "unifiedSearch.filter.applyFiltersPopup.cancelButtonLabel": "Annuler",
+    "unifiedSearch.filter.applyFiltersPopup.saveButtonLabel": "Appliquer",
+    "unifiedSearch.filter.filterBar.addFilterButtonLabel": "Ajouter un filtre",
+    "unifiedSearch.filter.filterBar.deleteFilterButtonLabel": "Supprimer",
+    "unifiedSearch.filter.filterBar.disabledFilterPrefix": "Désactivé",
+    "unifiedSearch.filter.filterBar.disableFilterButtonLabel": "Désactiver temporairement",
+    "unifiedSearch.filter.filterBar.editFilterButtonLabel": "Modifier le filtre",
+    "unifiedSearch.filter.filterBar.enableFilterButtonLabel": "Réactiver",
+    "unifiedSearch.filter.filterBar.excludeFilterButtonLabel": "Exclure les résultats",
+    "unifiedSearch.filter.filterBar.filterItemBadgeAriaLabel": "Actions de filtrage",
+    "unifiedSearch.filter.filterBar.filterItemBadgeIconAriaLabel": "Supprimer {filter}",
+    "unifiedSearch.filter.filterBar.includeFilterButtonLabel": "Inclure les résultats",
+    "unifiedSearch.filter.filterBar.indexPatternSelectPlaceholder": "Sélectionner un modèle d'indexation",
+    "unifiedSearch.filter.filterBar.labelErrorInfo": "Modèle d'indexation {indexPattern} introuvable",
+    "unifiedSearch.filter.filterBar.labelErrorText": "Erreur",
+    "unifiedSearch.filter.filterBar.labelWarningInfo": "Le champ {fieldName} n'existe pas dans la vue en cours.",
+    "unifiedSearch.filter.filterBar.labelWarningText": "Avertissement",
+    "unifiedSearch.filter.filterBar.moreFilterActionsMessage": "Filtre : {innerText}. Sélectionner pour plus d’actions de filtrage.",
+    "unifiedSearch.filter.filterBar.negatedFilterPrefix": "NON ",
+    "unifiedSearch.filter.filterBar.pinFilterButtonLabel": "Épingler dans toutes les applications",
+    "unifiedSearch.filter.filterBar.pinnedFilterPrefix": "Épinglé",
+    "unifiedSearch.filter.filterBar.unpinFilterButtonLabel": "Désépingler",
+    "unifiedSearch.filter.filterEditor.cancelButtonLabel": "Annuler",
+    "unifiedSearch.filter.filterEditor.createCustomLabelInputLabel": "Étiquette personnalisée",
+    "unifiedSearch.filter.filterEditor.createCustomLabelSwitchLabel": "Créer une étiquette personnalisée ?",
+    "unifiedSearch.filter.filterEditor.doesNotExistOperatorOptionLabel": "n'existe pas",
+    "unifiedSearch.filter.filterEditor.editFilterPopupTitle": "Modifier le filtre",
+    "unifiedSearch.filter.filterEditor.editFilterValuesButtonLabel": "Modifier les valeurs du filtre",
+    "unifiedSearch.filter.filterEditor.editQueryDslButtonLabel": "Modifier en tant que Query DSL",
+    "unifiedSearch.filter.filterEditor.existsOperatorOptionLabel": "existe",
+    "unifiedSearch.filter.filterEditor.falseOptionLabel": "false",
+    "unifiedSearch.filter.filterEditor.fieldSelectLabel": "Champ",
+    "unifiedSearch.filter.filterEditor.fieldSelectPlaceholder": "Sélectionner d'abord un champ",
+    "unifiedSearch.filter.filterEditor.indexPatternSelectLabel": "Modèle d'indexation",
+    "unifiedSearch.filter.filterEditor.isBetweenOperatorOptionLabel": "est entre",
+    "unifiedSearch.filter.filterEditor.isNotBetweenOperatorOptionLabel": "n'est pas entre",
+    "unifiedSearch.filter.filterEditor.isNotOneOfOperatorOptionLabel": "n'est pas l'une des options suivantes",
+    "unifiedSearch.filter.filterEditor.isNotOperatorOptionLabel": "n'est pas",
+    "unifiedSearch.filter.filterEditor.isOneOfOperatorOptionLabel": "est l'une des options suivantes",
+    "unifiedSearch.filter.filterEditor.isOperatorOptionLabel": "est",
+    "unifiedSearch.filter.filterEditor.operatorSelectLabel": "Opérateur",
+    "unifiedSearch.filter.filterEditor.operatorSelectPlaceholderSelect": "Sélectionner",
+    "unifiedSearch.filter.filterEditor.operatorSelectPlaceholderWaiting": "En attente",
+    "unifiedSearch.filter.filterEditor.queryDslLabel": "Query DSL d'Elasticsearch",
+    "unifiedSearch.filter.filterEditor.rangeEndInputPlaceholder": "Fin de la plage",
+    "unifiedSearch.filter.filterEditor.rangeInputLabel": "Plage",
+    "unifiedSearch.filter.filterEditor.rangeStartInputPlaceholder": "Début de la plage",
+    "unifiedSearch.filter.filterEditor.saveButtonLabel": "Enregistrer",
+    "unifiedSearch.filter.filterEditor.trueOptionLabel": "vrai",
+    "unifiedSearch.filter.filterEditor.valueInputLabel": "Valeur",
+    "unifiedSearch.filter.filterEditor.valueInputPlaceholder": "Saisir une valeur",
+    "unifiedSearch.filter.filterEditor.valueSelectPlaceholder": "Sélectionner une valeur",
+    "unifiedSearch.filter.filterEditor.valuesSelectLabel": "Valeurs",
+    "unifiedSearch.filter.filterEditor.valuesSelectPlaceholder": "Sélectionner des valeurs",
+    "unifiedSearch.filter.options.changeAllFiltersButtonLabel": "Changer tous les filtres",
+    "unifiedSearch.filter.options.deleteAllFiltersButtonLabel": "Tout supprimer",
+    "unifiedSearch.filter.options.disableAllFiltersButtonLabel": "Tout désactiver",
+    "unifiedSearch.filter.options.enableAllFiltersButtonLabel": "Tout activer",
+    "unifiedSearch.filter.options.invertDisabledFiltersButtonLabel": "Inverser l’activation/désactivation",
+    "unifiedSearch.filter.options.invertNegatedFiltersButtonLabel": "Inverser l'inclusion",
+    "unifiedSearch.filter.options.pinAllFiltersButtonLabel": "Tout épingler",
+    "unifiedSearch.filter.options.unpinAllFiltersButtonLabel": "Tout désépingler",
+    "unifiedSearch.filter.searchBar.changeAllFiltersTitle": "Changer tous les filtres"
   }
 }
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 29dfc882d7c6..95dc406a84ec 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -1842,73 +1842,7 @@
     "data.aggTypes.buckets.ranges.rangesFormatMessageArrowRight": "{from} → {to}",
     "data.errors.fetchError": "ネットワークとプロキシ構成を確認してください。問題が解決しない場合は、ネットワーク管理者に問い合わせてください。",
     "data.esError.unknownRootCause": "不明",
-    "data.filter.applyFilterActionTitle": "現在のビューにフィルターを適用",
-    "data.filter.applyFilters.popupHeader": "適用するフィルターの選択",
-    "data.filter.applyFiltersPopup.cancelButtonLabel": "キャンセル",
-    "data.filter.applyFiltersPopup.saveButtonLabel": "適用",
-    "data.filter.filterBar.addFilterButtonLabel": "フィルターを追加します",
-    "data.filter.filterBar.deleteFilterButtonLabel": "削除",
-    "data.filter.filterBar.disabledFilterPrefix": "無効",
-    "data.filter.filterBar.disableFilterButtonLabel": "一時的に無効にする",
-    "data.filter.filterBar.editFilterButtonLabel": "フィルターを編集",
-    "data.filter.filterBar.enableFilterButtonLabel": "再度有効にする",
-    "data.filter.filterBar.excludeFilterButtonLabel": "結果を除外",
     "data.filter.filterBar.fieldNotFound": "インデックスパターン {indexPattern} にフィールド {key} がありません",
-    "data.filter.filterBar.filterItemBadgeAriaLabel": "フィルターアクション",
-    "data.filter.filterBar.filterItemBadgeIconAriaLabel": "{filter}を削除",
-    "data.filter.filterBar.includeFilterButtonLabel": "結果を含める",
-    "data.filter.filterBar.indexPatternSelectPlaceholder": "インデックスパターンの選択",
-    "data.filter.filterBar.labelErrorInfo": "インデックスパターン{indexPattern}が見つかりません",
-    "data.filter.filterBar.labelErrorText": "エラー",
-    "data.filter.filterBar.labelWarningInfo": "フィールド{fieldName}は現在のビューに存在しません",
-    "data.filter.filterBar.labelWarningText": "警告",
-    "data.filter.filterBar.moreFilterActionsMessage": "フィルター：{innerText}。他のフィルターアクションを使用するには選択してください。",
-    "data.filter.filterBar.negatedFilterPrefix": "NOT ",
-    "data.filter.filterBar.pinFilterButtonLabel": "すべてのアプリにピン付け",
-    "data.filter.filterBar.pinnedFilterPrefix": "ピン付け済み",
-    "data.filter.filterBar.unpinFilterButtonLabel": "ピンを外す",
-    "data.filter.filterEditor.cancelButtonLabel": "キャンセル",
-    "data.filter.filterEditor.createCustomLabelInputLabel": "カスタムラベル",
-    "data.filter.filterEditor.createCustomLabelSwitchLabel": "カスタムラベルを作成しますか？",
-    "data.filter.filterEditor.doesNotExistOperatorOptionLabel": "存在しない",
-    "data.filter.filterEditor.editFilterPopupTitle": "フィルターを編集",
-    "data.filter.filterEditor.editFilterValuesButtonLabel": "フィルター値を編集",
-    "data.filter.filterEditor.editQueryDslButtonLabel": "クエリ DSL として編集",
-    "data.filter.filterEditor.existsOperatorOptionLabel": "存在する",
-    "data.filter.filterEditor.falseOptionLabel": "false",
-    "data.filter.filterEditor.fieldSelectLabel": "フィールド",
-    "data.filter.filterEditor.fieldSelectPlaceholder": "フィールドを選択",
-    "data.filter.filterEditor.indexPatternSelectLabel": "インデックスパターン",
-    "data.filter.filterEditor.isBetweenOperatorOptionLabel": "is between",
-    "data.filter.filterEditor.isNotBetweenOperatorOptionLabel": "is not between",
-    "data.filter.filterEditor.isNotOneOfOperatorOptionLabel": "is not one of",
-    "data.filter.filterEditor.isNotOperatorOptionLabel": "is not",
-    "data.filter.filterEditor.isOneOfOperatorOptionLabel": "is one of",
-    "data.filter.filterEditor.isOperatorOptionLabel": "is",
-    "data.filter.filterEditor.operatorSelectLabel": "演算子",
-    "data.filter.filterEditor.operatorSelectPlaceholderSelect": "選択してください",
-    "data.filter.filterEditor.operatorSelectPlaceholderWaiting": "待機中",
-    "data.filter.filterEditor.queryDslAriaLabel": "ElasticsearchクエリDSLエディター",
-    "data.filter.filterEditor.queryDslLabel": "Elasticsearch クエリ DSL",
-    "data.filter.filterEditor.rangeEndInputPlaceholder": "範囲の終了値",
-    "data.filter.filterEditor.rangeInputLabel": "範囲",
-    "data.filter.filterEditor.rangeStartInputPlaceholder": "範囲の開始値",
-    "data.filter.filterEditor.saveButtonLabel": "保存",
-    "data.filter.filterEditor.trueOptionLabel": "true",
-    "data.filter.filterEditor.valueInputLabel": "値",
-    "data.filter.filterEditor.valueInputPlaceholder": "値を入力",
-    "data.filter.filterEditor.valueSelectPlaceholder": "値を選択",
-    "data.filter.filterEditor.valuesSelectLabel": "値",
-    "data.filter.filterEditor.valuesSelectPlaceholder": "値を選択",
-    "data.filter.options.changeAllFiltersButtonLabel": "すべてのフィルターの変更",
-    "data.filter.options.deleteAllFiltersButtonLabel": "すべて削除",
-    "data.filter.options.disableAllFiltersButtonLabel": "すべて無効にする",
-    "data.filter.options.enableAllFiltersButtonLabel": "すべて有効にする",
-    "data.filter.options.invertDisabledFiltersButtonLabel": "有効・無効を反転",
-    "data.filter.options.invertNegatedFiltersButtonLabel": "含める・除外を反転",
-    "data.filter.options.pinAllFiltersButtonLabel": "すべてピン付け",
-    "data.filter.options.unpinAllFiltersButtonLabel": "すべてのピンを外す",
-    "data.filter.searchBar.changeAllFiltersTitle": "すべてのフィルターの変更",
     "data.functions.esaggs.help": "AggConfig 集約を実行します",
     "data.functions.esaggs.inspector.dataRequest.description": "このリクエストはElasticsearchにクエリし、ビジュアライゼーション用のデータを取得します。",
     "data.functions.esaggs.inspector.dataRequest.title": "データ",
@@ -1946,31 +1880,10 @@
     "data.kueryAutocomplete.lessThanOrEqualOperatorDescription.lessThanOrEqualToText": "より小さいまたは等しい",
     "data.kueryAutocomplete.orOperatorDescription": "{oneOrMoreArguments} が true であることを条件とする",
     "data.kueryAutocomplete.orOperatorDescription.oneOrMoreArgumentsText": "1つ以上の引数",
-    "data.noDataPopover.content": "この時間範囲にはデータが含まれていません。表示するフィールドを増やし、グラフを作成するには、時間範囲を広げるか、調整してください。",
-    "data.noDataPopover.dismissAction": "今後表示しない",
-    "data.noDataPopover.subtitle": "ヒント",
-    "data.noDataPopover.title": "空のデータセット",
     "data.painlessError.buttonTxt": "スクリプトを編集",
     "data.painlessError.painlessScriptedFieldErrorMessage": "インデックスパターン{indexPatternName}でのランタイムフィールドまたはスクリプトフィールドの実行エラー",
     "data.parseEsInterval.invalidEsCalendarIntervalErrorMessage": "無効なカレンダー間隔：{interval}、1よりも大きな値が必要です",
     "data.parseEsInterval.invalidEsIntervalFormatErrorMessage": "無効な間隔形式：{interval}",
-    "data.query.queryBar.clearInputLabel": "インプットを消去",
-    "data.query.queryBar.comboboxAriaLabel": "{pageType} ページの検索とフィルタリング",
-    "data.query.queryBar.kqlFullLanguageName": "Kibana クエリ言語",
-    "data.query.queryBar.kqlLanguageName": "KQL",
-    "data.query.queryBar.KQLNestedQuerySyntaxInfoDocLinkText": "ドキュメント",
-    "data.query.queryBar.KQLNestedQuerySyntaxInfoOptOutText": "今後表示しない",
-    "data.query.queryBar.KQLNestedQuerySyntaxInfoText": "ネストされたフィールドをクエリされているようです。ネストされたクエリに対しては、ご希望の結果により異なる方法で KQL 構文を構築することができます。詳細については、{link}をご覧ください。",
-    "data.query.queryBar.KQLNestedQuerySyntaxInfoTitle": "KQL ネストされたクエリ構文",
-    "data.query.queryBar.kqlOffLabel": "オフ",
-    "data.query.queryBar.kqlOnLabel": "オン",
-    "data.query.queryBar.languageSwitcher.toText": "検索用にKibana Query Languageに切り替える",
-    "data.query.queryBar.luceneLanguageName": "Lucene",
-    "data.query.queryBar.searchInputAriaLabel": "{pageType} ページの検索とフィルタリングを行うには入力を開始してください",
-    "data.query.queryBar.searchInputPlaceholder": "検索",
-    "data.query.queryBar.syntaxOptionsDescription": "{docsLink}（KQL）は、シンプルなクエリ構文とスクリプトフィールドのサポートを提供します。KQLにはオートコンプリート機能もあります。KQLをオフにする場合は、{nonKqlModeHelpText}",
-    "data.query.queryBar.syntaxOptionsDescription.nonKqlModeHelpText": "KibanaはLuceneを使用します。",
-    "data.query.queryBar.syntaxOptionsTitle": "構文オプション",
     "data.search.aggs.aggGroups.bucketsText": "バケット",
     "data.search.aggs.aggGroups.metricsText": "メトリック",
     "data.search.aggs.aggGroups.noneText": "なし",
@@ -2546,34 +2459,6 @@
     "data.search.functions.timerange.mode.help": "モードを指定（絶対または相対）",
     "data.search.functions.timerange.to.help": "終了日を指定",
     "data.search.httpErrorTitle": "データを取得できません",
-    "data.search.searchBar.savedQueryDescriptionLabelText": "説明",
-    "data.search.searchBar.savedQueryDescriptionText": "再度使用するクエリテキストとフィルターを保存します。",
-    "data.search.searchBar.savedQueryForm.titleConflictText": "タイトルがすでに保存されているクエリに使用されています",
-    "data.search.searchBar.savedQueryFormCancelButtonText": "キャンセル",
-    "data.search.searchBar.savedQueryFormSaveButtonText": "保存",
-    "data.search.searchBar.savedQueryFormTitle": "クエリを保存",
-    "data.search.searchBar.savedQueryIncludeFiltersLabelText": "フィルターを含める",
-    "data.search.searchBar.savedQueryIncludeTimeFilterLabelText": "時間フィルターを含める",
-    "data.search.searchBar.savedQueryNameHelpText": "名前は必須です。名前の始めと終わりにはスペースを使用できません。名前は一意でなければなりません。",
-    "data.search.searchBar.savedQueryNameLabelText": "名前",
-    "data.search.searchBar.savedQueryNoSavedQueriesText": "保存されたクエリがありません。",
-    "data.search.searchBar.savedQueryPopoverButtonText": "保存されたクエリを表示",
-    "data.search.searchBar.savedQueryPopoverClearButtonAriaLabel": "現在保存されているクエリを消去",
-    "data.search.searchBar.savedQueryPopoverClearButtonText": "クリア",
-    "data.search.searchBar.savedQueryPopoverConfirmDeletionCancelButtonText": "キャンセル",
-    "data.search.searchBar.savedQueryPopoverConfirmDeletionConfirmButtonText": "削除",
-    "data.search.searchBar.savedQueryPopoverConfirmDeletionTitle": "「{savedQueryName}」を削除しますか？",
-    "data.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel": "保存されたクエリ {savedQueryName} を削除",
-    "data.search.searchBar.savedQueryPopoverSaveAsNewButtonAriaLabel": "新規保存クエリを保存",
-    "data.search.searchBar.savedQueryPopoverSaveAsNewButtonText": "新規保存",
-    "data.search.searchBar.savedQueryPopoverSaveButtonAriaLabel": "新規保存クエリを保存",
-    "data.search.searchBar.savedQueryPopoverSaveButtonText": "現在のクエリを保存",
-    "data.search.searchBar.savedQueryPopoverSaveChangesButtonAriaLabel": "{title} への変更を保存",
-    "data.search.searchBar.savedQueryPopoverSaveChangesButtonText": "変更を保存",
-    "data.search.searchBar.savedQueryPopoverSavedQueryListItemButtonAriaLabel": "保存クエリボタン {savedQueryName}",
-    "data.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel": "{savedQueryName}の説明",
-    "data.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "選択されたクエリボタン {savedQueryName} を保存しました。変更を破棄するには押してください。",
-    "data.search.searchBar.savedQueryPopoverTitleText": "保存されたクエリ",
     "data.search.searchSource.dataViewDescription": "照会されたデータビュー。",
     "data.search.searchSource.dataViewIdLabel": "データビューID",
     "data.search.searchSource.dataViewLabel": "データビュー",
@@ -2615,7 +2500,6 @@
     "data.search.timeoutContactAdmin": "クエリがタイムアウトしました。実行時間を延長するには、システム管理者に問い合わせてください。",
     "data.search.timeoutIncreaseSetting": "クエリがタイムアウトしました。検索タイムアウト詳細設定で実行時間を延長します。",
     "data.search.timeoutIncreaseSettingActionText": "設定を編集",
-    "data.search.unableToGetSavedQueryToastTitle": "保存したクエリ {savedQueryId} を読み込めません",
     "data.searchSession.warning.readDocs": "続きを読む",
     "data.searchSessionIndicator.noCapability": "検索セッションを作成するアクセス権がありません。",
     "data.searchSessions.sessionService.sessionEditNameError": "検索セッションの名前を編集できませんでした",
@@ -29492,6 +29376,122 @@
     "xpack.watcher.watchActions.webhook.portIsRequiredValidationMessage": "Webフックポートが必要です。",
     "xpack.watcher.watchActions.webhook.usernameIsRequiredIfPasswordValidationMessage": "ユーザー名が必要です。",
     "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "フィールドを選択してください。",
-    "xpack.watcher.watcherDescription": "アラートの作成、管理、監視によりデータへの変更を検知します。"
+    "xpack.watcher.watcherDescription": "アラートの作成、管理、監視によりデータへの変更を検知します。",
+    "unifiedSearch.search.searchBar.savedQueryDescriptionLabelText": "説明",
+    "unifiedSearch.search.searchBar.savedQueryDescriptionText": "再度使用するクエリテキストとフィルターを保存します。",
+    "unifiedSearch.search.searchBar.savedQueryForm.titleConflictText": "タイトルがすでに保存されているクエリに使用されています",
+    "unifiedSearch.search.searchBar.savedQueryFormCancelButtonText": "キャンセル",
+    "unifiedSearch.search.searchBar.savedQueryFormSaveButtonText": "保存",
+    "unifiedSearch.search.searchBar.savedQueryFormTitle": "クエリを保存",
+    "unifiedSearch.search.searchBar.savedQueryIncludeFiltersLabelText": "フィルターを含める",
+    "unifiedSearch.search.searchBar.savedQueryIncludeTimeFilterLabelText": "時間フィルターを含める",
+    "unifiedSearch.search.searchBar.savedQueryNameHelpText": "名前は必須です。名前の始めと終わりにはスペースを使用できません。名前は一意でなければなりません。",
+    "unifiedSearch.search.searchBar.savedQueryNameLabelText": "名前",
+    "unifiedSearch.search.searchBar.savedQueryNoSavedQueriesText": "保存されたクエリがありません。",
+    "unifiedSearch.search.searchBar.savedQueryPopoverButtonText": "保存されたクエリを表示",
+    "unifiedSearch.search.searchBar.savedQueryPopoverClearButtonAriaLabel": "現在保存されているクエリを消去",
+    "unifiedSearch.search.searchBar.savedQueryPopoverClearButtonText": "クリア",
+    "unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionCancelButtonText": "キャンセル",
+    "unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionConfirmButtonText": "削除",
+    "unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionTitle": "「{savedQueryName}」を削除しますか？",
+    "unifiedSearch.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel": "保存されたクエリ {savedQueryName} を削除",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveAsNewButtonAriaLabel": "新規保存クエリを保存",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveAsNewButtonText": "新規保存",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveButtonAriaLabel": "新規保存クエリを保存",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveButtonText": "現在のクエリを保存",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveChangesButtonAriaLabel": "{title} への変更を保存",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveChangesButtonText": "変更を保存",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemButtonAriaLabel": "保存クエリボタン {savedQueryName}",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel": "{savedQueryName}の説明",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "選択されたクエリボタン {savedQueryName} を保存しました。変更を破棄するには押してください。",
+    "unifiedSearch.search.searchBar.savedQueryPopoverTitleText": "保存されたクエリ",
+    "unifiedSearch.noDataPopover.content": "この時間範囲にはデータが含まれていません。表示するフィールドを増やし、グラフを作成するには、時間範囲を広げるか、調整してください。",
+    "unifiedSearch.noDataPopover.dismissAction": "今後表示しない",
+    "unifiedSearch.noDataPopover.subtitle": "ヒント",
+    "unifiedSearch.noDataPopover.title": "空のデータセット",
+    "unifiedSearch.query.queryBar.clearInputLabel": "インプットを消去",
+    "unifiedSearch.query.queryBar.comboboxAriaLabel": "{pageType} ページの検索とフィルタリング",
+    "unifiedSearch.query.queryBar.kqlFullLanguageName": "Kibana クエリ言語",
+    "unifiedSearch.query.queryBar.kqlLanguageName": "KQL",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoDocLinkText": "ドキュメント",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoOptOutText": "今後表示しない",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoText": "ネストされたフィールドをクエリされているようです。ネストされたクエリに対しては、ご希望の結果により異なる方法で KQL 構文を構築することができます。詳細については、{link}をご覧ください。",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoTitle": "KQL ネストされたクエリ構文",
+    "unifiedSearch.query.queryBar.kqlOffLabel": "オフ",
+    "unifiedSearch.query.queryBar.kqlOnLabel": "オン",
+    "unifiedSearch.query.queryBar.languageSwitcher.toText": "検索用にKibana Query Languageに切り替える",
+    "unifiedSearch.query.queryBar.luceneLanguageName": "Lucene",
+    "unifiedSearch.query.queryBar.searchInputAriaLabel": "{pageType} ページの検索とフィルタリングを行うには入力を開始してください",
+    "unifiedSearch.query.queryBar.searchInputPlaceholder": "検索",
+    "unifiedSearch.query.queryBar.syntaxOptionsDescription": "{docsLink}（KQL）は、シンプルなクエリ構文とスクリプトフィールドのサポートを提供します。KQLにはオートコンプリート機能もあります。KQLをオフにする場合は、{nonKqlModeHelpText}",
+    "unifiedSearch.query.queryBar.syntaxOptionsDescription.nonKqlModeHelpText": "KibanaはLuceneを使用します。",
+    "unifiedSearch.search.unableToGetSavedQueryToastTitle": "保存したクエリ {savedQueryId} を読み込めません",
+    "unifiedSearch.query.queryBar.syntaxOptionsTitle": "構文オプション",
+    "unifiedSearch.filter.applyFilterActionTitle": "現在のビューにフィルターを適用",
+    "unifiedSearch.filter.applyFilters.popupHeader": "適用するフィルターの選択",
+    "unifiedSearch.filter.applyFiltersPopup.cancelButtonLabel": "キャンセル",
+    "unifiedSearch.filter.applyFiltersPopup.saveButtonLabel": "適用",
+    "unifiedSearch.filter.filterBar.addFilterButtonLabel": "フィルターを追加します",
+    "unifiedSearch.filter.filterBar.deleteFilterButtonLabel": "削除",
+    "unifiedSearch.filter.filterBar.disabledFilterPrefix": "無効",
+    "unifiedSearch.filter.filterBar.disableFilterButtonLabel": "一時的に無効にする",
+    "unifiedSearch.filter.filterBar.editFilterButtonLabel": "フィルターを編集",
+    "unifiedSearch.filter.filterBar.enableFilterButtonLabel": "再度有効にする",
+    "unifiedSearch.filter.filterBar.excludeFilterButtonLabel": "結果を除外",
+    "unifiedSearch.filter.filterBar.filterItemBadgeAriaLabel": "フィルターアクション",
+    "unifiedSearch.filter.filterBar.filterItemBadgeIconAriaLabel": "{filter}を削除",
+    "unifiedSearch.filter.filterBar.includeFilterButtonLabel": "結果を含める",
+    "unifiedSearch.filter.filterBar.indexPatternSelectPlaceholder": "インデックスパターンの選択",
+    "unifiedSearch.filter.filterBar.labelErrorInfo": "インデックスパターン{indexPattern}が見つかりません",
+    "unifiedSearch.filter.filterBar.labelErrorText": "エラー",
+    "unifiedSearch.filter.filterBar.labelWarningInfo": "フィールド{fieldName}は現在のビューに存在しません",
+    "unifiedSearch.filter.filterBar.labelWarningText": "警告",
+    "unifiedSearch.filter.filterBar.moreFilterActionsMessage": "フィルター：{innerText}。他のフィルターアクションを使用するには選択してください。",
+    "unifiedSearch.filter.filterBar.negatedFilterPrefix": "NOT ",
+    "unifiedSearch.filter.filterBar.pinFilterButtonLabel": "すべてのアプリにピン付け",
+    "unifiedSearch.filter.filterBar.pinnedFilterPrefix": "ピン付け済み",
+    "unifiedSearch.filter.filterBar.unpinFilterButtonLabel": "ピンを外す",
+    "unifiedSearch.filter.filterEditor.cancelButtonLabel": "キャンセル",
+    "unifiedSearch.filter.filterEditor.createCustomLabelInputLabel": "カスタムラベル",
+    "unifiedSearch.filter.filterEditor.createCustomLabelSwitchLabel": "カスタムラベルを作成しますか？",
+    "unifiedSearch.filter.filterEditor.doesNotExistOperatorOptionLabel": "存在しない",
+    "unifiedSearch.filter.filterEditor.editFilterPopupTitle": "フィルターを編集",
+    "unifiedSearch.filter.filterEditor.editFilterValuesButtonLabel": "フィルター値を編集",
+    "unifiedSearch.filter.filterEditor.editQueryDslButtonLabel": "クエリ DSL として編集",
+    "unifiedSearch.filter.filterEditor.existsOperatorOptionLabel": "存在する",
+    "unifiedSearch.filter.filterEditor.falseOptionLabel": "false",
+    "unifiedSearch.filter.filterEditor.fieldSelectLabel": "フィールド",
+    "unifiedSearch.filter.filterEditor.fieldSelectPlaceholder": "フィールドを選択",
+    "unifiedSearch.filter.filterEditor.indexPatternSelectLabel": "インデックスパターン",
+    "unifiedSearch.filter.filterEditor.isBetweenOperatorOptionLabel": "is between",
+    "unifiedSearch.filter.filterEditor.isNotBetweenOperatorOptionLabel": "is not between",
+    "unifiedSearch.filter.filterEditor.isNotOneOfOperatorOptionLabel": "is not one of",
+    "unifiedSearch.filter.filterEditor.isNotOperatorOptionLabel": "is not",
+    "unifiedSearch.filter.filterEditor.isOneOfOperatorOptionLabel": "is one of",
+    "unifiedSearch.filter.filterEditor.isOperatorOptionLabel": "is",
+    "unifiedSearch.filter.filterEditor.operatorSelectLabel": "演算子",
+    "unifiedSearch.filter.filterEditor.operatorSelectPlaceholderSelect": "選択してください",
+    "unifiedSearch.filter.filterEditor.operatorSelectPlaceholderWaiting": "待機中",
+    "unifiedSearch.filter.filterEditor.queryDslAriaLabel": "ElasticsearchクエリDSLエディター",
+    "unifiedSearch.filter.filterEditor.queryDslLabel": "Elasticsearch クエリ DSL",
+    "unifiedSearch.filter.filterEditor.rangeEndInputPlaceholder": "範囲の終了値",
+    "unifiedSearch.filter.filterEditor.rangeInputLabel": "範囲",
+    "unifiedSearch.filter.filterEditor.rangeStartInputPlaceholder": "範囲の開始値",
+    "unifiedSearch.filter.filterEditor.saveButtonLabel": "保存",
+    "unifiedSearch.filter.filterEditor.trueOptionLabel": "true",
+    "unifiedSearch.filter.filterEditor.valueInputLabel": "値",
+    "unifiedSearch.filter.filterEditor.valueInputPlaceholder": "値を入力",
+    "unifiedSearch.filter.filterEditor.valueSelectPlaceholder": "値を選択",
+    "unifiedSearch.filter.filterEditor.valuesSelectLabel": "値",
+    "unifiedSearch.filter.filterEditor.valuesSelectPlaceholder": "値を選択",
+    "unifiedSearch.filter.options.changeAllFiltersButtonLabel": "すべてのフィルターの変更",
+    "unifiedSearch.filter.options.deleteAllFiltersButtonLabel": "すべて削除",
+    "unifiedSearch.filter.options.disableAllFiltersButtonLabel": "すべて無効にする",
+    "unifiedSearch.filter.options.enableAllFiltersButtonLabel": "すべて有効にする",
+    "unifiedSearch.filter.options.invertDisabledFiltersButtonLabel": "有効・無効を反転",
+    "unifiedSearch.filter.options.invertNegatedFiltersButtonLabel": "含める・除外を反転",
+    "unifiedSearch.filter.options.pinAllFiltersButtonLabel": "すべてピン付け",
+    "unifiedSearch.filter.options.unpinAllFiltersButtonLabel": "すべてのピンを外す",
+    "unifiedSearch.filter.searchBar.changeAllFiltersTitle": "すべてのフィルターの変更"
   }
 }
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 62d2c975e897..c86898e50e1c 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -1847,73 +1847,7 @@
     "data.aggTypes.buckets.ranges.rangesFormatMessageArrowRight": "{from} → {to}",
     "data.errors.fetchError": "请检查您的网络和代理配置。如果问题持续存在，请联系网络管理员。",
     "data.esError.unknownRootCause": "未知",
-    "data.filter.applyFilterActionTitle": "将筛选应用于当前视图",
-    "data.filter.applyFilters.popupHeader": "选择要应用的筛选",
-    "data.filter.applyFiltersPopup.cancelButtonLabel": "取消",
-    "data.filter.applyFiltersPopup.saveButtonLabel": "应用",
-    "data.filter.filterBar.addFilterButtonLabel": "添加筛选",
-    "data.filter.filterBar.deleteFilterButtonLabel": "删除",
-    "data.filter.filterBar.disabledFilterPrefix": "已禁用",
-    "data.filter.filterBar.disableFilterButtonLabel": "暂时禁用",
-    "data.filter.filterBar.editFilterButtonLabel": "编辑筛选",
-    "data.filter.filterBar.enableFilterButtonLabel": "重新启用",
-    "data.filter.filterBar.excludeFilterButtonLabel": "排除结果",
     "data.filter.filterBar.fieldNotFound": "索引模式 {indexPattern} 中未找到字段 {key}",
-    "data.filter.filterBar.filterItemBadgeAriaLabel": "筛选操作",
-    "data.filter.filterBar.filterItemBadgeIconAriaLabel": "删除 {filter}",
-    "data.filter.filterBar.includeFilterButtonLabel": "包括结果",
-    "data.filter.filterBar.indexPatternSelectPlaceholder": "选择索引模式",
-    "data.filter.filterBar.labelErrorInfo": "找不到索引模式 {indexPattern}",
-    "data.filter.filterBar.labelErrorText": "错误",
-    "data.filter.filterBar.labelWarningInfo": "当前视图中不存在字段 {fieldName}",
-    "data.filter.filterBar.labelWarningText": "警告",
-    "data.filter.filterBar.moreFilterActionsMessage": "筛选：{innerText}。选择以获取更多筛选操作。",
-    "data.filter.filterBar.negatedFilterPrefix": "非 ",
-    "data.filter.filterBar.pinFilterButtonLabel": "在所有应用上固定",
-    "data.filter.filterBar.pinnedFilterPrefix": "已置顶",
-    "data.filter.filterBar.unpinFilterButtonLabel": "取消固定",
-    "data.filter.filterEditor.cancelButtonLabel": "取消",
-    "data.filter.filterEditor.createCustomLabelInputLabel": "定制标签",
-    "data.filter.filterEditor.createCustomLabelSwitchLabel": "创建定制标签？",
-    "data.filter.filterEditor.doesNotExistOperatorOptionLabel": "不存在",
-    "data.filter.filterEditor.editFilterPopupTitle": "编辑筛选",
-    "data.filter.filterEditor.editFilterValuesButtonLabel": "编辑筛选值",
-    "data.filter.filterEditor.editQueryDslButtonLabel": "编辑为查询 DSL",
-    "data.filter.filterEditor.existsOperatorOptionLabel": "存在",
-    "data.filter.filterEditor.falseOptionLabel": "false",
-    "data.filter.filterEditor.fieldSelectLabel": "字段",
-    "data.filter.filterEditor.fieldSelectPlaceholder": "首先选择字段",
-    "data.filter.filterEditor.indexPatternSelectLabel": "索引模式",
-    "data.filter.filterEditor.isBetweenOperatorOptionLabel": "介于",
-    "data.filter.filterEditor.isNotBetweenOperatorOptionLabel": "不介于",
-    "data.filter.filterEditor.isNotOneOfOperatorOptionLabel": "不属于",
-    "data.filter.filterEditor.isNotOperatorOptionLabel": "不是",
-    "data.filter.filterEditor.isOneOfOperatorOptionLabel": "属于",
-    "data.filter.filterEditor.isOperatorOptionLabel": "是",
-    "data.filter.filterEditor.operatorSelectLabel": "运算符",
-    "data.filter.filterEditor.operatorSelectPlaceholderSelect": "选择",
-    "data.filter.filterEditor.operatorSelectPlaceholderWaiting": "正在等候",
-    "data.filter.filterEditor.queryDslAriaLabel": "Elasticsearch 查询 DSL 编辑器",
-    "data.filter.filterEditor.queryDslLabel": "Elasticsearch 查询 DSL",
-    "data.filter.filterEditor.rangeEndInputPlaceholder": "范围结束",
-    "data.filter.filterEditor.rangeInputLabel": "范围",
-    "data.filter.filterEditor.rangeStartInputPlaceholder": "范围开始",
-    "data.filter.filterEditor.saveButtonLabel": "保存",
-    "data.filter.filterEditor.trueOptionLabel": "true",
-    "data.filter.filterEditor.valueInputLabel": "值",
-    "data.filter.filterEditor.valueInputPlaceholder": "输入值",
-    "data.filter.filterEditor.valueSelectPlaceholder": "选择值",
-    "data.filter.filterEditor.valuesSelectLabel": "值",
-    "data.filter.filterEditor.valuesSelectPlaceholder": "选择值",
-    "data.filter.options.changeAllFiltersButtonLabel": "更改所有筛选",
-    "data.filter.options.deleteAllFiltersButtonLabel": "全部删除",
-    "data.filter.options.disableAllFiltersButtonLabel": "全部禁用",
-    "data.filter.options.enableAllFiltersButtonLabel": "全部启用",
-    "data.filter.options.invertDisabledFiltersButtonLabel": "反向已启用/已禁用",
-    "data.filter.options.invertNegatedFiltersButtonLabel": "反向包括",
-    "data.filter.options.pinAllFiltersButtonLabel": "全部固定",
-    "data.filter.options.unpinAllFiltersButtonLabel": "全部取消固定",
-    "data.filter.searchBar.changeAllFiltersTitle": "更改所有筛选",
     "data.functions.esaggs.help": "运行 AggConfig 聚合",
     "data.functions.esaggs.inspector.dataRequest.description": "此请求查询 Elasticsearch，以获取可视化的数据。",
     "data.functions.esaggs.inspector.dataRequest.title": "数据",
@@ -1951,31 +1885,10 @@
     "data.kueryAutocomplete.lessThanOrEqualOperatorDescription.lessThanOrEqualToText": "小于或等于",
     "data.kueryAutocomplete.orOperatorDescription": "需要{oneOrMoreArguments}为 true",
     "data.kueryAutocomplete.orOperatorDescription.oneOrMoreArgumentsText": "一个或多个参数",
-    "data.noDataPopover.content": "此时间范围不包含任何数据。增大或调整时间范围，以查看更多的字段并创建图表。",
-    "data.noDataPopover.dismissAction": "不再显示",
-    "data.noDataPopover.subtitle": "提示",
-    "data.noDataPopover.title": "空数据集",
     "data.painlessError.buttonTxt": "编辑脚本",
     "data.painlessError.painlessScriptedFieldErrorMessage": "在索引模式 {indexPatternName} 上执行运行时字段或脚本字段时出错",
     "data.parseEsInterval.invalidEsCalendarIntervalErrorMessage": "无效的日历时间间隔：{interval}，值必须为 1",
     "data.parseEsInterval.invalidEsIntervalFormatErrorMessage": "时间间隔格式无效：{interval}",
-    "data.query.queryBar.clearInputLabel": "清除输入",
-    "data.query.queryBar.comboboxAriaLabel": "搜索并筛选 {pageType} 页面",
-    "data.query.queryBar.kqlFullLanguageName": "Kibana 查询语言",
-    "data.query.queryBar.kqlLanguageName": "KQL",
-    "data.query.queryBar.KQLNestedQuerySyntaxInfoDocLinkText": "文档",
-    "data.query.queryBar.KQLNestedQuerySyntaxInfoOptOutText": "不再显示",
-    "data.query.queryBar.KQLNestedQuerySyntaxInfoText": "似乎您正在查询嵌套字段。您可以使用不同的方式构造嵌套查询的 KQL 语法，具体取决于您想要的结果。详细了解我们的 {link}。",
-    "data.query.queryBar.KQLNestedQuerySyntaxInfoTitle": "KQL 嵌套查询语法",
-    "data.query.queryBar.kqlOffLabel": "关闭",
-    "data.query.queryBar.kqlOnLabel": "开启",
-    "data.query.queryBar.languageSwitcher.toText": "切换到 Kibana 查询语言以进行搜索",
-    "data.query.queryBar.luceneLanguageName": "Lucene",
-    "data.query.queryBar.searchInputAriaLabel": "开始键入内容，以搜索并筛选 {pageType} 页面",
-    "data.query.queryBar.searchInputPlaceholder": "搜索",
-    "data.query.queryBar.syntaxOptionsDescription": "{docsLink} (KQL) 提供简化查询语法并支持脚本字段。KQL 还提供自动完成功能。如果关闭 KQL，{nonKqlModeHelpText}",
-    "data.query.queryBar.syntaxOptionsDescription.nonKqlModeHelpText": "Kibana 使用 Lucene。",
-    "data.query.queryBar.syntaxOptionsTitle": "语法选项",
     "data.search.aggs.aggGroups.bucketsText": "存储桶",
     "data.search.aggs.aggGroups.metricsText": "指标",
     "data.search.aggs.aggGroups.noneText": "无",
@@ -2551,34 +2464,6 @@
     "data.search.functions.timerange.mode.help": "指定模式（绝对或相对）",
     "data.search.functions.timerange.to.help": "指定结束日期",
     "data.search.httpErrorTitle": "无法检索您的数据",
-    "data.search.searchBar.savedQueryDescriptionLabelText": "描述",
-    "data.search.searchBar.savedQueryDescriptionText": "保存想要再次使用的查询文本和筛选。",
-    "data.search.searchBar.savedQueryForm.titleConflictText": "标题与现有已保存查询有冲突",
-    "data.search.searchBar.savedQueryFormCancelButtonText": "取消",
-    "data.search.searchBar.savedQueryFormSaveButtonText": "保存",
-    "data.search.searchBar.savedQueryFormTitle": "保存查询",
-    "data.search.searchBar.savedQueryIncludeFiltersLabelText": "包括筛选",
-    "data.search.searchBar.savedQueryIncludeTimeFilterLabelText": "包括时间筛选",
-    "data.search.searchBar.savedQueryNameHelpText": "名称必填，其中不能包含前导或尾随空格，并且必须唯一。",
-    "data.search.searchBar.savedQueryNameLabelText": "名称",
-    "data.search.searchBar.savedQueryNoSavedQueriesText": "没有已保存查询。",
-    "data.search.searchBar.savedQueryPopoverButtonText": "查看已保存查询",
-    "data.search.searchBar.savedQueryPopoverClearButtonAriaLabel": "清除当前已保存查询",
-    "data.search.searchBar.savedQueryPopoverClearButtonText": "清除",
-    "data.search.searchBar.savedQueryPopoverConfirmDeletionCancelButtonText": "取消",
-    "data.search.searchBar.savedQueryPopoverConfirmDeletionConfirmButtonText": "删除",
-    "data.search.searchBar.savedQueryPopoverConfirmDeletionTitle": "删除“{savedQueryName}”？",
-    "data.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel": "删除已保存查询 {savedQueryName}",
-    "data.search.searchBar.savedQueryPopoverSaveAsNewButtonAriaLabel": "另存为新的已保存查询",
-    "data.search.searchBar.savedQueryPopoverSaveAsNewButtonText": "另存为新的",
-    "data.search.searchBar.savedQueryPopoverSaveButtonAriaLabel": "保存新的已保存查询",
-    "data.search.searchBar.savedQueryPopoverSaveButtonText": "保存当前查询",
-    "data.search.searchBar.savedQueryPopoverSaveChangesButtonAriaLabel": "将更改保存到 {title}",
-    "data.search.searchBar.savedQueryPopoverSaveChangesButtonText": "保存更改",
-    "data.search.searchBar.savedQueryPopoverSavedQueryListItemButtonAriaLabel": "已保存查询按钮 {savedQueryName}",
-    "data.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel": "{savedQueryName} 描述",
-    "data.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "已保存查询按钮已选择 {savedQueryName}。按下可清除任何更改。",
-    "data.search.searchBar.savedQueryPopoverTitleText": "已保存查询",
     "data.search.searchSource.dataViewDescription": "被查询的数据视图。",
     "data.search.searchSource.dataViewIdLabel": "数据视图 ID",
     "data.search.searchSource.dataViewLabel": "数据视图",
@@ -2620,7 +2505,6 @@
     "data.search.timeoutContactAdmin": "您的查询已超时。请联系您的系统管理员以延长运行时间。",
     "data.search.timeoutIncreaseSetting": "您的查询已超时。使用搜索超时高级设置延长运行时间。",
     "data.search.timeoutIncreaseSettingActionText": "编辑设置",
-    "data.search.unableToGetSavedQueryToastTitle": "无法加载已保存查询 {savedQueryId}",
     "data.searchSession.warning.readDocs": "阅读更多内容",
     "data.searchSessionIndicator.noCapability": "您无权创建搜索会话。",
     "data.searchSessions.sessionService.sessionEditNameError": "无法编辑搜索会话的名称",
@@ -29523,6 +29407,122 @@
     "xpack.watcher.watchActions.webhook.portIsRequiredValidationMessage": "Webhook 端口必填。",
     "xpack.watcher.watchActions.webhook.usernameIsRequiredIfPasswordValidationMessage": "“用户名”必填。",
     "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "此字段必填。",
-    "xpack.watcher.watcherDescription": "通过创建、管理和监测警报来检测数据中的更改。"
+    "xpack.watcher.watcherDescription": "通过创建、管理和监测警报来检测数据中的更改。",
+    "unifiedSearch.search.searchBar.savedQueryDescriptionLabelText": "描述",
+    "unifiedSearch.search.searchBar.savedQueryDescriptionText": "保存想要再次使用的查询文本和筛选。",
+    "unifiedSearch.search.searchBar.savedQueryForm.titleConflictText": "标题与现有已保存查询有冲突",
+    "unifiedSearch.search.searchBar.savedQueryFormCancelButtonText": "取消",
+    "unifiedSearch.search.searchBar.savedQueryFormSaveButtonText": "保存",
+    "unifiedSearch.search.searchBar.savedQueryFormTitle": "保存查询",
+    "unifiedSearch.search.searchBar.savedQueryIncludeFiltersLabelText": "包括筛选",
+    "unifiedSearch.search.searchBar.savedQueryIncludeTimeFilterLabelText": "包括时间筛选",
+    "unifiedSearch.search.searchBar.savedQueryNameHelpText": "名称必填，其中不能包含前导或尾随空格，并且必须唯一。",
+    "unifiedSearch.search.searchBar.savedQueryNameLabelText": "名称",
+    "unifiedSearch.search.searchBar.savedQueryNoSavedQueriesText": "没有已保存查询。",
+    "unifiedSearch.search.searchBar.savedQueryPopoverButtonText": "查看已保存查询",
+    "unifiedSearch.search.searchBar.savedQueryPopoverClearButtonAriaLabel": "清除当前已保存查询",
+    "unifiedSearch.search.searchBar.savedQueryPopoverClearButtonText": "清除",
+    "unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionCancelButtonText": "取消",
+    "unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionConfirmButtonText": "删除",
+    "unifiedSearch.search.searchBar.savedQueryPopoverConfirmDeletionTitle": "删除“{savedQueryName}”？",
+    "unifiedSearch.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel": "删除已保存查询 {savedQueryName}",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveAsNewButtonAriaLabel": "另存为新的已保存查询",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveAsNewButtonText": "另存为新的",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveButtonAriaLabel": "保存新的已保存查询",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveButtonText": "保存当前查询",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveChangesButtonAriaLabel": "将更改保存到 {title}",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSaveChangesButtonText": "保存更改",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemButtonAriaLabel": "已保存查询按钮 {savedQueryName}",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel": "{savedQueryName} 描述",
+    "unifiedSearch.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "已保存查询按钮已选择 {savedQueryName}。按下可清除任何更改。",
+    "unifiedSearch.search.searchBar.savedQueryPopoverTitleText": "已保存查询",
+    "unifiedSearch.noDataPopover.content": "此时间范围不包含任何数据。增大或调整时间范围，以查看更多的字段并创建图表。",
+    "unifiedSearch.noDataPopover.dismissAction": "不再显示",
+    "unifiedSearch.noDataPopover.subtitle": "提示",
+    "unifiedSearch.noDataPopover.title": "空数据集",
+    "unifiedSearch.query.queryBar.clearInputLabel": "清除输入",
+    "unifiedSearch.query.queryBar.comboboxAriaLabel": "搜索并筛选 {pageType} 页面",
+    "unifiedSearch.query.queryBar.kqlFullLanguageName": "Kibana 查询语言",
+    "unifiedSearch.query.queryBar.kqlLanguageName": "KQL",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoDocLinkText": "文档",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoOptOutText": "不再显示",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoText": "似乎您正在查询嵌套字段。您可以使用不同的方式构造嵌套查询的 KQL 语法，具体取决于您想要的结果。详细了解我们的 {link}。",
+    "unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoTitle": "KQL 嵌套查询语法",
+    "unifiedSearch.query.queryBar.kqlOffLabel": "关闭",
+    "unifiedSearch.query.queryBar.kqlOnLabel": "开启",
+    "unifiedSearch.query.queryBar.languageSwitcher.toText": "切换到 Kibana 查询语言以进行搜索",
+    "unifiedSearch.query.queryBar.luceneLanguageName": "Lucene",
+    "unifiedSearch.query.queryBar.searchInputAriaLabel": "开始键入内容，以搜索并筛选 {pageType} 页面",
+    "unifiedSearch.query.queryBar.searchInputPlaceholder": "搜索",
+    "unifiedSearch.query.queryBar.syntaxOptionsDescription": "{docsLink} (KQL) 提供简化查询语法并支持脚本字段。KQL 还提供自动完成功能。如果关闭 KQL，{nonKqlModeHelpText}",
+    "unifiedSearch.query.queryBar.syntaxOptionsDescription.nonKqlModeHelpText": "Kibana 使用 Lucene。",
+    "unifiedSearch.search.unableToGetSavedQueryToastTitle": "无法加载已保存查询 {savedQueryId}",
+    "unifiedSearch.query.queryBar.syntaxOptionsTitle": "语法选项",
+    "unifiedSearch.filter.applyFilterActionTitle": "将筛选应用于当前视图",
+    "unifiedSearch.filter.applyFilters.popupHeader": "选择要应用的筛选",
+    "unifiedSearch.filter.applyFiltersPopup.cancelButtonLabel": "取消",
+    "unifiedSearch.filter.applyFiltersPopup.saveButtonLabel": "应用",
+    "unifiedSearch.filter.filterBar.addFilterButtonLabel": "添加筛选",
+    "unifiedSearch.filter.filterBar.deleteFilterButtonLabel": "删除",
+    "unifiedSearch.filter.filterBar.disabledFilterPrefix": "已禁用",
+    "unifiedSearch.filter.filterBar.disableFilterButtonLabel": "暂时禁用",
+    "unifiedSearch.filter.filterBar.editFilterButtonLabel": "编辑筛选",
+    "unifiedSearch.filter.filterBar.enableFilterButtonLabel": "重新启用",
+    "unifiedSearch.filter.filterBar.excludeFilterButtonLabel": "排除结果",
+    "unifiedSearch.filter.filterBar.filterItemBadgeAriaLabel": "筛选操作",
+    "unifiedSearch.filter.filterBar.filterItemBadgeIconAriaLabel": "删除 {filter}",
+    "unifiedSearch.filter.filterBar.includeFilterButtonLabel": "包括结果",
+    "unifiedSearch.filter.filterBar.indexPatternSelectPlaceholder": "选择索引模式",
+    "unifiedSearch.filter.filterBar.labelErrorInfo": "找不到索引模式 {indexPattern}",
+    "unifiedSearch.filter.filterBar.labelErrorText": "错误",
+    "unifiedSearch.filter.filterBar.labelWarningInfo": "当前视图中不存在字段 {fieldName}",
+    "unifiedSearch.filter.filterBar.labelWarningText": "警告",
+    "unifiedSearch.filter.filterBar.moreFilterActionsMessage": "筛选：{innerText}。选择以获取更多筛选操作。",
+    "unifiedSearch.filter.filterBar.negatedFilterPrefix": "非 ",
+    "unifiedSearch.filter.filterBar.pinFilterButtonLabel": "在所有应用上固定",
+    "unifiedSearch.filter.filterBar.pinnedFilterPrefix": "已置顶",
+    "unifiedSearch.filter.filterBar.unpinFilterButtonLabel": "取消固定",
+    "unifiedSearch.filter.filterEditor.cancelButtonLabel": "取消",
+    "unifiedSearch.filter.filterEditor.createCustomLabelInputLabel": "定制标签",
+    "unifiedSearch.filter.filterEditor.createCustomLabelSwitchLabel": "创建定制标签？",
+    "unifiedSearch.filter.filterEditor.doesNotExistOperatorOptionLabel": "不存在",
+    "unifiedSearch.filter.filterEditor.editFilterPopupTitle": "编辑筛选",
+    "unifiedSearch.filter.filterEditor.editFilterValuesButtonLabel": "编辑筛选值",
+    "unifiedSearch.filter.filterEditor.editQueryDslButtonLabel": "编辑为查询 DSL",
+    "unifiedSearch.filter.filterEditor.existsOperatorOptionLabel": "存在",
+    "unifiedSearch.filter.filterEditor.falseOptionLabel": "false",
+    "unifiedSearch.filter.filterEditor.fieldSelectLabel": "字段",
+    "unifiedSearch.filter.filterEditor.fieldSelectPlaceholder": "首先选择字段",
+    "unifiedSearch.filter.filterEditor.indexPatternSelectLabel": "索引模式",
+    "unifiedSearch.filter.filterEditor.isBetweenOperatorOptionLabel": "介于",
+    "unifiedSearch.filter.filterEditor.isNotBetweenOperatorOptionLabel": "不介于",
+    "unifiedSearch.filter.filterEditor.isNotOneOfOperatorOptionLabel": "不属于",
+    "unifiedSearch.filter.filterEditor.isNotOperatorOptionLabel": "不是",
+    "unifiedSearch.filter.filterEditor.isOneOfOperatorOptionLabel": "属于",
+    "unifiedSearch.filter.filterEditor.isOperatorOptionLabel": "是",
+    "unifiedSearch.filter.filterEditor.operatorSelectLabel": "运算符",
+    "unifiedSearch.filter.filterEditor.operatorSelectPlaceholderSelect": "选择",
+    "unifiedSearch.filter.filterEditor.operatorSelectPlaceholderWaiting": "正在等候",
+    "unifiedSearch.filter.filterEditor.queryDslAriaLabel": "Elasticsearch 查询 DSL 编辑器",
+    "unifiedSearch.filter.filterEditor.queryDslLabel": "Elasticsearch 查询 DSL",
+    "unifiedSearch.filter.filterEditor.rangeEndInputPlaceholder": "范围结束",
+    "unifiedSearch.filter.filterEditor.rangeInputLabel": "范围",
+    "unifiedSearch.filter.filterEditor.rangeStartInputPlaceholder": "范围开始",
+    "unifiedSearch.filter.filterEditor.saveButtonLabel": "保存",
+    "unifiedSearch.filter.filterEditor.trueOptionLabel": "true",
+    "unifiedSearch.filter.filterEditor.valueInputLabel": "值",
+    "unifiedSearch.filter.filterEditor.valueInputPlaceholder": "输入值",
+    "unifiedSearch.filter.filterEditor.valueSelectPlaceholder": "选择值",
+    "unifiedSearch.filter.filterEditor.valuesSelectLabel": "值",
+    "unifiedSearch.filter.filterEditor.valuesSelectPlaceholder": "选择值",
+    "unifiedSearch.filter.options.changeAllFiltersButtonLabel": "更改所有筛选",
+    "unifiedSearch.filter.options.deleteAllFiltersButtonLabel": "全部删除",
+    "unifiedSearch.filter.options.disableAllFiltersButtonLabel": "全部禁用",
+    "unifiedSearch.filter.options.enableAllFiltersButtonLabel": "全部启用",
+    "unifiedSearch.filter.options.invertDisabledFiltersButtonLabel": "反向已启用/已禁用",
+    "unifiedSearch.filter.options.invertNegatedFiltersButtonLabel": "反向包括",
+    "unifiedSearch.filter.options.pinAllFiltersButtonLabel": "全部固定",
+    "unifiedSearch.filter.options.unpinAllFiltersButtonLabel": "全部取消固定",
+    "unifiedSearch.filter.searchBar.changeAllFiltersTitle": "更改所有筛选"
   }
 }
diff --git a/x-pack/plugins/triggers_actions_ui/kibana.json b/x-pack/plugins/triggers_actions_ui/kibana.json
index b7b918aff946..66135f67c0d5 100644
--- a/x-pack/plugins/triggers_actions_ui/kibana.json
+++ b/x-pack/plugins/triggers_actions_ui/kibana.json
@@ -8,7 +8,7 @@
   "server": true,
   "ui": true,
   "optionalPlugins": ["alerting", "cloud", "features", "home", "spaces"],
-  "requiredPlugins": ["management", "charts", "data", "kibanaReact", "kibanaUtils", "savedObjects"],
+  "requiredPlugins": ["management", "charts", "data", "kibanaReact", "kibanaUtils", "savedObjects", "unifiedSearch"],
   "configPath": ["xpack", "trigger_actions_ui"],
   "extraPublicDirs": ["public/common", "public/common/constants"],
   "requiredBundles": ["home", "alerting", "esUiShared", "kibanaReact", "kibanaUtils"]
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/app.tsx b/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
index 0701eac20a85..94bb58e511c4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
@@ -18,6 +18,7 @@ import { Section, routeToRuleDetails, legacyRouteToRuleDetails } from './constan
 import { ActionTypeRegistryContract, RuleTypeRegistryContract } from '../types';
 import { ChartsPluginStart } from '../../../../../src/plugins/charts/public';
 import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
+import { UnifiedSearchPublicPluginStart } from '../../../../../src/plugins/unified_search/public';
 import { PluginStartContract as AlertingStart } from '../../../alerting/public';
 import type { SpacesPluginStart } from '../../../spaces/public';
 
@@ -47,6 +48,7 @@ export interface TriggersAndActionsUiServices extends CoreStart {
   kibanaFeatures: KibanaFeature[];
   element: HTMLElement;
   theme$: Observable<CoreTheme>;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
 }
 
 export const renderApp = (deps: TriggersAndActionsUiServices) => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx
index 14dd7829fe49..e126825f2113 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_form.tsx
@@ -119,6 +119,7 @@ export const RuleForm = ({
     kibanaFeatures,
     charts,
     data,
+    unifiedSearch,
   } = useKibana().services;
   const canShowActions = hasShowActionsCapability(capabilities);
 
@@ -523,6 +524,7 @@ export const RuleForm = ({
               metadata={metadata}
               charts={charts}
               data={data}
+              unifiedSearch={unifiedSearch}
             />
           </Suspense>
         </EuiErrorBoundary>
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts
index eaf4df31e068..97679041b94c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts
@@ -8,6 +8,7 @@
 import React from 'react';
 import { chartPluginMock } from '../../../../../../../src/plugins/charts/public/mocks';
 import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
+import { unifiedSearchPluginMock } from '../../../../../../../src/plugins/unified_search/public/mocks';
 import {
   coreMock,
   scopedHistoryMock,
@@ -37,6 +38,7 @@ export const createStartServicesMock = (): TriggersAndActionsUiServices => {
     history: scopedHistoryMock.create(),
     setBreadcrumbs: jest.fn(),
     data: dataPluginMock.createStartContract(),
+    unifiedSearch: unifiedSearchPluginMock.createStartContract(),
     actionTypeRegistry: {
       has: jest.fn(),
       register: jest.fn(),
diff --git a/x-pack/plugins/triggers_actions_ui/public/plugin.ts b/x-pack/plugins/triggers_actions_ui/public/plugin.ts
index 1993f0f931e1..7588af019500 100644
--- a/x-pack/plugins/triggers_actions_ui/public/plugin.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/plugin.ts
@@ -49,6 +49,7 @@ import type {
   AlertsTableProps,
 } from './types';
 import { TriggersActionsUiConfigType } from '../common/types';
+import type { UnifiedSearchPublicPluginStart } from '../../../../src/plugins/unified_search/public';
 
 export interface TriggersAndActionsUIPublicPluginSetup {
   actionTypeRegistry: TypeRegistry<ActionTypeModel>;
@@ -86,6 +87,7 @@ interface PluginsStart {
   spaces?: SpacesPluginStart;
   navigateToApp: CoreStart['application']['navigateToApp'];
   features: FeaturesPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
 }
 
 export class Plugin
@@ -166,6 +168,7 @@ export class Plugin
           charts: pluginsStart.charts,
           alerting: pluginsStart.alerting,
           spaces: pluginsStart.spaces,
+          unifiedSearch: pluginsStart.unifiedSearch,
           isCloud: Boolean(plugins.cloud?.isCloudEnabled),
           element: params.element,
           theme$: params.theme$,
diff --git a/x-pack/plugins/triggers_actions_ui/public/types.ts b/x-pack/plugins/triggers_actions_ui/public/types.ts
index 109c31617b70..f4bda5bb2a2d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/types.ts
@@ -7,12 +7,13 @@
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import type { DocLinksStart } from 'kibana/public';
-import { ComponentType } from 'react';
+import type { ComponentType } from 'react';
+import type { ChartsPluginSetup } from 'src/plugins/charts/public';
+import type { DataPublicPluginStart } from 'src/plugins/data/public';
+import type { UnifiedSearchPublicPluginStart } from 'src/plugins/unified_search/public';
+import type { IconType } from '@elastic/eui';
 import { AlertConsumers } from '@kbn/rule-data-utils';
-import { ChartsPluginSetup } from 'src/plugins/charts/public';
-import { DataPublicPluginStart } from 'src/plugins/data/public';
 import {
-  IconType,
   EuiDataGridColumn,
   EuiDataGridControlColumn,
   EuiDataGridCellValueElementProps,
@@ -281,6 +282,7 @@ export interface RuleTypeParamsExpressionProps<
   metadata?: MetaData;
   charts: ChartsPluginSetup;
   data: DataPublicPluginStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
 }
 
 export interface RuleTypeModel<Params extends RuleTypeParams = RuleTypeParams> {
diff --git a/x-pack/plugins/triggers_actions_ui/tsconfig.json b/x-pack/plugins/triggers_actions_ui/tsconfig.json
index 38d3fa9ad599..a2113a3a230f 100644
--- a/x-pack/plugins/triggers_actions_ui/tsconfig.json
+++ b/x-pack/plugins/triggers_actions_ui/tsconfig.json
@@ -26,5 +26,6 @@
     { "path": "../../../src/plugins/kibana_utils/tsconfig.json" },
     { "path": "../../../src/plugins/management/tsconfig.json" },
     { "path": "../spaces/tsconfig.json" },
+    { "path": "../../../src/plugins/unified_search/tsconfig.json" }
   ]
 }
diff --git a/x-pack/plugins/uptime/kibana.json b/x-pack/plugins/uptime/kibana.json
index 0ae53fe56b1a..2479f25d3234 100644
--- a/x-pack/plugins/uptime/kibana.json
+++ b/x-pack/plugins/uptime/kibana.json
@@ -23,7 +23,7 @@
   "server": true,
   "ui": true,
   "version": "8.0.0",
-  "requiredBundles": ["data", "fleet", "home", "kibanaReact", "kibanaUtils", "ml", "observability"],
+  "requiredBundles": ["unifiedSearch", "fleet", "home", "kibanaReact", "kibanaUtils", "ml", "observability"],
   "owner": {
     "name": "Uptime",
     "githubTeam": "uptime"
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/alert_query_bar/query_bar.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/alert_query_bar/query_bar.tsx
index 4c6072a01864..ad6ffeacc909 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/alert_query_bar/query_bar.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/alerts/alert_query_bar/query_bar.tsx
@@ -8,7 +8,7 @@
 import React, { useEffect, useState } from 'react';
 import { EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { QueryStringInput } from '../../../../../../../../src/plugins/data/public';
+import { QueryStringInput } from '../../../../../../../../src/plugins/unified_search/public';
 import { isValidKuery } from '../../query_bar/query_bar';
 import * as labels from '../translations';
 import { useIndexPattern } from '../../../../hooks';
diff --git a/x-pack/plugins/uptime/public/components/overview/query_bar/query_bar.tsx b/x-pack/plugins/uptime/public/components/overview/query_bar/query_bar.tsx
index 3c8c0599efa6..c894ba345a36 100644
--- a/x-pack/plugins/uptime/public/components/overview/query_bar/query_bar.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/query_bar/query_bar.tsx
@@ -8,7 +8,7 @@
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexItem } from '@elastic/eui';
-import { QueryStringInput } from '../../../../../../../src/plugins/data/public/';
+import { QueryStringInput } from '../../../../../../../src/plugins/unified_search/public/';
 import { SyntaxType, useQueryBar } from './use_query_bar';
 import { KQL_PLACE_HOLDER, SIMPLE_SEARCH_PLACEHOLDER } from './translations';
 import { useGetUrlParams, useIndexPattern } from '../../../hooks';
diff --git a/x-pack/plugins/uptime/tsconfig.json b/x-pack/plugins/uptime/tsconfig.json
index 8e50623755fa..17088fe6f1fd 100644
--- a/x-pack/plugins/uptime/tsconfig.json
+++ b/x-pack/plugins/uptime/tsconfig.json
@@ -30,6 +30,9 @@
     },
     {
       "path": "../fleet/tsconfig.json"
+    },
+    {
+      "path": "../../../src/plugins/unified_search/tsconfig.json"
     }
   ]
 }