diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index fc9c55e7868f4..d1cf0300b9e17 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -17,6 +17,7 @@
 /src/plugins/input_control_vis/ @elastic/kibana-app
 /src/plugins/management/ @elastic/kibana-app
 /src/plugins/kibana_legacy/ @elastic/kibana-app
+/src/plugins/timelion/ @elastic/kibana-app
 /src/plugins/vis_default_editor/ @elastic/kibana-app
 /src/plugins/vis_type_markdown/ @elastic/kibana-app
 /src/plugins/vis_type_metric/ @elastic/kibana-app
@@ -30,32 +31,23 @@
 /src/plugins/visualize/ @elastic/kibana-app
 /src/plugins/visualizations/ @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
-#CC# /src/plugins/vis_type @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/ @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/common/utils @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/migrations @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/public @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
-#CC# /src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
 #CC# /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
-#CC# /src/legacy/core_plugins/console_legacy @elastic/kibana-app
 #CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-app
 #CC# /src/legacy/core_plugins/timelion @elastic/kibana-app
 #CC# /src/legacy/core_plugins/vis_type_tagcloud @elastic/kibana-app
 #CC# /src/legacy/core_plugins/vis_type_vega @elastic/kibana-app
 #CC# /src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
-#CC# /src/legacy/server/sample_data/ @elastic/kibana-app
 #CC# /src/legacy/server/url_shortening/ @elastic/kibana-app
 #CC# /src/legacy/ui/public/state_management @elastic/kibana-app
-#CC# /src/plugins/charts/public/static/color_maps @elastic/kibana-app
 #CC# /src/plugins/index_pattern_management/public @elastic/kibana-app
-#CC# /src/plugins/input_control_vis/ @elastic/kibana-app
-#CC# /src/plugins/kibana_legacy/ @elastic/kibana-app
-#CC# /src/plugins/timelion @elastic/kibana-app
 #CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-app
 #CC# /x-pack/plugins/dashboard_mode @elastic/kibana-app
-#CC# /x-pack/plugins/lens/ @elastic/kibana-app
 
 # App Architecture
 /examples/bfetch_explorer/ @elastic/kibana-app-arch
@@ -147,6 +139,7 @@
 /src/plugins/home/server/services/ @elastic/kibana-core-ui
 /x-pack/plugins/global_search_bar/ @elastic/kibana-core-ui
 #CC# /src/legacy/core_plugins/newsfeed @elastic/kibana-core-ui
+#CC# /src/legacy/server/sample_data/ @elastic/kibana-core-ui
 #CC# /src/plugins/newsfeed @elastic/kibana-core-ui
 #CC# /src/plugins/home/public @elastic/kibana-core-ui
 #CC# /src/plugins/home/server/services/ @elastic/kibana-core-ui
@@ -351,6 +344,8 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 /x-pack/plugins/ingest_pipelines/  @elastic/es-ui
 /packages/kbn-ace/ @elastic/es-ui
 /packages/kbn-monaco/ @elastic/es-ui
+#CC# /src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/es-ui
+#CC# /src/legacy/core_plugins/console_legacy @elastic/es-ui
 #CC# /x-pack/legacy/plugins/rollup/ @elastic/es-ui
 #CC# /x-pack/legacy/server/lib/create_router/ @elastic/es-ui
 #CC# /x-pack/legacy/server/lib/check_license/ @elastic/es-ui
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
index ed58e77427d47..bf11f87b96ce9 100644
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@@ -168,7 +168,7 @@ It also provides a stateful version of it on the start contract.
 
 
 |{kib-repo}blob/{branch}/src/plugins/telemetry_management_section/README.md[telemetryManagementSection]
-|This plugin adds the Advanced Settings section for the Usage Data collection (aka Telemetry).
+|This plugin adds the Advanced Settings section for the Usage and Security Data collection (aka Telemetry).
 
 
 |{kib-repo}blob/{branch}/src/plugins/tile_map[tileMap]
diff --git a/docs/user/security/authorization/index.asciidoc b/docs/user/security/authorization/index.asciidoc
index 44ca96e4aece5..3af49753db664 100644
--- a/docs/user/security/authorization/index.asciidoc
+++ b/docs/user/security/authorization/index.asciidoc
@@ -2,11 +2,11 @@
 [[xpack-security-authorization]]
 
 === Granting access to {kib}
-The Elastic Stack comes with the `kibana_admin` {ref}/built-in-roles.html[built-in role], which you can use to grant access to all Kibana features in all spaces. To grant users access to a subset of spaces or features, you can create a custom role that grants the desired Kibana privileges.
+The Elastic Stack comes with the `kibana_admin` {ref}/built-in-roles.html[built-in role], which you can use to grant access to all {kib} features in all spaces. To grant users access to a subset of spaces or features, you can create a custom role that grants the desired {kib} privileges.
 
-When you assign a user multiple roles, the user receives a union of the roles’ privileges. Therefore, assigning the `kibana_admin` role in addition to a custom role that grants Kibana privileges is ineffective because `kibana_admin` has access to all the features in all spaces.
+When you assign a user multiple roles, the user receives a union of the roles’ privileges. Therefore, assigning the `kibana_admin` role in addition to a custom role that grants {kib} privileges is ineffective because `kibana_admin` has access to all the features in all spaces.
 
-NOTE: When running multiple tenants of Kibana by changing the `kibana.index` in your `kibana.yml`, you cannot use `kibana_admin` to grant access. You must create custom roles that authorize the user for that specific tenant. Although multi-tenant installations are supported, the recommended approach to securing access to Kibana segments is to grant users access to specific spaces.
+NOTE: When running multiple tenants of {kib} by changing the `kibana.index` in your `kibana.yml`, you cannot use `kibana_admin` to grant access. You must create custom roles that authorize the user for that specific tenant. Although multi-tenant installations are supported, the recommended approach to securing access to {kib} segments is to grant users access to specific spaces.
 
 [role="xpack"]
 [[xpack-kibana-role-management]]
@@ -17,26 +17,26 @@ To create a role that grants {kib} privileges, open the menu, go to *Stack Manag
 [[adding_kibana_privileges]]
 ==== Adding {kib} privileges
 
-To assign {kib} privileges to the role, click **Add space privilege** in the Kibana section.
+To assign {kib} privileges to the role, click **Add {kib} privilege** in the {kib} section.
 
 [role="screenshot"]
-image::user/security/images/add-space-privileges.png[Add space privileges]
+image::user/security/images/add-space-privileges.png[Add {kib} privileges]
 
 Open the **Spaces** selection control to specify whether to grant the role access to all spaces *** Global (all spaces)** or one or more individual spaces. If you select *** Global (all spaces)**, you can’t select individual spaces until you clear your selection.
 
 Use the **Privilege** menu to grant access to features. The default is **Custom**, which you can use to grant access to individual features. Otherwise, you can grant read and write access to all current and future features by selecting **All**, or grant read access to all current and future features by selecting **Read**.
 
-When using the **Customize by feature** option, you can choose either **All**, **Read** or **None** for access to each feature. As new features are added to Kibana, roles that use the custom option do not automatically get access to the new features. You must manually update the roles.
+When using the **Customize by feature** option, you can choose either **All**, **Read** or **None** for access to each feature. As new features are added to {kib}, roles that use the custom option do not automatically get access to the new features. You must manually update the roles.
 
 NOTE: *{stack-monitor-app}* relies on built-in roles to grant access. When a
 user is assigned the appropriate roles, the *{stack-monitor-app}* application is
 available; otherwise, it is not visible.
 
-To apply your changes, click **Create space privilege**. The space privilege shows up under the Kibana privileges section of the role.
+To apply your changes, click **Add {kib} privilege**. The privilege shows up under the {kib} privileges section of the role.
 
 
 [role="screenshot"]
-image::user/security/images/create-space-privilege.png[Create space privilege]
+image::user/security/images/create-space-privilege.png[Add {kib} privilege]
 
 ==== Feature availability
 
@@ -64,9 +64,9 @@ Features are available to users when their roles grant access to the features, *
 
 ==== Assigning different privileges to different spaces
 
-Using the same role, it’s possible to assign different privileges to different spaces. After you’ve added space privileges, click **Add space privilege**. If you’ve already added privileges for either *** Global (all spaces)** or an individual space, you will not be able to select these in the **Spaces** selection control.
+Using the same role, it’s possible to assign different privileges to different spaces. After you’ve added privileges, click **Add {kib} privilege**. If you’ve already added privileges for either *** Global (all spaces)** or an individual space, you will not be able to select these in the **Spaces** selection control.
 
-Additionally, if you’ve already assigned privileges at *** Global (all spaces)**, you are only able to assign additional privileges to individual spaces. Similar to the behavior of multiple roles granting the union of all privileges, space privileges are also a union. If you’ve already granted the user the **All** privilege at *** Global (all spaces)**, you’re not able to restrict the role to only the **Read** privilege at an individual space.
+Additionally, if you’ve already assigned privileges at *** Global (all spaces)**, you are only able to assign additional privileges to individual spaces. Similar to the behavior of multiple roles granting the union of all privileges, {kib} privileges are also a union. If you’ve already granted the user the **All** privilege at *** Global (all spaces)**, you’re not able to restrict the role to only the **Read** privilege at an individual space.
 
 
 ==== Privilege summary
@@ -78,39 +78,37 @@ image::user/security/images/view-privilege-summary.png[View privilege summary]
 
 ==== Example 1: Grant all access to Dashboard at an individual space
 
-. Click **Add space privilege**.
+. Click **Add {kib} privilege**.
 . For **Spaces**, select an individual space.
 . For **Privilege**, leave the default selection of **Custom**.
 . For the Dashboard feature, select **All**
-. Click **Create space privilege**.
+. Click **Add {kib} privilege**.
 
 [role="screenshot"]
 image::user/security/images/privilege-example-1.png[Privilege example 1]
 
 ==== Example 2: Grant all access to one space and read access to another
 
-. Click **Add space privilege**.
+. Click **Add {kib} privilege**.
 . For **Spaces**, select the first space.
 . For **Privilege**, select **All**.
-. Click **Create space privilege**.
-. Click **Add space privilege**.
+. Click **Add {kib} privilege**.
 . For **Spaces**, select the second space.
 . For **Privilege**, select **Read**.
-. Click **Create space privilege**.
+. Click **Add {kib} privilege**.
 
 [role="screenshot"]
 image::user/security/images/privilege-example-2.png[Privilege example 2]
 
 ==== Example 3: Grant read access to all spaces and write access to an individual space
 
-. Click **Add space privilege**.
+. Click **Add {kib} privilege**.
 . For **Spaces**, select *** Global (all spaces)**.
 . For **Privilege**, select **Read**.
-. Click **Create space privilege**.
-. Click **Add space privilege**.
+. Click **Add {kib} privilege**.
 . For **Spaces**, select the individual space.
 . For **Privilege**, select **All**.
-. Click **Create space privilege**.
+. Click **Add {kib} privilege**.
 
 [role="screenshot"]
 image::user/security/images/privilege-example-3.png[Privilege example 3]
diff --git a/src/plugins/discover/public/application/angular/context/api/_stubs.js b/src/plugins/discover/public/application/angular/context/api/_stubs.js
index 35ddf396c2dba..d82189db60935 100644
--- a/src/plugins/discover/public/application/angular/context/api/_stubs.js
+++ b/src/plugins/discover/public/application/angular/context/api/_stubs.js
@@ -74,7 +74,7 @@ export function createContextSearchSourceStub(hits, timeField = '@timestamp') {
   searchSourceStub.fetch = sinon.spy(() => {
     const timeField = searchSourceStub._stubTimeField;
     const lastQuery = searchSourceStub.setField.withArgs('query').lastCall.args[1];
-    const timeRange = lastQuery.query.constant_score.filter.range[timeField];
+    const timeRange = lastQuery.query.bool.must.constant_score.filter.range[timeField];
     const lastSort = searchSourceStub.setField.withArgs('sort').lastCall.args[1];
     const sortDirection = lastSort[0][timeField];
     const sortFunction =
diff --git a/src/plugins/discover/public/application/angular/context/api/context.predecessors.test.js b/src/plugins/discover/public/application/angular/context/api/context.predecessors.test.js
index 4987c77f4bf25..4c0515906a494 100644
--- a/src/plugins/discover/public/application/angular/context/api/context.predecessors.test.js
+++ b/src/plugins/discover/public/application/angular/context/api/context.predecessors.test.js
@@ -124,7 +124,9 @@ describe('context app', function () {
       ).then((hits) => {
         const intervals = mockSearchSource.setField.args
           .filter(([property]) => property === 'query')
-          .map(([, { query }]) => get(query, ['constant_score', 'filter', 'range', '@timestamp']));
+          .map(([, { query }]) =>
+            get(query, ['bool', 'must', 'constant_score', 'filter', 'range', '@timestamp'])
+          );
 
         expect(
           intervals.every(({ gte, lte }) => (gte && lte ? moment(gte).isBefore(lte) : true))
@@ -160,7 +162,9 @@ describe('context app', function () {
       ).then((hits) => {
         const intervals = mockSearchSource.setField.args
           .filter(([property]) => property === 'query')
-          .map(([, { query }]) => get(query, ['constant_score', 'filter', 'range', '@timestamp']));
+          .map(([, { query }]) =>
+            get(query, ['bool', 'must', 'constant_score', 'filter', 'range', '@timestamp'])
+          );
 
         // should have started at the given time
         expect(intervals[0].gte).toEqual(moment(MS_PER_DAY * 1000).toISOString());
diff --git a/src/plugins/discover/public/application/angular/context/api/context.successors.test.js b/src/plugins/discover/public/application/angular/context/api/context.successors.test.js
index ebf6e78585962..285d39cd4d8a4 100644
--- a/src/plugins/discover/public/application/angular/context/api/context.successors.test.js
+++ b/src/plugins/discover/public/application/angular/context/api/context.successors.test.js
@@ -125,7 +125,9 @@ describe('context app', function () {
       ).then((hits) => {
         const intervals = mockSearchSource.setField.args
           .filter(([property]) => property === 'query')
-          .map(([, { query }]) => get(query, ['constant_score', 'filter', 'range', '@timestamp']));
+          .map(([, { query }]) =>
+            get(query, ['bool', 'must', 'constant_score', 'filter', 'range', '@timestamp'])
+          );
 
         expect(
           intervals.every(({ gte, lte }) => (gte && lte ? moment(gte).isBefore(lte) : true))
@@ -163,7 +165,9 @@ describe('context app', function () {
       ).then((hits) => {
         const intervals = mockSearchSource.setField.args
           .filter(([property]) => property === 'query')
-          .map(([, { query }]) => get(query, ['constant_score', 'filter', 'range', '@timestamp']));
+          .map(([, { query }]) =>
+            get(query, ['bool', 'must', 'constant_score', 'filter', 'range', '@timestamp'])
+          );
 
         // should have started at the given time
         expect(intervals[0].lte).toEqual(moment(MS_PER_DAY * 3000).toISOString());
diff --git a/src/plugins/discover/public/application/angular/context/api/context.ts b/src/plugins/discover/public/application/angular/context/api/context.ts
index e244176914a9b..ba8cffd1d7558 100644
--- a/src/plugins/discover/public/application/angular/context/api/context.ts
+++ b/src/plugins/discover/public/application/angular/context/api/context.ts
@@ -31,6 +31,7 @@ export interface EsHitRecord {
   fields: Record<string, any>;
   sort: number[];
   _source: Record<string, any>;
+  _id: string;
 }
 export type EsHitRecordList = EsHitRecord[];
 
@@ -100,7 +101,8 @@ function fetchContextProvider(indexPatterns: IndexPatternsContract) {
         interval,
         searchAfter,
         remainingSize,
-        nanos
+        nanos,
+        anchor._id
       );
 
       documents =
diff --git a/src/plugins/discover/public/application/angular/context/api/utils/fetch_hits_in_interval.ts b/src/plugins/discover/public/application/angular/context/api/utils/fetch_hits_in_interval.ts
index 9a199ea4a62fc..5ac4164191633 100644
--- a/src/plugins/discover/public/application/angular/context/api/utils/fetch_hits_in_interval.ts
+++ b/src/plugins/discover/public/application/angular/context/api/utils/fetch_hits_in_interval.ts
@@ -43,7 +43,8 @@ export async function fetchHitsInInterval(
   interval: IntervalValue[],
   searchAfter: EsQuerySearchAfter,
   maxCount: number,
-  nanosValue: string
+  nanosValue: string,
+  anchorId: string
 ): Promise<EsHitRecordList> {
   const range: RangeQuery = {
     format: 'strict_date_optional_time',
@@ -61,10 +62,19 @@ export async function fetchHitsInInterval(
     .setField('size', maxCount)
     .setField('query', {
       query: {
-        constant_score: {
-          filter: {
-            range: {
-              [timeField]: range,
+        bool: {
+          must: {
+            constant_score: {
+              filter: {
+                range: {
+                  [timeField]: range,
+                },
+              },
+            },
+          },
+          must_not: {
+            ids: {
+              values: [anchorId],
             },
           },
         },
diff --git a/src/plugins/telemetry_management_section/README.md b/src/plugins/telemetry_management_section/README.md
index 0f795786720c9..c23a8591f6794 100644
--- a/src/plugins/telemetry_management_section/README.md
+++ b/src/plugins/telemetry_management_section/README.md
@@ -1,5 +1,5 @@
 # Telemetry Management Section
 
-This plugin adds the Advanced Settings section for the Usage Data collection (aka Telemetry).
+This plugin adds the Advanced Settings section for the Usage and Security Data collection (aka Telemetry).
 
 The reason for having it separated from the `telemetry` plugin is to avoid circular dependencies. The plugin `advancedSettings` depends on the `home` app that depends on the `telemetry` plugin because of the telemetry banner in the welcome screen.
diff --git a/src/plugins/telemetry_management_section/public/components/__snapshots__/opt_in_security_example_flyout.test.tsx.snap b/src/plugins/telemetry_management_section/public/components/__snapshots__/opt_in_security_example_flyout.test.tsx.snap
new file mode 100644
index 0000000000000..0b9d426008ca4
--- /dev/null
+++ b/src/plugins/telemetry_management_section/public/components/__snapshots__/opt_in_security_example_flyout.test.tsx.snap
@@ -0,0 +1,134 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`security flyout renders as expected renders as expected 1`] = `
+<EuiPortal>
+  <EuiFlyout
+    maxWidth={true}
+    onClose={[MockFunction]}
+    ownFocus={true}
+  >
+    <EuiFlyoutHeader>
+      <EuiTitle>
+        <h2>
+          Endpoint security data
+        </h2>
+      </EuiTitle>
+      <EuiTextColor
+        color="subdued"
+      >
+        <EuiText>
+          This is a representative sample of the endpoint security alert event that we collect. Endpoint security data is collected only when the Elastic Endpoint is enabled. It includes information about the endpoint configuration and detection events.
+        </EuiText>
+      </EuiTextColor>
+    </EuiFlyoutHeader>
+    <EuiFlyoutBody>
+      <EuiCodeBlock
+        language="js"
+      >
+        {
+  "@timestamp": "2020-09-22T14:34:56.82202300Z",
+  "agent": {
+    "build": {
+      "original": "version: 7.9.1, compiled: Thu Aug 27 14:50:21 2020, branch: 7.9, commit: b594beb958817dee9b9d908191ed766d483df3ea"
+    },
+    "id": "22dd8544-bcac-46cb-b970-5e681bb99e0b",
+    "type": "endpoint",
+    "version": "7.9.1"
+  },
+  "Endpoint": {
+    "policy": {
+      "applied": {
+        "artifacts": {
+          "global": {
+            "identifiers": [
+              {
+                "sha256": "6a546aade5563d3e8dffc1fe2d93d33edda8f9ca3e17ac3cc9ac707620cb9ecd",
+                "name": "endpointpe-v4-blocklist"
+              },
+              {
+                "sha256": "04f9f87accc5d5aea433427bd1bd4ec6908f8528c78ceed26f70df7875a99385",
+                "name": "endpointpe-v4-exceptionlist"
+              },
+              {
+                "sha256": "1471838597fcd79a54ea4a3ec9a9beee1a86feaedab6c98e61102559ced822a8",
+                "name": "endpointpe-v4-model"
+              },
+              {
+                "sha256": "824859b0c6749cc31951d92a73bbdddfcfe9f38abfe432087934d4dab9766ce8",
+                "name": "global-exceptionlist-windows"
+              }
+            ],
+            "version": "1.0.0"
+          },
+          "user": {
+            "identifiers": [
+              {
+                "sha256": "d801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658",
+                "name": "endpoint-exceptionlist-windows-v1"
+              }
+            ],
+            "version": "1.0.0"
+          }
+        }
+      }
+    }
+  },
+  "ecs": {
+    "version": "1.5.0"
+  },
+  "elastic": {
+    "agent": {
+      "id": "b2e88aea-2671-402a-828a-957526bac315"
+    }
+  },
+  "file": {
+    "path": "C:\\\\Windows\\\\Temp\\\\mimikatz.exe",
+    "size": 1263880,
+    "created": "2020-05-19T07:50:06.0Z",
+    "accessed": "2020-09-22T14:29:19.93531400Z",
+    "mtime": "2020-09-22T14:29:03.6040000Z",
+    "directory": "C:\\\\Windows\\\\Temp",
+    "hash": {
+      "sha1": "c9fb7f8a4c6b7b12b493a99a8dc6901d17867388",
+      "sha256": "cb1553a3c88817e4cc774a5a93f9158f6785bd3815447d04b6c3f4c2c4b21ed7",
+      "md5": "465d5d850f54d9cde767bda90743df30"
+    },
+    "Ext": {
+      "code_signature": {
+        "trusted": true,
+        "subject_name": "Open Source Developer, Benjamin Delpy",
+        "exists": true,
+        "status": "trusted"
+      },
+      "malware_classification": {
+        "identifier": "endpointpe-v4-model",
+        "score": 0.99956864118576,
+        "threshold": 0.71,
+        "version": "0.0.0"
+      }
+    }
+  },
+  "host": {
+    "os": {
+      "Ext": {
+        "variant": "Windows 10 Enterprise Evaluation"
+      },
+      "kernel": "2004 (10.0.19041.388)",
+      "name": "Windows",
+      "family": "windows",
+      "version": "2004 (10.0.19041.388)",
+      "platform": "windows",
+      "full": "Windows 10 Enterprise Evaluation 2004 (10.0.19041.388)"
+    }
+  },
+  "event": {
+    "kind": "alert"
+  },
+  "cluster_uuid": "kLbKvSMcRiiFAR0t8LebDA",
+  "cluster_name": "elasticsearch"
+}
+      </EuiCodeBlock>
+    </EuiFlyoutBody>
+  </EuiFlyout>
+</EuiPortal>
+`;
diff --git a/src/plugins/telemetry_management_section/public/components/__snapshots__/telemetry_management_section.test.tsx.snap b/src/plugins/telemetry_management_section/public/components/__snapshots__/telemetry_management_section.test.tsx.snap
index bed1bbeabb044..7357598c8495f 100644
--- a/src/plugins/telemetry_management_section/public/components/__snapshots__/telemetry_management_section.test.tsx.snap
+++ b/src/plugins/telemetry_management_section/public/components/__snapshots__/telemetry_management_section.test.tsx.snap
@@ -80,15 +80,32 @@ exports[`TelemetryManagementSectionComponent renders as expected 1`] = `
                 />
               </p>
               <p>
-                <EuiLink
-                  onClick={[Function]}
-                >
-                  <FormattedMessage
-                    defaultMessage="See an example of what we collect"
-                    id="telemetry.seeExampleOfWhatWeCollectLinkText"
-                    values={Object {}}
-                  />
-                </EuiLink>
+                <FormattedMessage
+                  defaultMessage="See examples of the {clusterData} and {endpointSecurityData} that we collect."
+                  id="telemetry.seeExamplesOfWhatWeCollect"
+                  values={
+                    Object {
+                      "clusterData": <EuiLink
+                        onClick={[Function]}
+                      >
+                        <FormattedMessage
+                          defaultMessage="cluster data"
+                          id="telemetry.clusterData"
+                          values={Object {}}
+                        />
+                      </EuiLink>,
+                      "endpointSecurityData": <EuiLink
+                        onClick={[Function]}
+                      >
+                        <FormattedMessage
+                          defaultMessage="endpoint security data"
+                          id="telemetry.securityData"
+                          values={Object {}}
+                        />
+                      </EuiLink>,
+                    }
+                  }
+                />
               </p>
             </React.Fragment>,
             "displayName": "Provide usage statistics",
diff --git a/src/plugins/telemetry_management_section/public/components/opt_in_security_example_flyout.test.tsx b/src/plugins/telemetry_management_section/public/components/opt_in_security_example_flyout.test.tsx
new file mode 100644
index 0000000000000..c80d0daf5a695
--- /dev/null
+++ b/src/plugins/telemetry_management_section/public/components/opt_in_security_example_flyout.test.tsx
@@ -0,0 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import { shallowWithIntl } from 'test_utils/enzyme_helpers';
+import { OptInSecurityExampleFlyout } from './opt_in_security_example_flyout';
+
+describe('security flyout renders as expected', () => {
+  it('renders as expected', () => {
+    expect(shallowWithIntl(<OptInSecurityExampleFlyout onClose={jest.fn()} />)).toMatchSnapshot();
+  });
+});
diff --git a/src/plugins/telemetry_management_section/public/components/opt_in_security_example_flyout.tsx b/src/plugins/telemetry_management_section/public/components/opt_in_security_example_flyout.tsx
new file mode 100644
index 0000000000000..af0de5b268ddc
--- /dev/null
+++ b/src/plugins/telemetry_management_section/public/components/opt_in_security_example_flyout.tsx
@@ -0,0 +1,235 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import * as React from 'react';
+
+import {
+  EuiCallOut,
+  EuiCodeBlock,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiFlyout,
+  EuiFlyoutHeader,
+  EuiFlyoutBody,
+  EuiLoadingSpinner,
+  EuiPortal, // EuiPortal is a temporary requirement to use EuiFlyout with "ownFocus"
+  EuiText,
+  EuiTextColor,
+  EuiTitle,
+} from '@elastic/eui';
+
+import { FormattedMessage } from '@kbn/i18n/react';
+
+interface Props {
+  onClose: () => void;
+}
+
+interface State {
+  isLoading: boolean;
+  hasPrivilegeToRead: boolean;
+}
+
+/**
+ * React component for displaying the example data associated with the Telemetry opt-in banner.
+ */
+export class OptInSecurityExampleFlyout extends React.PureComponent<Props, State> {
+  public readonly state: State = {
+    isLoading: true,
+    hasPrivilegeToRead: false,
+  };
+
+  async componentDidMount() {
+    try {
+      this.setState({
+        isLoading: false,
+        hasPrivilegeToRead: true,
+      });
+    } catch (err) {
+      this.setState({
+        isLoading: false,
+        hasPrivilegeToRead: err.status !== 403,
+      });
+    }
+  }
+
+  renderBody({ isLoading, hasPrivilegeToRead }: State) {
+    if (isLoading) {
+      return (
+        <EuiFlexGroup justifyContent="spaceAround">
+          <EuiFlexItem grow={false}>
+            <EuiLoadingSpinner size="xl" />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      );
+    }
+
+    if (!hasPrivilegeToRead) {
+      return (
+        <EuiCallOut
+          title={
+            <FormattedMessage
+              id="telemetry.callout.errorUnprivilegedUserTitle"
+              defaultMessage="Error displaying cluster statistics"
+            />
+          }
+          color="danger"
+          iconType="cross"
+        >
+          <FormattedMessage
+            id="telemetry.callout.errorUnprivilegedUserDescription"
+            defaultMessage="You do not have access to see unencrypted cluster statistics."
+          />
+        </EuiCallOut>
+      );
+    }
+
+    return (
+      <EuiCodeBlock language="js">
+        {JSON.stringify(this.exampleSecurityPayload, null, 2)}
+      </EuiCodeBlock>
+    );
+  }
+
+  render() {
+    return (
+      <EuiPortal>
+        <EuiFlyout ownFocus onClose={this.props.onClose} maxWidth={true}>
+          <EuiFlyoutHeader>
+            <EuiTitle>
+              <h2>Endpoint security data</h2>
+            </EuiTitle>
+            <EuiTextColor color="subdued">
+              <EuiText>
+                This is a representative sample of the endpoint security alert event that we
+                collect. Endpoint security data is collected only when the Elastic Endpoint is
+                enabled. It includes information about the endpoint configuration and detection
+                events.
+              </EuiText>
+            </EuiTextColor>
+          </EuiFlyoutHeader>
+          <EuiFlyoutBody>{this.renderBody(this.state)}</EuiFlyoutBody>
+        </EuiFlyout>
+      </EuiPortal>
+    );
+  }
+
+  exampleSecurityPayload = {
+    '@timestamp': '2020-09-22T14:34:56.82202300Z',
+    agent: {
+      build: {
+        original:
+          'version: 7.9.1, compiled: Thu Aug 27 14:50:21 2020, branch: 7.9, commit: b594beb958817dee9b9d908191ed766d483df3ea',
+      },
+      id: '22dd8544-bcac-46cb-b970-5e681bb99e0b',
+      type: 'endpoint',
+      version: '7.9.1',
+    },
+    Endpoint: {
+      policy: {
+        applied: {
+          artifacts: {
+            global: {
+              identifiers: [
+                {
+                  sha256: '6a546aade5563d3e8dffc1fe2d93d33edda8f9ca3e17ac3cc9ac707620cb9ecd',
+                  name: 'endpointpe-v4-blocklist',
+                },
+                {
+                  sha256: '04f9f87accc5d5aea433427bd1bd4ec6908f8528c78ceed26f70df7875a99385',
+                  name: 'endpointpe-v4-exceptionlist',
+                },
+                {
+                  sha256: '1471838597fcd79a54ea4a3ec9a9beee1a86feaedab6c98e61102559ced822a8',
+                  name: 'endpointpe-v4-model',
+                },
+                {
+                  sha256: '824859b0c6749cc31951d92a73bbdddfcfe9f38abfe432087934d4dab9766ce8',
+                  name: 'global-exceptionlist-windows',
+                },
+              ],
+              version: '1.0.0',
+            },
+            user: {
+              identifiers: [
+                {
+                  sha256: 'd801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+                  name: 'endpoint-exceptionlist-windows-v1',
+                },
+              ],
+              version: '1.0.0',
+            },
+          },
+        },
+      },
+    },
+    ecs: {
+      version: '1.5.0',
+    },
+    elastic: {
+      agent: {
+        id: 'b2e88aea-2671-402a-828a-957526bac315',
+      },
+    },
+    file: {
+      path: 'C:\\Windows\\Temp\\mimikatz.exe',
+      size: 1263880,
+      created: '2020-05-19T07:50:06.0Z',
+      accessed: '2020-09-22T14:29:19.93531400Z',
+      mtime: '2020-09-22T14:29:03.6040000Z',
+      directory: 'C:\\Windows\\Temp',
+      hash: {
+        sha1: 'c9fb7f8a4c6b7b12b493a99a8dc6901d17867388',
+        sha256: 'cb1553a3c88817e4cc774a5a93f9158f6785bd3815447d04b6c3f4c2c4b21ed7',
+        md5: '465d5d850f54d9cde767bda90743df30',
+      },
+      Ext: {
+        code_signature: {
+          trusted: true,
+          subject_name: 'Open Source Developer, Benjamin Delpy',
+          exists: true,
+          status: 'trusted',
+        },
+        malware_classification: {
+          identifier: 'endpointpe-v4-model',
+          score: 0.99956864118576,
+          threshold: 0.71,
+          version: '0.0.0',
+        },
+      },
+    },
+    host: {
+      os: {
+        Ext: {
+          variant: 'Windows 10 Enterprise Evaluation',
+        },
+        kernel: '2004 (10.0.19041.388)',
+        name: 'Windows',
+        family: 'windows',
+        version: '2004 (10.0.19041.388)',
+        platform: 'windows',
+        full: 'Windows 10 Enterprise Evaluation 2004 (10.0.19041.388)',
+      },
+    },
+    event: {
+      kind: 'alert',
+    },
+    cluster_uuid: 'kLbKvSMcRiiFAR0t8LebDA',
+    cluster_name: 'elasticsearch',
+  };
+}
diff --git a/src/plugins/telemetry_management_section/public/components/telemetry_management_section.test.tsx b/src/plugins/telemetry_management_section/public/components/telemetry_management_section.test.tsx
index 0e2855f055540..993295746ea5b 100644
--- a/src/plugins/telemetry_management_section/public/components/telemetry_management_section.test.tsx
+++ b/src/plugins/telemetry_management_section/public/components/telemetry_management_section.test.tsx
@@ -212,7 +212,7 @@ describe('TelemetryManagementSectionComponent', () => {
       />
     );
     try {
-      const toggleExampleComponent = component.find('p > EuiLink[onClick]');
+      const toggleExampleComponent = component.find('FormattedMessage > EuiLink[onClick]').at(0);
       const updatedView = toggleExampleComponent.simulate('click');
       updatedView.find('OptInExampleFlyout');
       updatedView.simulate('close');
@@ -221,6 +221,42 @@ describe('TelemetryManagementSectionComponent', () => {
     }
   });
 
+  it('shows the OptInSecurityExampleFlyout', () => {
+    const onQueryMatchChange = jest.fn();
+    const telemetryService = new TelemetryService({
+      config: {
+        enabled: true,
+        url: '',
+        banner: true,
+        allowChangingOptInStatus: true,
+        optIn: false,
+        optInStatusUrl: '',
+        sendUsageFrom: 'browser',
+      },
+      reportOptInStatusChange: false,
+      notifications: coreStart.notifications,
+      http: coreSetup.http,
+    });
+
+    const component = mountWithIntl(
+      <TelemetryManagementSection
+        telemetryService={telemetryService}
+        onQueryMatchChange={onQueryMatchChange}
+        showAppliesSettingMessage={false}
+        enableSaving={true}
+        toasts={coreStart.notifications.toasts}
+      />
+    );
+    try {
+      const toggleExampleComponent = component.find('FormattedMessage > EuiLink[onClick]').at(1);
+      const updatedView = toggleExampleComponent.simulate('click');
+      updatedView.find('OptInSecurityExampleFlyout');
+      updatedView.simulate('close');
+    } finally {
+      component.unmount();
+    }
+  });
+
   it('toggles the OptIn button', async () => {
     const onQueryMatchChange = jest.fn();
     const telemetryService = new TelemetryService({
diff --git a/src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx b/src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx
index 9ae0a3d12fbb5..822d8b49661c1 100644
--- a/src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx
+++ b/src/plugins/telemetry_management_section/public/components/telemetry_management_section.tsx
@@ -34,6 +34,7 @@ import { i18n } from '@kbn/i18n';
 import { TelemetryPluginSetup } from 'src/plugins/telemetry/public';
 import { PRIVACY_STATEMENT_URL } from '../../../telemetry/common/constants';
 import { OptInExampleFlyout } from './opt_in_example_flyout';
+import { OptInSecurityExampleFlyout } from './opt_in_security_example_flyout';
 import { LazyField } from '../../../advanced_settings/public';
 import { ToastsStart } from '../../../../core/public';
 
@@ -53,6 +54,7 @@ interface Props {
 interface State {
   processing: boolean;
   showExample: boolean;
+  showSecurityExample: boolean;
   queryMatches: boolean | null;
   enabled: boolean;
 }
@@ -61,6 +63,7 @@ export class TelemetryManagementSection extends Component<Props, State> {
   state: State = {
     processing: false,
     showExample: false,
+    showSecurityExample: false,
     queryMatches: null,
     enabled: this.props.telemetryService.getIsOptedIn() || false,
   };
@@ -87,7 +90,7 @@ export class TelemetryManagementSection extends Component<Props, State> {
 
   render() {
     const { telemetryService } = this.props;
-    const { showExample, queryMatches, enabled, processing } = this.state;
+    const { showExample, showSecurityExample, queryMatches, enabled, processing } = this.state;
 
     if (!telemetryService.getCanChangeOptInStatus()) {
       return null;
@@ -105,6 +108,7 @@ export class TelemetryManagementSection extends Component<Props, State> {
             onClose={this.toggleExample}
           />
         )}
+        {showSecurityExample && <OptInSecurityExampleFlyout onClose={this.toggleSecurityExample} />}
         <EuiPanel paddingSize="l">
           <EuiForm>
             <EuiText>
@@ -197,12 +201,25 @@ export class TelemetryManagementSection extends Component<Props, State> {
         />
       </p>
       <p>
-        <EuiLink onClick={this.toggleExample}>
-          <FormattedMessage
-            id="telemetry.seeExampleOfWhatWeCollectLinkText"
-            defaultMessage="See an example of what we collect"
-          />
-        </EuiLink>
+        <FormattedMessage
+          id="telemetry.seeExamplesOfWhatWeCollect"
+          defaultMessage="See examples of the {clusterData} and {endpointSecurityData} that we collect."
+          values={{
+            clusterData: (
+              <EuiLink onClick={this.toggleExample}>
+                <FormattedMessage id="telemetry.clusterData" defaultMessage="cluster data" />
+              </EuiLink>
+            ),
+            endpointSecurityData: (
+              <EuiLink onClick={this.toggleSecurityExample}>
+                <FormattedMessage
+                  id="telemetry.securityData"
+                  defaultMessage="endpoint security data"
+                />
+              </EuiLink>
+            ),
+          }}
+        />
       </p>
     </Fragment>
   );
@@ -245,6 +262,12 @@ export class TelemetryManagementSection extends Component<Props, State> {
       showExample: !this.state.showExample,
     });
   };
+
+  toggleSecurityExample = () => {
+    this.setState({
+      showSecurityExample: !this.state.showSecurityExample,
+    });
+  };
 }
 
 // required for lazy loading
diff --git a/test/functional/apps/visualize/_tsvb_time_series.ts b/test/functional/apps/visualize/_tsvb_time_series.ts
index 0b2a52b367a20..d4a079a38c814 100644
--- a/test/functional/apps/visualize/_tsvb_time_series.ts
+++ b/test/functional/apps/visualize/_tsvb_time_series.ts
@@ -84,8 +84,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
         await visualBuilder.clickSeriesOption();
         await visualBuilder.enterSeriesTemplate('$ {{value}}');
-        const actualCount = await visualBuilder.getRhythmChartLegendValue();
-        expect(actualCount).to.be(expectedLegendValue);
+        await retry.try(async () => {
+          const actualCount = await visualBuilder.getRhythmChartLegendValue();
+          expect(actualCount).to.be(expectedLegendValue);
+        });
       });
 
       it('should show the correct count in the legend with percent formatter', async () => {
diff --git a/x-pack/.telemetryrc.json b/x-pack/.telemetryrc.json
index c7430666c538f..db50727c599a9 100644
--- a/x-pack/.telemetryrc.json
+++ b/x-pack/.telemetryrc.json
@@ -2,7 +2,6 @@
   "output": "plugins/telemetry_collection_xpack/schema/xpack_plugins.json",
   "root": "plugins/",
   "exclude": [
-    "plugins/actions/server/usage/actions_usage_collector.ts",
     "plugins/alerts/server/usage/alerts_usage_collector.ts",
     "plugins/apm/server/lib/apm_telemetry/index.ts"
   ]
diff --git a/x-pack/plugins/actions/server/usage/actions_usage_collector.ts b/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
index aa546e08ea1ba..fac57b6282c44 100644
--- a/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
+++ b/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
@@ -4,11 +4,26 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { MakeSchemaFrom, UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { get } from 'lodash';
 import { TaskManagerStartContract } from '../../../task_manager/server';
 import { ActionsUsage } from './types';
 
+const byTypeSchema: MakeSchemaFrom<ActionsUsage>['count_by_type'] = {
+  // TODO: Find out an automated way to populate the keys or reformat these into an array (and change the Remote Telemetry indexer accordingly)
+  DYNAMIC_KEY: { type: 'long' },
+  // Known actions:
+  __email: { type: 'long' },
+  __index: { type: 'long' },
+  __pagerduty: { type: 'long' },
+  '__server-log': { type: 'long' },
+  __slack: { type: 'long' },
+  __webhook: { type: 'long' },
+  __servicenow: { type: 'long' },
+  __jira: { type: 'long' },
+  __resilient: { type: 'long' },
+};
+
 export function createActionsUsageCollector(
   usageCollection: UsageCollectionSetup,
   taskManager: TaskManagerStartContract
@@ -16,6 +31,12 @@ export function createActionsUsageCollector(
   return usageCollection.makeUsageCollector<ActionsUsage>({
     type: 'actions',
     isReady: () => true,
+    schema: {
+      count_total: { type: 'long' },
+      count_active_total: { type: 'long' },
+      count_by_type: byTypeSchema,
+      count_active_by_type: byTypeSchema,
+    },
     fetch: async () => {
       try {
         const doc = await getLatestTaskState(await taskManager);
diff --git a/x-pack/plugins/apm/common/service_health_status.ts b/x-pack/plugins/apm/common/service_health_status.ts
index 1d4bcfb3b0e07..f66e03a9733a3 100644
--- a/x-pack/plugins/apm/common/service_health_status.ts
+++ b/x-pack/plugins/apm/common/service_health_status.ts
@@ -54,6 +54,22 @@ export function getServiceHealthStatusColor(
   }
 }
 
+export function getServiceHealthStatusBadgeColor(
+  theme: EuiTheme,
+  status: ServiceHealthStatus
+) {
+  switch (status) {
+    case ServiceHealthStatus.healthy:
+      return theme.eui.euiColorVis0_behindText;
+    case ServiceHealthStatus.warning:
+      return theme.eui.euiColorVis5_behindText;
+    case ServiceHealthStatus.critical:
+      return theme.eui.euiColorVis9_behindText;
+    case ServiceHealthStatus.unknown:
+      return theme.eui.euiColorMediumShade;
+  }
+}
+
 export function getServiceHealthStatusLabel(status: ServiceHealthStatus) {
   switch (status) {
     case ServiceHealthStatus.critical:
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_response_opbeans_beats.json b/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_response_opbeans_beats.json
index 153fa57bb05e7..cfd905f145fe2 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_response_opbeans_beats.json
+++ b/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_response_opbeans_beats.json
@@ -83,7 +83,7 @@
         "id": "opbeans-go~>postgresql",
         "sourceData": {
           "id": "opbeans-go",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-go",
           "agent.name": "go"
         },
@@ -103,7 +103,7 @@
         "id": "opbeans-go~opbeans-java",
         "sourceData": {
           "id": "opbeans-go",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-go",
           "agent.name": "go"
         },
@@ -123,13 +123,13 @@
         "id": "opbeans-go~opbeans-node",
         "sourceData": {
           "id": "opbeans-go",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-go",
           "agent.name": "go"
         },
         "targetData": {
           "id": "opbeans-node",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-node",
           "agent.name": "nodejs"
         },
@@ -143,7 +143,7 @@
         "id": "opbeans-go~opbeans-ruby",
         "sourceData": {
           "id": "opbeans-go",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-go",
           "agent.name": "go"
         },
@@ -189,7 +189,7 @@
         },
         "targetData": {
           "id": "opbeans-go",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-go",
           "agent.name": "go"
         },
@@ -209,7 +209,7 @@
         },
         "targetData": {
           "id": "opbeans-node",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-node",
           "agent.name": "nodejs"
         }
@@ -242,7 +242,7 @@
         "id": "opbeans-node~>postgresql",
         "sourceData": {
           "id": "opbeans-node",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-node",
           "agent.name": "nodejs"
         },
@@ -262,7 +262,7 @@
         "id": "opbeans-node~>redis",
         "sourceData": {
           "id": "opbeans-node",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-node",
           "agent.name": "nodejs"
         },
@@ -282,13 +282,13 @@
         "id": "opbeans-node~opbeans-go",
         "sourceData": {
           "id": "opbeans-node",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-node",
           "agent.name": "nodejs"
         },
         "targetData": {
           "id": "opbeans-go",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-go",
           "agent.name": "go"
         },
@@ -302,7 +302,7 @@
         "id": "opbeans-node~opbeans-python",
         "sourceData": {
           "id": "opbeans-node",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-node",
           "agent.name": "nodejs"
         },
@@ -322,7 +322,7 @@
         "id": "opbeans-node~opbeans-ruby",
         "sourceData": {
           "id": "opbeans-node",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-node",
           "agent.name": "nodejs"
         },
@@ -408,7 +408,7 @@
         },
         "targetData": {
           "id": "opbeans-go",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-go",
           "agent.name": "go"
         }
@@ -427,7 +427,7 @@
         },
         "targetData": {
           "id": "opbeans-node",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-node",
           "agent.name": "nodejs"
         },
@@ -487,7 +487,7 @@
         },
         "targetData": {
           "id": "opbeans-go",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-go",
           "agent.name": "go"
         },
@@ -527,7 +527,7 @@
         },
         "targetData": {
           "id": "opbeans-node",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-node",
           "agent.name": "nodejs"
         },
@@ -566,7 +566,7 @@
         },
         "targetData": {
           "id": "opbeans-go",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-go",
           "agent.name": "go"
         }
@@ -602,7 +602,7 @@
         },
         "targetData": {
           "id": "opbeans-node",
-          "service.environment": "testing",
+          "service.environment": "test",
           "service.name": "opbeans-node",
           "agent.name": "nodejs"
         }
@@ -673,7 +673,7 @@
     {
       "data": {
         "id": "opbeans-node",
-        "service.environment": "testing",
+        "service.environment": "test",
         "service.name": "opbeans-node",
         "agent.name": "nodejs",
         "anomaly_score": 41.31593099784474,
@@ -733,7 +733,7 @@
     {
       "data": {
         "id": "opbeans-go",
-        "service.environment": "testing",
+        "service.environment": "test",
         "service.name": "opbeans-go",
         "agent.name": "go",
         "anomaly_score": 0.2633884161762746,
diff --git a/x-pack/plugins/apm/public/components/app/ServiceOverview/ServiceList/HealthBadge.tsx b/x-pack/plugins/apm/public/components/app/ServiceOverview/ServiceList/HealthBadge.tsx
index c6be0a352ef66..e8ad3e65b1a47 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceOverview/ServiceList/HealthBadge.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceOverview/ServiceList/HealthBadge.tsx
@@ -6,7 +6,7 @@
 import React from 'react';
 import { EuiBadge } from '@elastic/eui';
 import {
-  getServiceHealthStatusColor,
+  getServiceHealthStatusBadgeColor,
   getServiceHealthStatusLabel,
   ServiceHealthStatus,
 } from '../../../../../common/service_health_status';
@@ -20,7 +20,7 @@ export function HealthBadge({
   const theme = useTheme();
 
   return (
-    <EuiBadge color={getServiceHealthStatusColor(theme, healthStatus)}>
+    <EuiBadge color={getServiceHealthStatusBadgeColor(theme, healthStatus)}>
       {getServiceHealthStatusLabel(healthStatus)}
     </EuiBadge>
   );
diff --git a/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap b/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap
index 40a2b6a5fa81b..ee3a4fce0dbaa 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap
@@ -153,7 +153,7 @@ NodeList [
       >
         <span
           class="euiBadge euiBadge--iconLeft"
-          style="background-color: rgb(214, 191, 87); color: rgb(0, 0, 0);"
+          style="background-color: rgb(241, 216, 111); color: rgb(0, 0, 0);"
           title="Warning"
         >
           <span
diff --git a/x-pack/plugins/apm/public/context/UrlParamsContext/index.tsx b/x-pack/plugins/apm/public/context/UrlParamsContext/index.tsx
index 9eb4704a2ca29..5682009019d7f 100644
--- a/x-pack/plugins/apm/public/context/UrlParamsContext/index.tsx
+++ b/x-pack/plugins/apm/public/context/UrlParamsContext/index.tsx
@@ -25,6 +25,7 @@ import {
 import { pickKeys } from '../../../common/utils/pick_keys';
 import { useDeepObjectIdentity } from '../../hooks/useDeepObjectIdentity';
 import { LocalUIFilterName } from '../../../common/ui_filter';
+import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
 
 interface TimeRange {
   rangeFrom: string;
@@ -38,7 +39,11 @@ function useUiFilters(params: IUrlParams): UIFilters {
     (val) => (val ? val.split(',') : [])
   ) as Partial<Record<LocalUIFilterName, string[]>>;
 
-  return useDeepObjectIdentity({ kuery, environment, ...localUiFilters });
+  return useDeepObjectIdentity({
+    kuery,
+    environment: environment || ENVIRONMENT_ALL.value,
+    ...localUiFilters,
+  });
 }
 
 const defaultRefresh = (_time: TimeRange) => {};
diff --git a/x-pack/plugins/apm/public/hooks/useTransactionDistribution.ts b/x-pack/plugins/apm/public/hooks/useTransactionDistribution.ts
index cd3e02d155602..a5096a314388c 100644
--- a/x-pack/plugins/apm/public/hooks/useTransactionDistribution.ts
+++ b/x-pack/plugins/apm/public/hooks/useTransactionDistribution.ts
@@ -75,7 +75,7 @@ export function useTransactionDistribution(urlParams: IUrlParams) {
 
           const preferredSample = maybe(bucketsSortedByCount[0]?.samples[0]);
 
-          history.push({
+          history.replace({
             ...history.location,
             search: fromQuery({
               ...omit(toQuery(history.location.search), [
diff --git a/x-pack/plugins/apm/public/utils/testHelpers.tsx b/x-pack/plugins/apm/public/utils/testHelpers.tsx
index 971455fde3946..7826e9672a3bb 100644
--- a/x-pack/plugins/apm/public/utils/testHelpers.tsx
+++ b/x-pack/plugins/apm/public/utils/testHelpers.tsx
@@ -25,6 +25,7 @@ import {
 } from '../../typings/elasticsearch';
 import { MockApmPluginContextWrapper } from '../context/ApmPluginContext/MockApmPluginContext';
 import { UrlParamsProvider } from '../context/UrlParamsContext';
+import { UIFilters } from '../../typings/ui_filters';
 
 const originalConsoleWarn = console.warn; // eslint-disable-line no-console
 /**
@@ -118,7 +119,8 @@ interface MockSetup {
   apmEventClient: any;
   internalClient: any;
   config: APMConfig;
-  uiFiltersES: ESFilter[];
+  uiFilters: UIFilters;
+  esFilter: ESFilter[];
   indices: {
     /* eslint-disable @typescript-eslint/naming-convention */
     'apm_oss.sourcemapIndices': string;
@@ -179,7 +181,8 @@ export async function inspectSearchParams(
         },
       }
     ) as APMConfig,
-    uiFiltersES: [{ term: { 'my.custom.ui.filter': 'foo-bar' } }],
+    uiFilters: { environment: 'test' },
+    esFilter: [{ term: { 'service.environment': 'test' } }],
     indices: {
       /* eslint-disable @typescript-eslint/naming-convention */
       'apm_oss.sourcemapIndices': 'myIndex',
diff --git a/x-pack/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap
index 63b6c9cde4d0d..632232ffb075d 100644
--- a/x-pack/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap
@@ -32,7 +32,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
@@ -119,7 +119,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
@@ -194,7 +194,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/errors/distribution/__snapshots__/queries.test.ts.snap
index ea142ca2acc00..b329499c8b045 100644
--- a/x-pack/plugins/apm/server/lib/errors/distribution/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/lib/errors/distribution/__snapshots__/queries.test.ts.snap
@@ -40,7 +40,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
@@ -91,7 +91,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts b/x-pack/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts
index 1a83113de35f2..50da1f9c20d16 100644
--- a/x-pack/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts
+++ b/x-pack/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts
@@ -41,7 +41,10 @@ describe('timeseriesFetcher', () => {
             get: () => 'myIndex',
           }
         ) as APMConfig,
-        uiFiltersES: [
+        uiFilters: {
+          environment: 'prod',
+        },
+        esFilter: [
           {
             term: { 'service.environment': 'prod' },
           },
diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts
index de6df15354e79..a42710947a792 100644
--- a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts
+++ b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts
@@ -11,11 +11,7 @@ import {
   SERVICE_NAME,
 } from '../../../../common/elasticsearch_fieldnames';
 import { rangeFilter } from '../../../../common/utils/range_filter';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../helpers/setup_request';
 
 export async function getBuckets({
   serviceName,
@@ -26,13 +22,13 @@ export async function getBuckets({
   serviceName: string;
   groupId?: string;
   bucketSize: number;
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
 }) {
-  const { start, end, uiFiltersES, apmEventClient } = setup;
+  const { start, end, esFilter, apmEventClient } = setup;
   const filter: ESFilter[] = [
     { term: { [SERVICE_NAME]: serviceName } },
     { range: rangeFilter(start, end) },
-    ...uiFiltersES,
+    ...esFilter,
   ];
 
   if (groupId) {
diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts b/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts
index 3b48b6c5be594..dea518cad8e40 100644
--- a/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts
+++ b/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts
@@ -5,11 +5,7 @@
  */
 
 import { PromiseReturnType } from '../../../../typings/common';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../helpers/setup_request';
 import { getBuckets } from './get_buckets';
 import { BUCKET_TARGET_COUNT } from '../../transactions/constants';
 
@@ -28,7 +24,7 @@ export async function getErrorDistribution({
 }: {
   serviceName: string;
   groupId?: string;
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
 }) {
   const bucketSize = getBucketSize({ start: setup.start, end: setup.end });
   const { buckets, noHits } = await getBuckets({
diff --git a/x-pack/plugins/apm/server/lib/errors/get_error_group.ts b/x-pack/plugins/apm/server/lib/errors/get_error_group.ts
index b23c955b57183..0fbc7720f7111 100644
--- a/x-pack/plugins/apm/server/lib/errors/get_error_group.ts
+++ b/x-pack/plugins/apm/server/lib/errors/get_error_group.ts
@@ -12,11 +12,7 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { PromiseReturnType } from '../../../typings/common';
 import { rangeFilter } from '../../../common/utils/range_filter';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { getTransaction } from '../transactions/get_transaction';
 
 export type ErrorGroupAPIResponse = PromiseReturnType<typeof getErrorGroup>;
@@ -29,9 +25,9 @@ export async function getErrorGroup({
 }: {
   serviceName: string;
   groupId: string;
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
 }) {
-  const { start, end, uiFiltersES, apmEventClient } = setup;
+  const { start, end, esFilter, apmEventClient } = setup;
 
   const params = {
     apm: {
@@ -45,7 +41,7 @@ export async function getErrorGroup({
             { term: { [SERVICE_NAME]: serviceName } },
             { term: { [ERROR_GROUP_ID]: groupId } },
             { range: rangeFilter(start, end) },
-            ...uiFiltersES,
+            ...esFilter,
           ],
           should: [{ term: { [TRANSACTION_SAMPLED]: true } }],
         },
diff --git a/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts b/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts
index ab1c2149be343..006d2fae3d4fb 100644
--- a/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts
+++ b/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts
@@ -13,11 +13,7 @@ import {
   ERROR_LOG_MESSAGE,
 } from '../../../common/elasticsearch_fieldnames';
 import { PromiseReturnType } from '../../../typings/common';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { getErrorGroupsProjection } from '../../projections/errors';
 import { mergeProjection } from '../../projections/util/merge_projection';
 import { SortOptions } from '../../../typings/elasticsearch/aggregations';
@@ -35,7 +31,7 @@ export async function getErrorGroups({
   serviceName: string;
   sortField?: string;
   sortDirection?: 'asc' | 'desc';
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
 }) {
   const { apmEventClient } = setup;
 
diff --git a/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_ui_filters_es.ts b/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_es_filter.ts
similarity index 96%
rename from x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_ui_filters_es.ts
rename to x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_es_filter.ts
index c1405b44f2a8a..1b8f32d4de8b9 100644
--- a/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_ui_filters_es.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_es_filter.ts
@@ -13,7 +13,7 @@ import {
 } from '../../ui_filters/local_ui_filters/config';
 import { esKuery } from '../../../../../../../src/plugins/data/server';
 
-export function getUiFiltersES(uiFilters: UIFilters) {
+export function getEsFilter(uiFilters: UIFilters) {
   const { kuery, environment, ...localFilterValues } = uiFilters;
   const mappedFilters = localUIFilterNames
     .filter((name) => name in localFilterValues)
diff --git a/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_parsed_ui_filters.ts b/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_parsed_ui_filters.ts
deleted file mode 100644
index 324da199807c7..0000000000000
--- a/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_parsed_ui_filters.ts
+++ /dev/null
@@ -1,23 +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;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Logger } from 'src/core/server';
-import { UIFilters } from '../../../../typings/ui_filters';
-
-export function getParsedUiFilters({
-  uiFilters,
-  logger,
-}: {
-  uiFilters: string;
-  logger: Logger;
-}): UIFilters {
-  try {
-    return JSON.parse(uiFilters);
-  } catch (error) {
-    logger.error(error);
-  }
-  return {};
-}
diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
index eba75433a5148..26896a050dd88 100644
--- a/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
@@ -5,6 +5,7 @@
  */
 
 import moment from 'moment';
+import { Logger } from 'kibana/server';
 import { isActivePlatinumLicense } from '../../../common/service_map';
 import { UI_SETTINGS } from '../../../../../../src/plugins/data/common';
 import { KibanaRequest } from '../../../../../../src/core/server';
@@ -14,7 +15,7 @@ import {
   ApmIndicesConfig,
 } from '../settings/apm_indices/get_apm_indices';
 import { ESFilter } from '../../../typings/elasticsearch';
-import { getUiFiltersES } from './convert_ui_filters/get_ui_filters_es';
+import { getEsFilter } from './convert_ui_filters/get_es_filter';
 import { APMRequestHandlerContext } from '../../routes/typings';
 import { ProcessorEvent } from '../../../common/processor_event';
 import {
@@ -25,14 +26,8 @@ import {
   APMInternalClient,
   createInternalESClient,
 } from './create_es_client/create_internal_es_client';
+import { UIFilters } from '../../../typings/ui_filters';
 
-function decodeUiFilters(uiFiltersEncoded?: string) {
-  if (!uiFiltersEncoded) {
-    return [];
-  }
-  const uiFilters = JSON.parse(uiFiltersEncoded);
-  return getUiFiltersES(uiFilters);
-}
 // Explicitly type Setup to prevent TS initialization errors
 // https://github.com/microsoft/TypeScript/issues/34933
 
@@ -42,6 +37,8 @@ export interface Setup {
   ml?: ReturnType<typeof getMlSetup>;
   config: APMConfig;
   indices: ApmIndicesConfig;
+  uiFilters: UIFilters;
+  esFilter: ESFilter[];
 }
 
 export interface SetupTimeRange {
@@ -49,10 +46,6 @@ export interface SetupTimeRange {
   end: number;
 }
 
-export interface SetupUIFilters {
-  uiFiltersES: ESFilter[];
-}
-
 interface SetupRequestParams {
   query?: {
     _debug?: boolean;
@@ -65,16 +58,13 @@ interface SetupRequestParams {
 
 type InferSetup<TParams extends SetupRequestParams> = Setup &
   (TParams extends { query: { start: string } } ? { start: number } : {}) &
-  (TParams extends { query: { end: string } } ? { end: number } : {}) &
-  (TParams extends { query: { uiFilters: string } }
-    ? { uiFiltersES: ESFilter[] }
-    : {});
+  (TParams extends { query: { end: string } } ? { end: number } : {});
 
 export async function setupRequest<TParams extends SetupRequestParams>(
   context: APMRequestHandlerContext<TParams>,
   request: KibanaRequest
 ): Promise<InferSetup<TParams>> {
-  const { config } = context;
+  const { config, logger } = context;
   const { query } = context.params;
 
   const [indices, includeFrozen] = await Promise.all([
@@ -85,7 +75,7 @@ export async function setupRequest<TParams extends SetupRequestParams>(
     context.core.uiSettings.client.get(UI_SETTINGS.SEARCH_INCLUDE_FROZEN),
   ]);
 
-  const uiFiltersES = decodeUiFilters(query.uiFilters);
+  const uiFilters = decodeUiFilters(logger, query.uiFilters);
 
   const coreSetupRequest = {
     indices,
@@ -108,12 +98,13 @@ export async function setupRequest<TParams extends SetupRequestParams>(
           )
         : undefined,
     config,
+    uiFilters,
+    esFilter: getEsFilter(uiFilters),
   };
 
   return {
     ...('start' in query ? { start: moment.utc(query.start).valueOf() } : {}),
     ...('end' in query ? { end: moment.utc(query.end).valueOf() } : {}),
-    ...('uiFilters' in query ? { uiFiltersES } : {}),
     ...coreSetupRequest,
   } as InferSetup<TParams>;
 }
@@ -129,3 +120,15 @@ function getMlSetup(
     modules: ml.modulesProvider(request, savedObjectsClient),
   };
 }
+
+function decodeUiFilters(logger: Logger, uiFiltersEncoded?: string): UIFilters {
+  if (!uiFiltersEncoded) {
+    return {};
+  }
+  try {
+    return JSON.parse(uiFiltersEncoded);
+  } catch (error) {
+    logger.error(error);
+    return {};
+  }
+}
diff --git a/x-pack/plugins/apm/server/lib/metrics/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/metrics/__snapshots__/queries.test.ts.snap
index 2868dcfda97b6..961a1eee61d1d 100644
--- a/x-pack/plugins/apm/server/lib/metrics/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/lib/metrics/__snapshots__/queries.test.ts.snap
@@ -87,7 +87,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
@@ -175,7 +175,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
@@ -206,7 +206,7 @@ Object {
             "lang": "painless",
             "source": "
     /*
-      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. 
+      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants.
       This number represents the max possible value for the limit field.
     */
     double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L;
@@ -231,7 +231,7 @@ Object {
             "lang": "painless",
             "source": "
     /*
-      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. 
+      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants.
       This number represents the max possible value for the limit field.
     */
     double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L;
@@ -258,7 +258,7 @@ Object {
                 "lang": "painless",
                 "source": "
     /*
-      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. 
+      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants.
       This number represents the max possible value for the limit field.
     */
     double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L;
@@ -283,7 +283,7 @@ Object {
                 "lang": "painless",
                 "source": "
     /*
-      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. 
+      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants.
       This number represents the max possible value for the limit field.
     */
     double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L;
@@ -338,7 +338,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
@@ -431,7 +431,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
@@ -514,7 +514,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
@@ -623,7 +623,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
@@ -717,7 +717,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
@@ -748,7 +748,7 @@ Object {
             "lang": "painless",
             "source": "
     /*
-      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. 
+      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants.
       This number represents the max possible value for the limit field.
     */
     double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L;
@@ -773,7 +773,7 @@ Object {
             "lang": "painless",
             "source": "
     /*
-      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. 
+      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants.
       This number represents the max possible value for the limit field.
     */
     double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L;
@@ -800,7 +800,7 @@ Object {
                 "lang": "painless",
                 "source": "
     /*
-      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. 
+      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants.
       This number represents the max possible value for the limit field.
     */
     double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L;
@@ -825,7 +825,7 @@ Object {
                 "lang": "painless",
                 "source": "
     /*
-      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. 
+      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants.
       This number represents the max possible value for the limit field.
     */
     double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L;
@@ -886,7 +886,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
@@ -985,7 +985,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
@@ -1074,7 +1074,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
@@ -1172,7 +1172,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
@@ -1255,7 +1255,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
@@ -1286,7 +1286,7 @@ Object {
             "lang": "painless",
             "source": "
     /*
-      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. 
+      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants.
       This number represents the max possible value for the limit field.
     */
     double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L;
@@ -1311,7 +1311,7 @@ Object {
             "lang": "painless",
             "source": "
     /*
-      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. 
+      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants.
       This number represents the max possible value for the limit field.
     */
     double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L;
@@ -1338,7 +1338,7 @@ Object {
                 "lang": "painless",
                 "source": "
     /*
-      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. 
+      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants.
       This number represents the max possible value for the limit field.
     */
     double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L;
@@ -1363,7 +1363,7 @@ Object {
                 "lang": "painless",
                 "source": "
     /*
-      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. 
+      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants.
       This number represents the max possible value for the limit field.
     */
     double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L;
@@ -1413,7 +1413,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
@@ -1501,7 +1501,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
@@ -1579,7 +1579,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/default.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/default.ts
index 6ee507d7b9bb1..fbcbc9f12791f 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/default.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/default.ts
@@ -4,16 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../helpers/setup_request';
 import { getCPUChartData } from './shared/cpu';
 import { getMemoryChartData } from './shared/memory';
 
 export async function getDefaultMetricsCharts(
-  setup: Setup & SetupTimeRange & SetupUIFilters,
+  setup: Setup & SetupTimeRange,
   serviceName: string
 ) {
   const charts = await Promise.all([
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
index d7e64bdcacd12..2ed11480a7585 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
@@ -11,11 +11,7 @@
 
 import { sum, round } from 'lodash';
 import theme from '@elastic/eui/dist/eui_theme_light.json';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../../../helpers/setup_request';
 import { getMetricsDateHistogramParams } from '../../../../helpers/metrics';
 import { ChartBase } from '../../../types';
 import { getMetricsProjection } from '../../../../../projections/metrics';
@@ -36,7 +32,7 @@ export async function fetchAndTransformGcMetrics({
   chartBase,
   fieldName,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   serviceName: string;
   serviceNodeName?: string;
   chartBase: ChartBase;
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_rate_chart.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_rate_chart.ts
index 6e562b9a8ee87..7cedeb828e3b7 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_rate_chart.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_rate_chart.ts
@@ -7,11 +7,7 @@
 import theme from '@elastic/eui/dist/eui_theme_light.json';
 import { i18n } from '@kbn/i18n';
 import { METRIC_JAVA_GC_COUNT } from '../../../../../../common/elasticsearch_fieldnames';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../../../helpers/setup_request';
 import { fetchAndTransformGcMetrics } from './fetch_and_transform_gc_metrics';
 import { ChartBase } from '../../../types';
 
@@ -35,7 +31,7 @@ const chartBase: ChartBase = {
 };
 
 const getGcRateChart = (
-  setup: Setup & SetupTimeRange & SetupUIFilters,
+  setup: Setup & SetupTimeRange,
   serviceName: string,
   serviceNodeName?: string
 ) => {
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_time_chart.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_time_chart.ts
index 0b9d6240fc1c9..f21d3d8e7c056 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_time_chart.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_time_chart.ts
@@ -7,11 +7,7 @@
 import theme from '@elastic/eui/dist/eui_theme_light.json';
 import { i18n } from '@kbn/i18n';
 import { METRIC_JAVA_GC_TIME } from '../../../../../../common/elasticsearch_fieldnames';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../../../helpers/setup_request';
 import { fetchAndTransformGcMetrics } from './fetch_and_transform_gc_metrics';
 import { ChartBase } from '../../../types';
 
@@ -35,7 +31,7 @@ const chartBase: ChartBase = {
 };
 
 const getGcTimeChart = (
-  setup: Setup & SetupTimeRange & SetupUIFilters,
+  setup: Setup & SetupTimeRange,
   serviceName: string,
   serviceNodeName?: string
 ) => {
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts
index ba3183c0fa7d7..eb79897f9f055 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts
@@ -12,11 +12,7 @@ import {
   METRIC_JAVA_HEAP_MEMORY_USED,
   AGENT_NAME,
 } from '../../../../../../common/elasticsearch_fieldnames';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../../../helpers/setup_request';
 import { fetchAndTransformMetrics } from '../../../fetch_and_transform_metrics';
 import { ChartBase } from '../../../types';
 
@@ -55,7 +51,7 @@ const chartBase: ChartBase = {
 };
 
 export async function getHeapMemoryChart(
-  setup: Setup & SetupTimeRange & SetupUIFilters,
+  setup: Setup & SetupTimeRange,
   serviceName: string,
   serviceNodeName?: string
 ) {
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/index.ts
index 21caab6590fc4..d4084701f0f49 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/index.ts
@@ -5,11 +5,7 @@
  */
 
 import { getHeapMemoryChart } from './heap_memory';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../../helpers/setup_request';
 import { getNonHeapMemoryChart } from './non_heap_memory';
 import { getThreadCountChart } from './thread_count';
 import { getCPUChartData } from '../shared/cpu';
@@ -18,7 +14,7 @@ import { getGcRateChart } from './gc/get_gc_rate_chart';
 import { getGcTimeChart } from './gc/get_gc_time_chart';
 
 export async function getJavaMetricsCharts(
-  setup: Setup & SetupTimeRange & SetupUIFilters,
+  setup: Setup & SetupTimeRange,
   serviceName: string,
   serviceNodeName?: string
 ) {
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts
index 1a2d5bd0b0e68..50cc449da3c15 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts
@@ -12,11 +12,7 @@ import {
   METRIC_JAVA_NON_HEAP_MEMORY_USED,
   AGENT_NAME,
 } from '../../../../../../common/elasticsearch_fieldnames';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../../../helpers/setup_request';
 import { ChartBase } from '../../../types';
 import { fetchAndTransformMetrics } from '../../../fetch_and_transform_metrics';
 
@@ -52,7 +48,7 @@ const chartBase: ChartBase = {
 };
 
 export async function getNonHeapMemoryChart(
-  setup: Setup & SetupUIFilters & SetupTimeRange,
+  setup: Setup & SetupTimeRange,
   serviceName: string,
   serviceNodeName?: string
 ) {
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts
index 01cc6d8495244..0062f0a423970 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts
@@ -10,11 +10,7 @@ import {
   METRIC_JAVA_THREAD_COUNT,
   AGENT_NAME,
 } from '../../../../../../common/elasticsearch_fieldnames';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../../../helpers/setup_request';
 import { ChartBase } from '../../../types';
 import { fetchAndTransformMetrics } from '../../../fetch_and_transform_metrics';
 
@@ -44,7 +40,7 @@ const chartBase: ChartBase = {
 };
 
 export async function getThreadCountChart(
-  setup: Setup & SetupTimeRange & SetupUIFilters,
+  setup: Setup & SetupTimeRange,
   serviceName: string,
   serviceNodeName?: string
 ) {
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/cpu/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/cpu/index.ts
index 066ef40b4ab6c..ca642aa12fff1 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/cpu/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/cpu/index.ts
@@ -10,11 +10,7 @@ import {
   METRIC_SYSTEM_CPU_PERCENT,
   METRIC_PROCESS_CPU_PERCENT,
 } from '../../../../../../common/elasticsearch_fieldnames';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../../../helpers/setup_request';
 import { ChartBase } from '../../../types';
 import { fetchAndTransformMetrics } from '../../../fetch_and_transform_metrics';
 
@@ -56,7 +52,7 @@ const chartBase: ChartBase = {
 };
 
 export async function getCPUChartData(
-  setup: Setup & SetupTimeRange & SetupUIFilters,
+  setup: Setup & SetupTimeRange,
   serviceName: string,
   serviceNodeName?: string
 ) {
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts
index a60576ca0c175..e6ee47cc815ef 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts
@@ -11,11 +11,7 @@ import {
   METRIC_SYSTEM_FREE_MEMORY,
   METRIC_SYSTEM_TOTAL_MEMORY,
 } from '../../../../../../common/elasticsearch_fieldnames';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../../../helpers/setup_request';
 import { fetchAndTransformMetrics } from '../../../fetch_and_transform_metrics';
 import { ChartBase } from '../../../types';
 
@@ -54,7 +50,7 @@ export const percentCgroupMemoryUsedScript = {
   lang: 'painless',
   source: `
     /*
-      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. 
+      When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants.
       This number represents the max possible value for the limit field.
     */
     double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L;
@@ -73,7 +69,7 @@ export const percentCgroupMemoryUsedScript = {
 };
 
 export async function getMemoryChartData(
-  setup: Setup & SetupTimeRange & SetupUIFilters,
+  setup: Setup & SetupTimeRange,
   serviceName: string,
   serviceNodeName?: string
 ) {
diff --git a/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts b/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
index a42a10d6518a0..3ccba8c7586dc 100644
--- a/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
@@ -5,11 +5,7 @@
  */
 
 import { Unionize, Overwrite } from 'utility-types';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { getMetricsDateHistogramParams } from '../helpers/metrics';
 import { ChartBase } from './types';
 import { transformDataToMetricsChart } from './transform_metrics_chart';
@@ -58,7 +54,7 @@ export async function fetchAndTransformMetrics<T extends MetricAggs>({
   aggs,
   additionalFilters = [],
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   serviceName: string;
   serviceNodeName?: string;
   chartBase: ChartBase;
diff --git a/x-pack/plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent.ts b/x-pack/plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent.ts
index 059e1ce48c83d..72cd65deebff6 100644
--- a/x-pack/plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent.ts
@@ -3,11 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { getJavaMetricsCharts } from './by_agent/java';
 import { getDefaultMetricsCharts } from './by_agent/default';
 import { GenericMetricsChart } from './transform_metrics_chart';
@@ -22,7 +18,7 @@ export async function getMetricsChartDataByAgent({
   serviceNodeName,
   agentName,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   serviceName: string;
   serviceNodeName?: string;
   agentName: string;
diff --git a/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap
index dcafe09221164..1fafa08082443 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap
@@ -61,7 +61,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
@@ -151,7 +151,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
@@ -230,7 +230,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
@@ -500,7 +500,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
@@ -552,7 +552,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
@@ -667,7 +667,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
@@ -723,7 +723,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_client_metrics.ts b/x-pack/plugins/apm/server/lib/rum_client/get_client_metrics.ts
index 6566ea4f5e29b..6d596246d6af9 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/get_client_metrics.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/get_client_metrics.ts
@@ -7,11 +7,7 @@
 import { TRANSACTION_DURATION } from '../../../common/elasticsearch_fieldnames';
 import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions';
 import { mergeProjection } from '../../projections/util/merge_projection';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import {
   TRANSACTION_DOM_INTERACTIVE,
   TRANSACTION_TIME_TO_FIRST_BYTE,
@@ -22,7 +18,7 @@ export async function getClientMetrics({
   urlQuery,
   percentile = 50,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   urlQuery?: string;
   percentile?: number;
 }) {
diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_js_errors.ts b/x-pack/plugins/apm/server/lib/rum_client/get_js_errors.ts
index 0540ea4bf09dd..a8a4e2714c86e 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/get_js_errors.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/get_js_errors.ts
@@ -5,11 +5,7 @@
  */
 
 import { mergeProjection } from '../../projections/util/merge_projection';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { getRumErrorsProjection } from '../../projections/rum_page_load_transactions';
 import {
   ERROR_EXC_MESSAGE,
@@ -23,7 +19,7 @@ export async function getJSErrors({
   pageSize,
   pageIndex,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   pageSize: number;
   pageIndex: number;
 }) {
diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_long_task_metrics.ts b/x-pack/plugins/apm/server/lib/rum_client/get_long_task_metrics.ts
index c2c86ae05d57c..dfb31de8f10f7 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/get_long_task_metrics.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/get_long_task_metrics.ts
@@ -6,11 +6,7 @@
 
 import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions';
 import { mergeProjection } from '../../projections/util/merge_projection';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 
 const LONG_TASK_SUM_FIELD = 'transaction.experience.longtask.sum';
 const LONG_TASK_COUNT_FIELD = 'transaction.experience.longtask.count';
@@ -21,7 +17,7 @@ export async function getLongTaskMetrics({
   urlQuery,
   percentile = 50,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   urlQuery?: string;
   percentile?: number;
 }) {
diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_page_load_distribution.ts b/x-pack/plugins/apm/server/lib/rum_client/get_page_load_distribution.ts
index 5f666feb8a18f..225afff2818ab 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/get_page_load_distribution.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/get_page_load_distribution.ts
@@ -7,11 +7,7 @@
 import { TRANSACTION_DURATION } from '../../../common/elasticsearch_fieldnames';
 import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions';
 import { mergeProjection } from '../../projections/util/merge_projection';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 
 export const MICRO_TO_SEC = 1000000;
 
@@ -56,7 +52,7 @@ export async function getPageLoadDistribution({
   maxPercentile,
   urlQuery,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   minPercentile?: string;
   maxPercentile?: string;
   urlQuery?: string;
@@ -168,7 +164,7 @@ const getPercentilesDistribution = async ({
   minDuration,
   maxDuration,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   minDuration: number;
   maxDuration: number;
 }) => {
diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts b/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts
index 40f8a8bc58a54..c1a602c33feae 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts
@@ -5,11 +5,7 @@
  */
 import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions';
 import { mergeProjection } from '../../projections/util/merge_projection';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { BreakdownItem } from '../../../typings/ui_filters';
 
 export async function getPageViewTrends({
@@ -17,7 +13,7 @@ export async function getPageViewTrends({
   breakdowns,
   urlQuery,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   breakdowns?: string;
   urlQuery?: string;
 }) {
diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_pl_dist_breakdown.ts b/x-pack/plugins/apm/server/lib/rum_client/get_pl_dist_breakdown.ts
index bebf9c0bc99c9..e2ec59d232b21 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/get_pl_dist_breakdown.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/get_pl_dist_breakdown.ts
@@ -7,11 +7,7 @@
 import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { mergeProjection } from '../../projections/util/merge_projection';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import {
   CLIENT_GEO_COUNTRY_ISO_CODE,
   USER_AGENT_DEVICE,
@@ -46,7 +42,7 @@ export const getPageLoadDistBreakdown = async ({
   breakdown,
   urlQuery,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   minPercentile: number;
   maxPercentile: number;
   breakdown: string;
diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_rum_services.ts b/x-pack/plugins/apm/server/lib/rum_client/get_rum_services.ts
index 3adad0868ed4b..e9bd203e354cb 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/get_rum_services.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/get_rum_services.ts
@@ -5,18 +5,14 @@
  */
 
 import { SERVICE_NAME } from '../../../common/elasticsearch_fieldnames';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions';
 import { mergeProjection } from '../../projections/util/merge_projection';
 
 export async function getRumServices({
   setup,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
 }) {
   const projection = getRumPageLoadTransactionsProjection({
     setup,
diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_url_search.ts b/x-pack/plugins/apm/server/lib/rum_client/get_url_search.ts
index 6aa39c7ef961f..febfd66897e18 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/get_url_search.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/get_url_search.ts
@@ -5,11 +5,7 @@
  */
 
 import { mergeProjection } from '../../projections/util/merge_projection';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions';
 import {
   TRANSACTION_DURATION,
@@ -21,7 +17,7 @@ export async function getUrlSearch({
   urlQuery,
   percentile,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   urlQuery?: string;
   percentile: number;
 }) {
diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_visitor_breakdown.ts b/x-pack/plugins/apm/server/lib/rum_client/get_visitor_breakdown.ts
index 52d089e4e29c9..6350bc2c07016 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/get_visitor_breakdown.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/get_visitor_breakdown.ts
@@ -6,11 +6,7 @@
 
 import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions';
 import { mergeProjection } from '../../projections/util/merge_projection';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import {
   USER_AGENT_NAME,
   USER_AGENT_OS,
@@ -20,7 +16,7 @@ export async function getVisitorBreakdown({
   setup,
   urlQuery,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   urlQuery?: string;
 }) {
   const projection = getRumPageLoadTransactionsProjection({
diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_web_core_vitals.ts b/x-pack/plugins/apm/server/lib/rum_client/get_web_core_vitals.ts
index 676b3506397a7..c5baf0b529eb4 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/get_web_core_vitals.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/get_web_core_vitals.ts
@@ -6,11 +6,7 @@
 
 import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions';
 import { mergeProjection } from '../../projections/util/merge_projection';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import {
   CLS_FIELD,
   FCP_FIELD,
@@ -25,7 +21,7 @@ export async function getWebCoreVitals({
   urlQuery,
   percentile = 50,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   urlQuery?: string;
   percentile?: number;
 }) {
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
index 75acebe7ed56c..330bb936c9e88 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
@@ -82,7 +82,7 @@ async function getServicesData(options: IEnvOptions) {
   const { setup, searchAggregatedTransactions } = options;
 
   const projection = getServicesProjection({
-    setup: { ...setup, uiFiltersES: [] },
+    setup: { ...setup, esFilter: [] },
     searchAggregatedTransactions,
   });
 
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts
index 7af1607697ef3..eb2ddbf38b274 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts
@@ -19,11 +19,10 @@ describe('getServiceMapServiceNodeInfo', () => {
             }),
         },
         indices: {},
+        uiFilters: { environment: 'test environment' },
       } as unknown) as Setup & SetupTimeRange;
-      const environment = 'test environment';
       const serviceName = 'test service name';
       const result = await getServiceMapServiceNodeInfo({
-        uiFilters: { environment },
         setup,
         serviceName,
         searchAggregatedTransactions: false,
@@ -67,11 +66,10 @@ describe('getServiceMapServiceNodeInfo', () => {
         config: {
           'xpack.apm.metricsInterval': 30,
         },
+        uiFilters: { environment: 'test environment' },
       } as unknown) as Setup & SetupTimeRange;
-      const environment = 'test environment';
       const serviceName = 'test service name';
       const result = await getServiceMapServiceNodeInfo({
-        uiFilters: { environment },
         setup,
         serviceName,
         searchAggregatedTransactions: false,
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
index 7c2137ce65d83..37b34641435fb 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
@@ -8,7 +8,6 @@ import {
   TRANSACTION_REQUEST,
   TRANSACTION_PAGE_LOAD,
 } from '../../../common/transaction_types';
-import { UIFilters } from '../../../typings/ui_filters';
 import {
   SERVICE_NAME,
   METRIC_SYSTEM_CPU_PERCENT,
@@ -53,9 +52,8 @@ export async function getServiceMapServiceNodeInfo({
   serviceName,
   setup,
   searchAggregatedTransactions,
-  uiFilters,
-}: Options & { serviceName: string; uiFilters: UIFilters }) {
-  const { start, end } = setup;
+}: Options & { serviceName: string }) {
+  const { start, end, uiFilters } = setup;
 
   const filter: ESFilter[] = [
     { range: rangeFilter(start, end) },
@@ -105,7 +103,8 @@ async function getErrorStats({
 }) {
   const setupWithBlankUiFilters = {
     ...setup,
-    uiFiltersES: getEnvironmentUiFilterES(environment),
+    uiFilters: { environment },
+    esFilter: getEnvironmentUiFilterES(environment),
   };
   const { noHits, average } = await getErrorRate({
     setup: setupWithBlankUiFilters,
diff --git a/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_grouped.json b/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_grouped.json
index e7bba585de180..94c508fe90230 100644
--- a/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_grouped.json
+++ b/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_grouped.json
@@ -3,7 +3,7 @@
     {
       "data": {
         "id": "opbeans-rum",
-        "service.environment": "testing",
+        "service.environment": "test",
         "service.name": "opbeans-rum",
         "agent.name": "rum-js"
       }
@@ -18,7 +18,7 @@
     {
       "data": {
         "id": "opbeans-node",
-        "service.environment": "testing",
+        "service.environment": "test",
         "service.name": "opbeans-node",
         "agent.name": "nodejs"
       }
diff --git a/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_pregrouped.json b/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_pregrouped.json
index 22c5c50de7472..58469f607ac13 100644
--- a/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_pregrouped.json
+++ b/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_pregrouped.json
@@ -3,7 +3,7 @@
     {
       "data": {
         "id": "opbeans-rum",
-        "service.environment": "testing",
+        "service.environment": "test",
         "service.name": "opbeans-rum",
         "agent.name": "rum-js"
       }
@@ -18,7 +18,7 @@
     {
       "data": {
         "id": "opbeans-node",
-        "service.environment": "testing",
+        "service.environment": "test",
         "service.name": "opbeans-node",
         "agent.name": "nodejs"
       }
diff --git a/x-pack/plugins/apm/server/lib/service_nodes/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/service_nodes/__snapshots__/queries.test.ts.snap
index 87aca0d056909..d83e558775be4 100644
--- a/x-pack/plugins/apm/server/lib/service_nodes/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/lib/service_nodes/__snapshots__/queries.test.ts.snap
@@ -51,7 +51,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
@@ -119,7 +119,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
@@ -188,7 +188,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
diff --git a/x-pack/plugins/apm/server/lib/service_nodes/index.ts b/x-pack/plugins/apm/server/lib/service_nodes/index.ts
index a83aba192dba9..d5e29532e3d7b 100644
--- a/x-pack/plugins/apm/server/lib/service_nodes/index.ts
+++ b/x-pack/plugins/apm/server/lib/service_nodes/index.ts
@@ -4,11 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { getServiceNodesProjection } from '../../projections/service_nodes';
 import { mergeProjection } from '../../projections/util/merge_projection';
 import { SERVICE_NODE_NAME_MISSING } from '../../../common/service_nodes';
@@ -23,7 +19,7 @@ const getServiceNodes = async ({
   setup,
   serviceName,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   serviceName: string;
 }) => {
   const { apmEventClient } = setup;
diff --git a/x-pack/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap
index 431f11066aaff..3a38f80c87b35 100644
--- a/x-pack/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap
@@ -144,7 +144,7 @@ Array [
             },
             Object {
               "term": Object {
-                "my.custom.ui.filter": "foo-bar",
+                "service.environment": "test",
               },
             },
           ],
@@ -194,7 +194,7 @@ Array [
             },
             Object {
               "term": Object {
-                "my.custom.ui.filter": "foo-bar",
+                "service.environment": "test",
               },
             },
           ],
@@ -257,7 +257,7 @@ Array [
             },
             Object {
               "term": Object {
-                "my.custom.ui.filter": "foo-bar",
+                "service.environment": "test",
               },
             },
           ],
@@ -334,7 +334,7 @@ Array [
             },
             Object {
               "term": Object {
-                "my.custom.ui.filter": "foo-bar",
+                "service.environment": "test",
               },
             },
             Object {
@@ -389,7 +389,7 @@ Array [
             },
             Object {
               "term": Object {
-                "my.custom.ui.filter": "foo-bar",
+                "service.environment": "test",
               },
             },
           ],
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_node_metadata.ts b/x-pack/plugins/apm/server/lib/services/get_service_node_metadata.ts
index fca472b0ce8c2..d6ba9f5447ba5 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_node_metadata.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_node_metadata.ts
@@ -4,11 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import {
   HOST_NAME,
   CONTAINER_ID,
@@ -24,7 +20,7 @@ export async function getServiceNodeMetadata({
 }: {
   serviceName: string;
   serviceNodeName: string;
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
 }) {
   const { apmEventClient } = setup;
 
diff --git a/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts b/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts
index c09be7aacc784..092485c46fb08 100644
--- a/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts
@@ -5,11 +5,7 @@
  */
 import { joinByKey } from '../../../../common/utils/join_by_key';
 import { PromiseReturnType } from '../../../../typings/common';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../helpers/setup_request';
 import { getServicesProjection } from '../../../projections/services';
 import {
   getTransactionDurationAverages,
@@ -21,17 +17,15 @@ import {
 } from './get_services_items_stats';
 
 export type ServiceListAPIResponse = PromiseReturnType<typeof getServicesItems>;
-export type ServicesItemsSetup = Setup & SetupTimeRange & SetupUIFilters;
+export type ServicesItemsSetup = Setup & SetupTimeRange;
 export type ServicesItemsProjection = ReturnType<typeof getServicesProjection>;
 
 export async function getServicesItems({
   setup,
   searchAggregatedTransactions,
-  mlAnomaliesEnvironment,
 }: {
   setup: ServicesItemsSetup;
   searchAggregatedTransactions: boolean;
-  mlAnomaliesEnvironment?: string;
 }) {
   const params = {
     projection: getServicesProjection({
@@ -55,7 +49,7 @@ export async function getServicesItems({
     getTransactionRates(params),
     getTransactionErrorRates(params),
     getEnvironments(params),
-    getHealthStatuses(params, mlAnomaliesEnvironment),
+    getHealthStatuses(params, setup.uiFilters.environment),
   ]);
 
   const allMetrics = [
diff --git a/x-pack/plugins/apm/server/lib/services/get_services/index.ts b/x-pack/plugins/apm/server/lib/services/get_services/index.ts
index 351457b2a815e..04744a9c791bb 100644
--- a/x-pack/plugins/apm/server/lib/services/get_services/index.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_services/index.ts
@@ -6,11 +6,7 @@
 
 import { isEmpty } from 'lodash';
 import { PromiseReturnType } from '../../../../typings/common';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../helpers/setup_request';
 import { hasHistoricalAgentData } from './has_historical_agent_data';
 import { getLegacyDataStatus } from './get_legacy_data_status';
 import { getServicesItems } from './get_services_items';
@@ -20,17 +16,14 @@ export type ServiceListAPIResponse = PromiseReturnType<typeof getServices>;
 export async function getServices({
   setup,
   searchAggregatedTransactions,
-  mlAnomaliesEnvironment,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   searchAggregatedTransactions: boolean;
-  mlAnomaliesEnvironment?: string;
 }) {
   const [items, hasLegacyData] = await Promise.all([
     getServicesItems({
       setup,
       searchAggregatedTransactions,
-      mlAnomaliesEnvironment,
     }),
     getLegacyDataStatus(setup),
   ]);
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/transaction_groups/__snapshots__/queries.test.ts.snap
index bd6cefa793467..c678e7db711b6 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/__snapshots__/queries.test.ts.snap
@@ -61,7 +61,7 @@ Array [
             },
             Object {
               "term": Object {
-                "my.custom.ui.filter": "foo-bar",
+                "service.environment": "test",
               },
             },
           ],
@@ -128,7 +128,7 @@ Array [
             },
             Object {
               "term": Object {
-                "my.custom.ui.filter": "foo-bar",
+                "service.environment": "test",
               },
             },
           ],
@@ -195,7 +195,7 @@ Array [
             },
             Object {
               "term": Object {
-                "my.custom.ui.filter": "foo-bar",
+                "service.environment": "test",
               },
             },
           ],
@@ -270,7 +270,7 @@ Array [
             },
             Object {
               "term": Object {
-                "my.custom.ui.filter": "foo-bar",
+                "service.environment": "test",
               },
             },
           ],
@@ -325,7 +325,7 @@ Array [
             },
             Object {
               "term": Object {
-                "my.custom.ui.filter": "foo-bar",
+                "service.environment": "test",
               },
             },
           ],
@@ -380,7 +380,7 @@ Array [
             },
             Object {
               "term": Object {
-                "my.custom.ui.filter": "foo-bar",
+                "service.environment": "test",
               },
             },
           ],
@@ -441,7 +441,7 @@ Array [
             },
             Object {
               "term": Object {
-                "my.custom.ui.filter": "foo-bar",
+                "service.environment": "test",
               },
             },
           ],
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts b/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts
index 5d581149db667..0a4d9748f2597 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts
@@ -15,11 +15,7 @@ import { getTransactionGroupsProjection } from '../../projections/transaction_gr
 import { mergeProjection } from '../../projections/util/merge_projection';
 import { PromiseReturnType } from '../../../../observability/typings/common';
 import { AggregationOptionsByType } from '../../../typings/elasticsearch/aggregations';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import {
   getAverages,
   getSums,
@@ -57,7 +53,7 @@ export type TransactionGroupRequestBase = ReturnType<
   };
 };
 
-export type TransactionGroupSetup = Setup & SetupTimeRange & SetupUIFilters;
+export type TransactionGroupSetup = Setup & SetupTimeRange;
 
 function getItemsWithRelativeImpact(
   setup: TransactionGroupSetup,
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts b/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts
index 3dc126c45d328..d5289430b2698 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts
@@ -12,11 +12,7 @@ import {
   EVENT_OUTCOME,
 } from '../../../common/elasticsearch_fieldnames';
 import { rangeFilter } from '../../../common/utils/range_filter';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { getBucketSize } from '../helpers/get_bucket_size';
 import {
   getProcessorEventForAggregatedTransactions,
@@ -33,10 +29,10 @@ export async function getErrorRate({
   serviceName: string;
   transactionType?: string;
   transactionName?: string;
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   searchAggregatedTransactions: boolean;
 }) {
-  const { start, end, uiFiltersES, apmEventClient } = setup;
+  const { start, end, esFilter, apmEventClient } = setup;
 
   const transactionNamefilter = transactionName
     ? [{ term: { [TRANSACTION_NAME]: transactionName } }]
@@ -53,7 +49,7 @@ export async function getErrorRate({
     },
     ...transactionNamefilter,
     ...transactionTypefilter,
-    ...uiFiltersES,
+    ...esFilter,
   ];
 
   const params = {
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_sample_for_group.ts b/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_sample_for_group.ts
index 6c9b23b3dc079..7e1aad075fb16 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_sample_for_group.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_sample_for_group.ts
@@ -12,11 +12,7 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { rangeFilter } from '../../../common/utils/range_filter';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 
 export async function getTransactionSampleForGroup({
   serviceName,
@@ -25,9 +21,9 @@ export async function getTransactionSampleForGroup({
 }: {
   serviceName: string;
   transactionName: string;
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
 }) {
-  const { apmEventClient, start, end, uiFiltersES } = setup;
+  const { apmEventClient, start, end, esFilter } = setup;
 
   const filter = [
     {
@@ -43,7 +39,7 @@ export async function getTransactionSampleForGroup({
         [TRANSACTION_NAME]: transactionName,
       },
     },
-    ...uiFiltersES,
+    ...esFilter,
   ];
 
   const getSampledTransaction = async () => {
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/index.ts b/x-pack/plugins/apm/server/lib/transaction_groups/index.ts
index 6e0d619268d44..3796511029243 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/index.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/index.ts
@@ -4,16 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { transactionGroupsFetcher, Options } from './fetcher';
 
 export async function getTransactionGroupList(
   options: Options,
-  setup: Setup & SetupTimeRange & SetupUIFilters
+  setup: Setup & SetupTimeRange
 ) {
   const bucketSize = setup.config['xpack.apm.ui.transactionGroupBucketSize'];
   return await transactionGroupsFetcher(options, setup, bucketSize);
diff --git a/x-pack/plugins/apm/server/lib/transactions/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/transactions/__snapshots__/queries.test.ts.snap
index c63dfcc0c0ec7..3e0a7317afd70 100644
--- a/x-pack/plugins/apm/server/lib/transactions/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/lib/transactions/__snapshots__/queries.test.ts.snap
@@ -161,7 +161,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
@@ -295,7 +295,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
@@ -401,7 +401,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
@@ -502,7 +502,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
@@ -608,7 +608,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
           Object {
@@ -673,7 +673,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
diff --git a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts
index 34863c64f9804..8bbcaebe06513 100644
--- a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts
@@ -36,7 +36,8 @@ function getMockSetup(esResponse: any) {
         get: () => 'myIndex',
       }
     ) as APMConfig,
-    uiFiltersES: [],
+    uiFilters: {},
+    esFilter: [],
     indices: mockIndices,
     dynamicIndexPattern: null as any,
   };
diff --git a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
index 9730ddbbf38d7..8febdc898ab97 100644
--- a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
@@ -16,11 +16,7 @@ import {
   TRANSACTION_NAME,
   TRANSACTION_BREAKDOWN_COUNT,
 } from '../../../../common/elasticsearch_fieldnames';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../helpers/setup_request';
 import { rangeFilter } from '../../../../common/utils/range_filter';
 import { getMetricsDateHistogramParams } from '../../helpers/metrics';
 import { MAX_KPIS } from './constants';
@@ -32,12 +28,12 @@ export async function getTransactionBreakdown({
   transactionName,
   transactionType,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   serviceName: string;
   transactionName?: string;
   transactionType: string;
 }) {
-  const { uiFiltersES, apmEventClient, start, end, config } = setup;
+  const { esFilter, apmEventClient, start, end, config } = setup;
 
   const subAggs = {
     sum_all_self_times: {
@@ -84,7 +80,7 @@ export async function getTransactionBreakdown({
     { term: { [SERVICE_NAME]: serviceName } },
     { term: { [TRANSACTION_TYPE]: transactionType } },
     { range: rangeFilter(start, end) },
-    ...uiFiltersES,
+    ...esFilter,
   ];
 
   if (transactionName) {
diff --git a/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/fetcher.ts b/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/fetcher.ts
index 3cf9a54e3fe9b..287c7bc2c47f9 100644
--- a/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/fetcher.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/fetcher.ts
@@ -5,6 +5,7 @@
  */
 
 import { Logger } from 'kibana/server';
+import { ESSearchResponse } from '../../../../../typings/elasticsearch';
 import { PromiseReturnType } from '../../../../../../observability/typings/common';
 import { Setup, SetupTimeRange } from '../../../helpers/setup_request';
 
@@ -47,7 +48,7 @@ export async function anomalySeriesFetcher({
           filter: [
             { term: { job_id: jobId } },
             { exists: { field: 'bucket_span' } },
-            { term: { result_type: 'model_plot' } },
+            { terms: { result_type: ['model_plot', 'record'] } },
             { term: { partition_field_value: serviceName } },
             { term: { by_field_value: transactionType } },
             {
@@ -67,7 +68,7 @@ export async function anomalySeriesFetcher({
             extended_bounds: { min: newStart, max: end },
           },
           aggs: {
-            anomaly_score: { max: { field: 'anomaly_score' } },
+            anomaly_score: { max: { field: 'record_score' } },
             lower: { min: { field: 'model_lower' } },
             upper: { max: { field: 'model_upper' } },
           },
@@ -77,7 +78,11 @@ export async function anomalySeriesFetcher({
   };
 
   try {
-    const response = await ml.mlSystem.mlAnomalySearch(params);
+    const response: ESSearchResponse<
+      unknown,
+      typeof params
+    > = (await ml.mlSystem.mlAnomalySearch(params)) as any;
+
     return response;
   } catch (err) {
     const isHttpError = 'statusCode' in err;
diff --git a/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.ts b/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.ts
index d8865f0049d35..f11623eaa2dae 100644
--- a/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.ts
@@ -5,17 +5,13 @@
  */
 import { Logger } from 'kibana/server';
 import { isNumber } from 'lodash';
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
 import { getBucketSize } from '../../../helpers/get_bucket_size';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../../helpers/setup_request';
 import { anomalySeriesFetcher } from './fetcher';
 import { getMlBucketSize } from './get_ml_bucket_size';
 import { anomalySeriesTransform } from './transform';
 import { getMLJobIds } from '../../../service_map/get_service_anomalies';
-import { UIFilters } from '../../../../../typings/ui_filters';
 
 export async function getAnomalySeries({
   serviceName,
@@ -24,15 +20,13 @@ export async function getAnomalySeries({
   timeSeriesDates,
   setup,
   logger,
-  uiFilters,
 }: {
   serviceName: string;
   transactionType: string | undefined;
   transactionName: string | undefined;
   timeSeriesDates: number[];
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   logger: Logger;
-  uiFilters: UIFilters;
 }) {
   // don't fetch anomalies for transaction details page
   if (transactionName) {
@@ -44,12 +38,22 @@ export async function getAnomalySeries({
     return;
   }
 
+  const { uiFilters, start, end } = setup;
+  const { environment } = uiFilters;
+
+  // don't fetch anomalies when no specific environment is selected
+  if (environment === ENVIRONMENT_ALL.value) {
+    return;
+  }
+
   // don't fetch anomalies if unknown uiFilters are applied
   const knownFilters = ['environment', 'serviceName'];
-  const uiFilterNames = Object.keys(uiFilters);
-  if (
-    uiFilterNames.some((uiFilterName) => !knownFilters.includes(uiFilterName))
-  ) {
+  const hasUnknownFiltersApplied = Object.entries(setup.uiFilters)
+    .filter(([key, value]) => !!value)
+    .map(([key]) => key)
+    .some((uiFilterName) => !knownFilters.includes(uiFilterName));
+
+  if (hasUnknownFiltersApplied) {
     return;
   }
 
@@ -64,15 +68,8 @@ export async function getAnomalySeries({
     return;
   }
 
-  const mlJobIds = await getMLJobIds(
-    setup.ml.anomalyDetectors,
-    uiFilters.environment
-  );
+  const mlJobIds = await getMLJobIds(setup.ml.anomalyDetectors, environment);
 
-  // don't fetch anomalies if there are isn't exaclty 1 ML job match for the given environment
-  if (mlJobIds.length !== 1) {
-    return;
-  }
   const jobId = mlJobIds[0];
 
   const mlBucketSize = await getMlBucketSize({ setup, jobId, logger });
@@ -80,7 +77,6 @@ export async function getAnomalySeries({
     return;
   }
 
-  const { start, end } = setup;
   const { intervalString, bucketSize } = getBucketSize(start, end);
 
   const esResponse = await anomalySeriesFetcher({
diff --git a/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts b/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts
index fdbd99bf274d6..75dfae3e7375f 100644
--- a/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts
@@ -29,7 +29,10 @@ describe('timeseriesFetcher', () => {
             get: () => 'myIndex',
           }
         ) as APMConfig,
-        uiFiltersES: [
+        uiFilters: {
+          environment: 'test',
+        },
+        esFilter: [
           {
             term: { 'service.environment': 'test' },
           },
diff --git a/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts b/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts
index 5a3948f577430..e2edbbec63d47 100644
--- a/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts
@@ -14,11 +14,7 @@ import {
 import { PromiseReturnType } from '../../../../../../observability/typings/common';
 import { getBucketSize } from '../../../helpers/get_bucket_size';
 import { rangeFilter } from '../../../../../common/utils/range_filter';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../../helpers/setup_request';
 import {
   getProcessorEventForAggregatedTransactions,
   getTransactionDurationFieldForAggregatedTransactions,
@@ -36,10 +32,10 @@ export function timeseriesFetcher({
   serviceName: string;
   transactionType: string | undefined;
   transactionName: string | undefined;
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   searchAggregatedTransactions: boolean;
 }) {
-  const { start, end, uiFiltersES, apmEventClient } = setup;
+  const { start, end, apmEventClient } = setup;
   const { intervalString } = getBucketSize(start, end);
 
   const filter: ESFilter[] = [
@@ -48,7 +44,7 @@ export function timeseriesFetcher({
     ...getDocumentTypeFilterForAggregatedTransactions(
       searchAggregatedTransactions
     ),
-    ...uiFiltersES,
+    ...setup.esFilter,
   ];
 
   if (transactionName) {
diff --git a/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/index.ts b/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/index.ts
index 81dca447f16ca..c0421005dd06e 100644
--- a/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/index.ts
@@ -5,11 +5,7 @@
  */
 
 import { getBucketSize } from '../../../helpers/get_bucket_size';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../../helpers/setup_request';
 import { timeseriesFetcher } from './fetcher';
 import { timeseriesTransformer } from './transform';
 
@@ -17,7 +13,7 @@ export async function getApmTimeseriesData(options: {
   serviceName: string;
   transactionType: string | undefined;
   transactionName: string | undefined;
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   searchAggregatedTransactions: boolean;
 }) {
   const { start, end } = options.setup;
diff --git a/x-pack/plugins/apm/server/lib/transactions/charts/index.ts b/x-pack/plugins/apm/server/lib/transactions/charts/index.ts
index 43abf0b1a1d33..d8593612c0582 100644
--- a/x-pack/plugins/apm/server/lib/transactions/charts/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/charts/index.ts
@@ -6,15 +6,10 @@
 
 import { Logger } from 'kibana/server';
 import { PromiseReturnType } from '../../../../../observability/typings/common';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../helpers/setup_request';
 import { getAnomalySeries } from './get_anomaly_data';
 import { getApmTimeseriesData } from './get_timeseries_data';
 import { ApmTimeSeriesResponse } from './get_timeseries_data/transform';
-import { UIFilters } from '../../../../typings/ui_filters';
 
 function getDates(apmTimeseries: ApmTimeSeriesResponse) {
   return apmTimeseries.responseTimes.avg.map((p) => p.x);
@@ -27,10 +22,9 @@ export async function getTransactionCharts(options: {
   serviceName: string;
   transactionType: string | undefined;
   transactionName: string | undefined;
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   searchAggregatedTransactions: boolean;
   logger: Logger;
-  uiFilters: UIFilters;
 }) {
   const apmTimeseries = await getApmTimeseriesData(options);
   const anomalyTimeseries = await getAnomalySeries({
diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts b/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts
index 6e2fe34a5f5ef..34d01627a2869 100644
--- a/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts
@@ -17,11 +17,7 @@ import {
   TRANSACTION_TYPE,
 } from '../../../../../common/elasticsearch_fieldnames';
 import { rangeFilter } from '../../../../../common/utils/range_filter';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../../helpers/setup_request';
 import {
   getDocumentTypeFilterForAggregatedTransactions,
   getProcessorEventForAggregatedTransactions,
@@ -66,17 +62,17 @@ export async function getBuckets({
   traceId: string;
   distributionMax: number;
   bucketSize: number;
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   searchAggregatedTransactions: boolean;
 }) {
-  const { start, end, uiFiltersES, apmEventClient } = setup;
+  const { start, end, esFilter, apmEventClient } = setup;
 
   const commonFilters = [
     { term: { [SERVICE_NAME]: serviceName } },
     { term: { [TRANSACTION_TYPE]: transactionType } },
     { term: { [TRANSACTION_NAME]: transactionName } },
     { range: rangeFilter(start, end) },
-    ...uiFiltersES,
+    ...esFilter,
   ];
 
   async function getSamplesForDistributionBuckets() {
diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts b/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts
index 24ca2a4a07b68..249b1c4fbb20a 100644
--- a/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts
@@ -9,11 +9,7 @@ import {
   TRANSACTION_NAME,
   TRANSACTION_TYPE,
 } from '../../../../common/elasticsearch_fieldnames';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../helpers/setup_request';
 import {
   getProcessorEventForAggregatedTransactions,
   getTransactionDurationFieldForAggregatedTransactions,
@@ -29,10 +25,10 @@ export async function getDistributionMax({
   serviceName: string;
   transactionName: string;
   transactionType: string;
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   searchAggregatedTransactions: boolean;
 }) {
-  const { start, end, uiFiltersES, apmEventClient } = setup;
+  const { start, end, esFilter, apmEventClient } = setup;
 
   const params = {
     apm: {
@@ -59,7 +55,7 @@ export async function getDistributionMax({
                 },
               },
             },
-            ...uiFiltersES,
+            ...esFilter,
           ],
         },
       },
diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/index.ts b/x-pack/plugins/apm/server/lib/transactions/distribution/index.ts
index b9ab36fb08d42..deafc37ee42e2 100644
--- a/x-pack/plugins/apm/server/lib/transactions/distribution/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/distribution/index.ts
@@ -5,11 +5,7 @@
  */
 
 import { PromiseReturnType } from '../../../../../observability/typings/common';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../helpers/setup_request';
 import { getBuckets } from './get_buckets';
 import { getDistributionMax } from './get_distribution_max';
 import { roundToNearestFiveOrTen } from '../../helpers/round_to_nearest_five_or_ten';
@@ -39,7 +35,7 @@ export async function getTransactionDistribution({
   transactionType: string;
   transactionId: string;
   traceId: string;
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   searchAggregatedTransactions: boolean;
 }) {
   const distributionMax = await getDistributionMax({
diff --git a/x-pack/plugins/apm/server/lib/transactions/get_transaction/index.ts b/x-pack/plugins/apm/server/lib/transactions/get_transaction/index.ts
index 9aa1a8f4de87f..8958be0819613 100644
--- a/x-pack/plugins/apm/server/lib/transactions/get_transaction/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/get_transaction/index.ts
@@ -9,11 +9,7 @@ import {
   TRANSACTION_ID,
 } from '../../../../common/elasticsearch_fieldnames';
 import { rangeFilter } from '../../../../common/utils/range_filter';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../helpers/setup_request';
 import { ProcessorEvent } from '../../../../common/processor_event';
 
 export async function getTransaction({
@@ -23,7 +19,7 @@ export async function getTransaction({
 }: {
   transactionId: string;
   traceId: string;
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
 }) {
   const { start, end, apmEventClient } = setup;
 
diff --git a/x-pack/plugins/apm/server/lib/transactions/queries.test.ts b/x-pack/plugins/apm/server/lib/transactions/queries.test.ts
index 87b8bc7c4ae90..eff9451c9e1cd 100644
--- a/x-pack/plugins/apm/server/lib/transactions/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/queries.test.ts
@@ -56,7 +56,6 @@ describe('transaction queries', () => {
         setup,
         searchAggregatedTransactions: false,
         logger: loggerMock.create(),
-        uiFilters: {},
       })
     );
     expect(mock.params).toMatchSnapshot();
@@ -71,7 +70,6 @@ describe('transaction queries', () => {
         setup,
         searchAggregatedTransactions: false,
         logger: loggerMock.create(),
-        uiFilters: {},
       })
     );
     expect(mock.params).toMatchSnapshot();
@@ -86,7 +84,6 @@ describe('transaction queries', () => {
         setup,
         searchAggregatedTransactions: false,
         logger: loggerMock.create(),
-        uiFilters: {},
       })
     );
 
diff --git a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap
index 5f38432719280..e7ca65eb740b6 100644
--- a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap
@@ -46,7 +46,7 @@ Object {
           },
           Object {
             "term": Object {
-              "my.custom.ui.filter": "foo-bar",
+              "service.environment": "test",
             },
           },
         ],
diff --git a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/get_local_filter_query.ts b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/get_local_filter_query.ts
index 10f6e93c1cfc1..9fbdba679b667 100644
--- a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/get_local_filter_query.ts
+++ b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/get_local_filter_query.ts
@@ -8,7 +8,7 @@ import { omit } from 'lodash';
 import { mergeProjection } from '../../../projections/util/merge_projection';
 import { Projection } from '../../../projections/typings';
 import { UIFilters } from '../../../../typings/ui_filters';
-import { getUiFiltersES } from '../../helpers/convert_ui_filters/get_ui_filters_es';
+import { getEsFilter } from '../../helpers/convert_ui_filters/get_es_filter';
 import { localUIFilters } from './config';
 import { LocalUIFilterName } from '../../../../common/ui_filter';
 
@@ -22,7 +22,7 @@ export const getLocalFilterQuery = ({
   localUIFilterName: LocalUIFilterName;
 }) => {
   const field = localUIFilters[localUIFilterName];
-  const filter = getUiFiltersES(omit(uiFilters, field.name));
+  const filter = getEsFilter(omit(uiFilters, field.name));
 
   const bucketCountAggregation = projection.body.aggs
     ? {
diff --git a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/queries.test.ts b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/queries.test.ts
index 22fa20e255f6e..f4e8aafc1bcf5 100644
--- a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/queries.test.ts
@@ -15,7 +15,7 @@ describe('local ui filter queries', () => {
   let mock: SearchParamsMock;
 
   beforeEach(() => {
-    jest.mock('../../helpers/convert_ui_filters/get_ui_filters_es', () => {
+    jest.mock('../../helpers/convert_ui_filters/get_es_filter', () => {
       return [];
     });
   });
diff --git a/x-pack/plugins/apm/server/projections/errors.ts b/x-pack/plugins/apm/server/projections/errors.ts
index 49a0e9f479d26..173dc94a0840c 100644
--- a/x-pack/plugins/apm/server/projections/errors.ts
+++ b/x-pack/plugins/apm/server/projections/errors.ts
@@ -4,11 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../server/lib/helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request';
 import {
   SERVICE_NAME,
   ERROR_GROUP_ID,
@@ -20,10 +16,10 @@ export function getErrorGroupsProjection({
   setup,
   serviceName,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   serviceName: string;
 }) {
-  const { start, end, uiFiltersES } = setup;
+  const { start, end, esFilter } = setup;
 
   return {
     apm: {
@@ -35,7 +31,7 @@ export function getErrorGroupsProjection({
           filter: [
             { term: { [SERVICE_NAME]: serviceName } },
             { range: rangeFilter(start, end) },
-            ...uiFiltersES,
+            ...esFilter,
           ],
         },
       },
diff --git a/x-pack/plugins/apm/server/projections/metrics.ts b/x-pack/plugins/apm/server/projections/metrics.ts
index eb80a6bc73248..c3b5db5be6af8 100644
--- a/x-pack/plugins/apm/server/projections/metrics.ts
+++ b/x-pack/plugins/apm/server/projections/metrics.ts
@@ -4,11 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../server/lib/helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request';
 import {
   SERVICE_NAME,
   SERVICE_NODE_NAME,
@@ -34,17 +30,17 @@ export function getMetricsProjection({
   serviceName,
   serviceNodeName,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   serviceName: string;
   serviceNodeName?: string;
 }) {
-  const { start, end, uiFiltersES } = setup;
+  const { start, end, esFilter } = setup;
 
   const filter = [
     { term: { [SERVICE_NAME]: serviceName } },
     { range: rangeFilter(start, end) },
     ...getServiceNodeNameFilters(serviceNodeName),
-    ...uiFiltersES,
+    ...esFilter,
   ];
 
   return {
diff --git a/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts b/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts
index c27314923f6bd..96ee26c6e65f5 100644
--- a/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts
+++ b/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts
@@ -4,11 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../server/lib/helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request';
 import {
   AGENT_NAME,
   TRANSACTION_TYPE,
@@ -22,10 +18,10 @@ export function getRumPageLoadTransactionsProjection({
   setup,
   urlQuery,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   urlQuery?: string;
 }) {
-  const { start, end, uiFiltersES } = setup;
+  const { start, end, esFilter } = setup;
 
   const bool = {
     filter: [
@@ -49,7 +45,7 @@ export function getRumPageLoadTransactionsProjection({
             },
           ]
         : []),
-      ...uiFiltersES,
+      ...esFilter,
     ],
   };
 
@@ -68,9 +64,9 @@ export function getRumPageLoadTransactionsProjection({
 export function getRumErrorsProjection({
   setup,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
 }) {
-  const { start, end, uiFiltersES } = setup;
+  const { start, end, esFilter: esFilter } = setup;
 
   const bool = {
     filter: [
@@ -82,7 +78,7 @@ export function getRumErrorsProjection({
           [SERVICE_LANGUAGE_NAME]: 'javascript',
         },
       },
-      ...uiFiltersES,
+      ...esFilter,
     ],
   };
 
diff --git a/x-pack/plugins/apm/server/projections/service_nodes.ts b/x-pack/plugins/apm/server/projections/service_nodes.ts
index 87fe815a12d0d..ed8d4c7409eda 100644
--- a/x-pack/plugins/apm/server/projections/service_nodes.ts
+++ b/x-pack/plugins/apm/server/projections/service_nodes.ts
@@ -4,11 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../server/lib/helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request';
 import { SERVICE_NODE_NAME } from '../../common/elasticsearch_fieldnames';
 import { mergeProjection } from './util/merge_projection';
 import { getMetricsProjection } from './metrics';
@@ -18,7 +14,7 @@ export function getServiceNodesProjection({
   serviceName,
   serviceNodeName,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   serviceName: string;
   serviceNodeName?: string;
 }) {
diff --git a/x-pack/plugins/apm/server/projections/services.ts b/x-pack/plugins/apm/server/projections/services.ts
index ba61f72519a23..d912a95546515 100644
--- a/x-pack/plugins/apm/server/projections/services.ts
+++ b/x-pack/plugins/apm/server/projections/services.ts
@@ -4,11 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  Setup,
-  SetupUIFilters,
-  SetupTimeRange,
-} from '../../server/lib/helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request';
 import { SERVICE_NAME } from '../../common/elasticsearch_fieldnames';
 import { rangeFilter } from '../../common/utils/range_filter';
 import { ProcessorEvent } from '../../common/processor_event';
@@ -18,10 +14,10 @@ export function getServicesProjection({
   setup,
   searchAggregatedTransactions,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   searchAggregatedTransactions: boolean;
 }) {
-  const { start, end, uiFiltersES } = setup;
+  const { start, end, esFilter } = setup;
 
   return {
     apm: {
@@ -37,7 +33,7 @@ export function getServicesProjection({
       size: 0,
       query: {
         bool: {
-          filter: [{ range: rangeFilter(start, end) }, ...uiFiltersES],
+          filter: [{ range: rangeFilter(start, end) }, ...esFilter],
         },
       },
       aggs: {
diff --git a/x-pack/plugins/apm/server/projections/transaction_groups.ts b/x-pack/plugins/apm/server/projections/transaction_groups.ts
index 0cc3a7a35d214..2ce720eb12167 100644
--- a/x-pack/plugins/apm/server/projections/transaction_groups.ts
+++ b/x-pack/plugins/apm/server/projections/transaction_groups.ts
@@ -4,11 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { omit } from 'lodash';
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../server/lib/helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request';
 import {
   TRANSACTION_NAME,
   PARENT_ID,
@@ -22,7 +18,7 @@ export function getTransactionGroupsProjection({
   setup,
   options,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   options: Options;
 }) {
   const transactionsProjection = getTransactionsProjection({
diff --git a/x-pack/plugins/apm/server/projections/transactions.ts b/x-pack/plugins/apm/server/projections/transactions.ts
index 8e9bb3bf321f6..548e77b5d2cd9 100644
--- a/x-pack/plugins/apm/server/projections/transactions.ts
+++ b/x-pack/plugins/apm/server/projections/transactions.ts
@@ -4,11 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  Setup,
-  SetupTimeRange,
-  SetupUIFilters,
-} from '../../server/lib/helpers/setup_request';
+import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request';
 import {
   SERVICE_NAME,
   TRANSACTION_TYPE,
@@ -27,13 +23,13 @@ export function getTransactionsProjection({
   transactionType,
   searchAggregatedTransactions,
 }: {
-  setup: Setup & SetupTimeRange & SetupUIFilters;
+  setup: Setup & SetupTimeRange;
   serviceName?: string;
   transactionName?: string;
   transactionType?: string;
   searchAggregatedTransactions: boolean;
 }) {
-  const { start, end, uiFiltersES } = setup;
+  const { start, end, esFilter } = setup;
 
   const transactionNameFilter = transactionName
     ? [{ term: { [TRANSACTION_NAME]: transactionName } }]
@@ -51,7 +47,7 @@ export function getTransactionsProjection({
       ...transactionNameFilter,
       ...transactionTypeFilter,
       ...serviceNameFilter,
-      ...uiFiltersES,
+      ...esFilter,
       ...getDocumentTypeFilterForAggregatedTransactions(
         searchAggregatedTransactions
       ),
diff --git a/x-pack/plugins/apm/server/routes/service_map.ts b/x-pack/plugins/apm/server/routes/service_map.ts
index 1996d4d4a262d..6e86ececd1bfe 100644
--- a/x-pack/plugins/apm/server/routes/service_map.ts
+++ b/x-pack/plugins/apm/server/routes/service_map.ts
@@ -17,7 +17,6 @@ import { createRoute } from './create_route';
 import { rangeRt, uiFiltersRt } from './default_api_types';
 import { notifyFeatureUsage } from '../feature';
 import { getSearchAggregatedTransactions } from '../lib/helpers/aggregated_transactions';
-import { getParsedUiFilters } from '../lib/helpers/convert_ui_filters/get_parsed_ui_filters';
 
 export const serviceMapRoute = createRoute(() => ({
   path: '/api/apm/service-map',
@@ -77,24 +76,20 @@ export const serviceMapServiceNodeRoute = createRoute(() => ({
     if (!isActivePlatinumLicense(context.licensing.license)) {
       throw Boom.forbidden(invalidLicenseMessage);
     }
-    const logger = context.logger;
     const setup = await setupRequest(context, request);
 
     const {
-      query: { uiFilters: uiFiltersJson },
       path: { serviceName },
     } = context.params;
 
     const searchAggregatedTransactions = await getSearchAggregatedTransactions(
       setup
     );
-    const uiFilters = getParsedUiFilters({ uiFilters: uiFiltersJson, logger });
 
     return getServiceMapServiceNodeInfo({
       setup,
       serviceName,
       searchAggregatedTransactions,
-      uiFilters,
     });
   },
 }));
diff --git a/x-pack/plugins/apm/server/routes/services.ts b/x-pack/plugins/apm/server/routes/services.ts
index 4bb10f31ba6a1..538ba3926c792 100644
--- a/x-pack/plugins/apm/server/routes/services.ts
+++ b/x-pack/plugins/apm/server/routes/services.ts
@@ -17,7 +17,6 @@ import { uiFiltersRt, rangeRt } from './default_api_types';
 import { getServiceAnnotations } from '../lib/services/annotations';
 import { dateAsStringRt } from '../../common/runtime_types/date_as_string_rt';
 import { getSearchAggregatedTransactions } from '../lib/helpers/aggregated_transactions';
-import { getParsedUiFilters } from '../lib/helpers/convert_ui_filters/get_parsed_ui_filters';
 
 export const servicesRoute = createRoute(() => ({
   path: '/api/apm/services',
@@ -25,22 +24,13 @@ export const servicesRoute = createRoute(() => ({
     query: t.intersection([uiFiltersRt, rangeRt]),
   },
   handler: async ({ context, request }) => {
-    const { environment } = getParsedUiFilters({
-      uiFilters: context.params.query.uiFilters,
-      logger: context.logger,
-    });
-
     const setup = await setupRequest(context, request);
 
     const searchAggregatedTransactions = await getSearchAggregatedTransactions(
       setup
     );
 
-    const services = await getServices({
-      setup,
-      searchAggregatedTransactions,
-      mlAnomaliesEnvironment: environment,
-    });
+    const services = await getServices({ setup, searchAggregatedTransactions });
 
     return services;
   },
diff --git a/x-pack/plugins/apm/server/routes/transaction_groups.ts b/x-pack/plugins/apm/server/routes/transaction_groups.ts
index dd1335fb2c2a1..18fc73b468cd4 100644
--- a/x-pack/plugins/apm/server/routes/transaction_groups.ts
+++ b/x-pack/plugins/apm/server/routes/transaction_groups.ts
@@ -5,6 +5,7 @@
  */
 
 import * as t from 'io-ts';
+import Boom from 'boom';
 import { setupRequest } from '../lib/helpers/setup_request';
 import { getTransactionCharts } from '../lib/transactions/charts';
 import { getTransactionDistribution } from '../lib/transactions/distribution';
@@ -15,7 +16,6 @@ import { uiFiltersRt, rangeRt } from './default_api_types';
 import { getTransactionSampleForGroup } from '../lib/transaction_groups/get_transaction_sample_for_group';
 import { getSearchAggregatedTransactions } from '../lib/helpers/aggregated_transactions';
 import { getErrorRate } from '../lib/transaction_groups/get_error_rate';
-import { getParsedUiFilters } from '../lib/helpers/convert_ui_filters/get_parsed_ui_filters';
 
 export const transactionGroupsRoute = createRoute(() => ({
   path: '/api/apm/services/{serviceName}/transaction_groups',
@@ -71,27 +71,28 @@ export const transactionGroupsChartsRoute = createRoute(() => ({
     const setup = await setupRequest(context, request);
     const logger = context.logger;
     const { serviceName } = context.params.path;
-    const {
-      transactionType,
-      transactionName,
-      uiFilters: uiFiltersJson,
-    } = context.params.query;
+    const { transactionType, transactionName } = context.params.query;
 
-    const uiFilters = getParsedUiFilters({ uiFilters: uiFiltersJson, logger });
+    if (!setup.uiFilters.environment) {
+      throw Boom.badRequest(
+        `environment is a required property of the ?uiFilters JSON for transaction_groups/charts.`
+      );
+    }
 
     const searchAggregatedTransactions = await getSearchAggregatedTransactions(
       setup
     );
 
-    return getTransactionCharts({
+    const options = {
       serviceName,
       transactionType,
       transactionName,
       setup,
       searchAggregatedTransactions,
       logger,
-      uiFilters,
-    });
+    };
+
+    return getTransactionCharts(options);
   },
 }));
 
diff --git a/x-pack/plugins/apm/server/routes/ui_filters.ts b/x-pack/plugins/apm/server/routes/ui_filters.ts
index 936d460102dce..26fe0118c02ed 100644
--- a/x-pack/plugins/apm/server/routes/ui_filters.ts
+++ b/x-pack/plugins/apm/server/routes/ui_filters.ts
@@ -9,13 +9,12 @@ import { omit } from 'lodash';
 import {
   setupRequest,
   Setup,
-  SetupUIFilters,
   SetupTimeRange,
 } from '../lib/helpers/setup_request';
 import { getEnvironments } from '../lib/ui_filters/get_environments';
 import { Projection } from '../projections/typings';
 import { localUIFilterNames } from '../lib/ui_filters/local_ui_filters/config';
-import { getUiFiltersES } from '../lib/helpers/convert_ui_filters/get_ui_filters_es';
+import { getEsFilter } from '../lib/helpers/convert_ui_filters/get_es_filter';
 import { getLocalUIFilters } from '../lib/ui_filters/local_ui_filters';
 import { getServicesProjection } from '../projections/services';
 import { getTransactionGroupsProjection } from '../projections/transaction_groups';
@@ -97,23 +96,23 @@ function createLocalFiltersRoute<
     },
     handler: async ({ context, request }) => {
       const setup = await setupRequest(context, request);
+      const { uiFilters } = setup;
       const { query } = context.params;
 
-      const { uiFilters, filterNames } = query;
-      const parsedUiFilters = JSON.parse(uiFilters);
+      const { filterNames } = query;
       const projection = await getProjection({
         query,
         context,
         setup: {
           ...setup,
-          uiFiltersES: getUiFiltersES(omit(parsedUiFilters, filterNames)),
+          esFilter: getEsFilter(omit(uiFilters, filterNames)),
         },
       });
 
       return getLocalUIFilters({
         projection,
         setup,
-        uiFilters: parsedUiFilters,
+        uiFilters,
         localFilterNames: filterNames,
       });
     },
@@ -271,6 +270,6 @@ type GetProjection<
   context,
 }: {
   query: t.TypeOf<TQueryRT>;
-  setup: Setup & SetupUIFilters & SetupTimeRange;
+  setup: Setup & SetupTimeRange;
   context: APMRequestHandlerContext;
 }) => Promise<TProjection> | TProjection;
diff --git a/x-pack/plugins/apm/server/utils/test_helpers.tsx b/x-pack/plugins/apm/server/utils/test_helpers.tsx
index 98c1436b2b9b8..18b990b35b5a5 100644
--- a/x-pack/plugins/apm/server/utils/test_helpers.tsx
+++ b/x-pack/plugins/apm/server/utils/test_helpers.tsx
@@ -9,6 +9,7 @@ import {
   ESSearchRequest,
 } from '../../typings/elasticsearch';
 import { PromiseReturnType } from '../../typings/common';
+import { UIFilters } from '../../typings/ui_filters';
 import { APMConfig } from '..';
 
 interface Options {
@@ -23,7 +24,8 @@ interface MockSetup {
   apmEventClient: any;
   internalClient: any;
   config: APMConfig;
-  uiFiltersES: ESFilter[];
+  uiFilters: UIFilters;
+  esFilter: ESFilter[];
   indices: {
     /* eslint-disable @typescript-eslint/naming-convention */
     'apm_oss.sourcemapIndices': string;
@@ -78,7 +80,8 @@ export async function inspectSearchParams(
         },
       }
     ) as APMConfig,
-    uiFiltersES: [{ term: { 'my.custom.ui.filter': 'foo-bar' } }],
+    uiFilters: { environment: 'test' },
+    esFilter: [{ term: { 'service.environment': 'test' } }],
     indices: {
       /* eslint-disable @typescript-eslint/naming-convention */
       'apm_oss.sourcemapIndices': 'myIndex',
diff --git a/x-pack/plugins/global_search_bar/public/assets/illustration_product_no_search_results_dark.svg b/x-pack/plugins/global_search_bar/public/assets/illustration_product_no_search_results_dark.svg
new file mode 100644
index 0000000000000..3a87f06b7bcc8
--- /dev/null
+++ b/x-pack/plugins/global_search_bar/public/assets/illustration_product_no_search_results_dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 140"><defs><style>.cls-1{fill:#20377d;}.cls-2{fill:#294492;}.cls-3{fill:#0a89db;}.cls-4{fill:#1c1e23;}.cls-5{fill:#00bfb3;}.cls-6{fill:#fec514;}.cls-7{fill:#ff957d;}.cls-8{fill:#f04e98;}.cls-9{fill:#7de2d1;}</style></defs><g id="Layer_1" data-name="Layer 1"><path class="cls-1" d="M80.64,19.05a.66.66,0,0,0-.13.76.61.61,0,0,0,.72.08.46.46,0,0,0,.13-.53C81.17,19.05,80.84,18.91,80.64,19.05Z"/><path class="cls-1" d="M80.8,21.08a.36.36,0,0,0-.07.49.72.72,0,0,0,.33.29l.5-.22a1,1,0,0,0,0-.56C81.53,20.87,81,20.85,80.8,21.08Z"/><path class="cls-1" d="M80.31,18c.15.15.39.05.51,0s.11-.24,0-.37-.32-.2-.41-.07S80.16,17.81,80.31,18Z"/><path class="cls-1" d="M81.86,17.28a.51.51,0,0,0,.67.2.77.77,0,0,0,.18-.93.52.52,0,0,0-.66-.07A.54.54,0,0,0,81.86,17.28Z"/><path class="cls-1" d="M85,18.35a.59.59,0,0,0,.2-.88.63.63,0,0,0-.81-.25c-.27.14-.32.63-.11,1A.48.48,0,0,0,85,18.35Z"/><path class="cls-1" d="M82.43,19.18a.8.8,0,0,0,1,.31.83.83,0,0,0,.25-1c-.17-.32-.62-.38-1-.14A.62.62,0,0,0,82.43,19.18Z"/><path class="cls-1" d="M84.52,20.42s0,0,0,0c-.12-.16-.27-.15-.43,0a.38.38,0,0,0-.18.31Z"/><path class="cls-1" d="M76.75,23.79a.25.25,0,0,0,.06-.41.46.46,0,0,0-.34-.14c-.1,0-.28.33-.19.47A.33.33,0,0,0,76.75,23.79Z"/><path class="cls-1" d="M74.9,21.3c.16-.07.08-.3,0-.37a.21.21,0,0,0-.28-.1.23.23,0,0,0-.07.29C74.61,21.19,74.75,21.37,74.9,21.3Z"/><path class="cls-1" d="M74.53,24.76c.1,0,.17-.18.17-.24a.24.24,0,0,0-.17-.19c-.08,0-.16.11-.18.18A.28.28,0,0,0,74.53,24.76Z"/><path class="cls-1" d="M74.7,23.78a.38.38,0,0,0,.41.27.3.3,0,0,0,.31-.26c0-.28-.14-.4-.38-.52C74.85,23.42,74.62,23.51,74.7,23.78Z"/><path class="cls-1" d="M79.91,18.26a.42.42,0,0,0,.06-.34.3.3,0,0,0-.46-.06.64.64,0,0,0-.07.28C79.59,18.34,79.81,18.38,79.91,18.26Z"/><path class="cls-1" d="M75.8,23.28a.56.56,0,0,0,.13-.41c0-.14-.33-.19-.45-.07s-.09.22-.12.29C75.5,23.32,75.71,23.4,75.8,23.28Z"/><path class="cls-1" d="M73.4,21.57c.23.26.64,0,.63-.2s-.34-.43-.51-.34S73.17,21.32,73.4,21.57Z"/><path class="cls-1" d="M73.37,19.17c.12-.09,0-.23,0-.29a.24.24,0,0,0-.23,0,.27.27,0,0,0,0,.24S73.24,19.27,73.37,19.17Z"/><path class="cls-1" d="M77.34,22.59a.66.66,0,0,0,.74.65l.1,0,.24-.12c.16-.17.18-.4.41-.33a.27.27,0,0,1,.12.07l1-.46c-.09-.06-.17-.09-.17-.14s.09-.45-.19-.51c-.58-.14-.56.42-.75.43S78.3,22,78,22,77.3,22.19,77.34,22.59Z"/><path class="cls-1" d="M77.42,20.93c.1.18.51.22.75.08a.45.45,0,0,0,.2-.62.6.6,0,0,0-.76-.25A.64.64,0,0,0,77.42,20.93Z"/><path class="cls-1" d="M79.38,20c.13-.11.08-.42,0-.52a.29.29,0,0,0-.44,0,.23.23,0,0,0,0,.38C79,19.87,79.26,20.08,79.38,20Z"/><path class="cls-1" d="M77.06,19.1c.08-.15.37-.32.28-.5s-.39-.12-.56-.18l-.08.09a.35.35,0,0,0,.09.41A.44.44,0,0,0,77.06,19.1Z"/><path class="cls-1" d="M77.07,19.39s0,.09,0,.1.09.09.14.07,0-.08,0-.13S77.1,19.38,77.07,19.39Z"/><path class="cls-1" d="M73.53,24.37c.08-.14-.18-.58-.39-.53a.37.37,0,0,0-.26.41C72.94,24.46,73.45,24.52,73.53,24.37Z"/><path class="cls-1" d="M65.58,31.11c.13-.09.09-.3-.06-.42s-.32-.13-.41,0-.23.38,0,.52S65.46,31.19,65.58,31.11Z"/><path class="cls-1" d="M60.51,36a.67.67,0,0,0,.06-.81.65.65,0,0,0-.85,0,.67.67,0,0,0,.15.88A.45.45,0,0,0,60.51,36Z"/><path class="cls-1" d="M82.63,21a.32.32,0,0,0,.14-.46.35.35,0,0,0-.5-.14.39.39,0,0,0-.12.52A.36.36,0,0,0,82.63,21Z"/><path class="cls-1" d="M58.44,38.1a.36.36,0,0,0-.36-.26c-.18,0-.22.16-.13.54A.33.33,0,0,0,58.44,38.1Z"/><path class="cls-1" d="M56.15,42.72a.27.27,0,0,0-.42.06.53.53,0,0,0-.08.6l0,0c0,.07,0,.17,0,.24a.08.08,0,0,0,.08,0c.17-.28.36-.56.53-.84A.68.68,0,0,0,56.15,42.72Z"/><path class="cls-1" d="M56.74,41.7a.37.37,0,0,0,0,.39c.11-.18.22-.37.34-.55A.55.55,0,0,0,56.74,41.7Z"/><path class="cls-1" d="M49.84,57.68a.49.49,0,0,0-.13.42c0,.09.13.18.23.22.06-.24.1-.48.16-.72A.37.37,0,0,0,49.84,57.68Z"/><path class="cls-1" d="M73.46,24.64s0,.18,0,.2.19.14.28.05,0-.23,0-.24A.29.29,0,0,0,73.46,24.64Z"/><path class="cls-1" d="M106.1,30.08a.39.39,0,0,0,.2,0s.08-.16.06-.19a.31.31,0,0,0-.23-.08s0,0-.07,0Z"/><path class="cls-1" d="M50.19,53.75a.26.26,0,0,0-.09-.41.44.44,0,0,0-.37,0c-.09.05-.15.4,0,.5A.35.35,0,0,0,50.19,53.75Z"/><path class="cls-1" d="M52,46.87c.12-.13,0-.27-.11-.36a.26.26,0,0,0-.41.07c0,.12-.14.37.05.46S51.91,47,52,46.87Z"/><path class="cls-1" d="M51.56,51.51c-.17.07-.54,0-.79.09s-.62.45-.44.82a.66.66,0,0,0,.92.35c.49-.21.19-.68.54-.69.15-.41.28-.81.44-1.21a.35.35,0,0,0-.11,0C51.52,50.92,51.73,51.43,51.56,51.51Z"/><path class="cls-1" d="M50.75,47.23a.5.5,0,0,0,0,.28c.21.14.43.11.48,0a.45.45,0,0,0,0-.34A.31.31,0,0,0,50.75,47.23Z"/><path class="cls-1" d="M50.76,48.87a.23.23,0,0,0,.11.36c.1.06.4.17.48,0s-.07-.42-.17-.5S50.87,48.71,50.76,48.87Z"/><path class="cls-1" d="M53.05,48.55A.46.46,0,0,0,53,48c-.29-.22-.65-.25-.79,0a.65.65,0,0,0,.14.76A.6.6,0,0,0,53.05,48.55Z"/><path class="cls-1" d="M71.39,25.93a.37.37,0,0,0-.49.06.41.41,0,0,0,0,.53.19.19,0,0,0,.1.05.77.77,0,0,0-.11.83.2.2,0,0,0,.08.08l1-.71a1.34,1.34,0,0,0-.07-.18.62.62,0,0,0-.5-.28A.48.48,0,0,0,71.39,25.93Z"/><path class="cls-1" d="M65.08,26.93c0-.06.12-.21,0-.26a.26.26,0,0,0-.26,0c0,.05-.11.25,0,.3A.22.22,0,0,0,65.08,26.93Z"/><path class="cls-1" d="M65.31,24.29c.11-.11,0-.23-.09-.29a.23.23,0,0,0-.2,0,.29.29,0,0,0,0,.24A.22.22,0,0,0,65.31,24.29Z"/><path class="cls-1" d="M63.56,28.38c-.29.26-.3.45,0,.73s.43.43.64.64c-.37.42-.36.49.06.71.27-.12.3-.32.19-.58.55-.42.46-.81-.21-1.1a.71.71,0,0,1,0-.14c0-.21-.09-.3-.26-.37A.37.37,0,0,0,63.56,28.38Z"/><path class="cls-1" d="M65.42,25.67a.2.2,0,0,0,.3-.08.22.22,0,0,0-.08-.27.19.19,0,0,0-.27,0A.21.21,0,0,0,65.42,25.67Z"/><path class="cls-1" d="M64.13,33.09a.91.91,0,0,0-.91.3.56.56,0,0,0,0,.64Z"/><path class="cls-1" d="M63.75,27.92c.17-.22.1-.36,0-.45s-.3-.14-.38,0a.41.41,0,0,0,0,.39C63.47,28,63.65,27.91,63.75,27.92Z"/><path class="cls-1" d="M53.45,45.83a.76.76,0,0,0-.15-.93.56.56,0,0,0-.55,1A.51.51,0,0,0,53.45,45.83Z"/><path class="cls-1" d="M61.92,32.22a.48.48,0,0,0,.72-.15.63.63,0,0,0-.17-.94.65.65,0,0,0-.84.16A.72.72,0,0,0,61.92,32.22Z"/><path class="cls-1" d="M71.26,24.25a.56.56,0,0,0,.22-.61.37.37,0,0,0-.08-.18.24.24,0,0,0,0-.22c-.07-.08-.27-.27-.45-.14a.19.19,0,0,0-.08.19c-.19,0-.44,0-.53.15s.11.33.15.45C70.6,24.22,71,24.41,71.26,24.25Z"/><path class="cls-1" d="M69,27.19c.09.06.3-.11.32-.17a.27.27,0,0,0-.12-.26.29.29,0,0,0-.27.1A.3.3,0,0,0,69,27.19Z"/><path class="cls-1" d="M66.92,30.25a.8.8,0,0,0,.27.12l.66-.55a.75.75,0,0,0-.29-.67.76.76,0,0,0-.89.17C66.46,29.6,66.57,30,66.92,30.25Z"/><path class="cls-1" d="M68.92,24.41a.38.38,0,0,0,0-.49.33.33,0,0,0-.48,0,.39.39,0,0,0,0,.5A.32.32,0,0,0,68.92,24.41Z"/><path class="cls-1" d="M68.26,27.16a.63.63,0,0,0,0-.84.56.56,0,0,0-.69.19.52.52,0,0,0,.15.68C67.93,27.36,68.12,27.34,68.26,27.16Z"/><path class="cls-1" d="M69.44,28.55l0,0,.57-.44a.49.49,0,0,0-.32-.31.41.41,0,0,0-.3.73Z"/><path class="cls-1" d="M54.93,41.6A.33.33,0,0,0,55,42c.21.24.34.25.67.08.25.07.46.16.68.2a.24.24,0,0,0,.26-.37c-.16-.21-.27-.48-.58-.55l-.33.18C55.36,41.42,55,41.43,54.93,41.6Z"/><path class="cls-1" d="M54.8,40.5a.33.33,0,0,0,.45-.31c0-.11-.25-.2-.4-.28a.14.14,0,0,0-.22.05A.45.45,0,0,0,54.8,40.5Z"/><path class="cls-1" d="M56.34,36.18a.36.36,0,0,0-.36-.26.32.32,0,0,0-.14.54A.33.33,0,0,0,56.34,36.18Z"/><path class="cls-1" d="M54.2,46.47l.1-.17a1,1,0,0,0-.43.3.59.59,0,0,0-.06.69Z"/><path class="cls-1" d="M56.87,39c.07-.09,0-.23-.06-.25s-.16-.11-.25,0a.14.14,0,0,0,0,.21C56.64,39,56.8,39.07,56.87,39Z"/><path class="cls-1" d="M55.08,43.77c.08-.17-.26-.68-.48-.67s-.31.52-.13.68S55,43.93,55.08,43.77Z"/><path class="cls-1" d="M58.91,31.58a.44.44,0,0,0,0-.54.53.53,0,0,0-.67,0,.59.59,0,0,0,0,.72C58.34,31.91,58.68,31.83,58.91,31.58Z"/><path class="cls-1" d="M61.24,29.65c0-.24,0-.47-.23-.56a.32.32,0,0,0-.42.17.45.45,0,0,0,0,.36C60.76,29.86,61,29.8,61.24,29.65Z"/><path class="cls-1" d="M60.46,33.57a.65.65,0,0,0-.06-.81.59.59,0,0,0-.75.1c-.19.21-.14.44.14.67S60.34,33.71,60.46,33.57Z"/><path class="cls-1" d="M57.47,40.76a.33.33,0,0,0,0-.47.29.29,0,0,0-.43.07.27.27,0,0,0,0,.39A.28.28,0,0,0,57.47,40.76Z"/><path class="cls-1" d="M61.84,35.46l.45-.51A.78.78,0,0,0,62,34.5a.37.37,0,0,0-.51.12.52.52,0,0,0,0,.74A.67.67,0,0,0,61.84,35.46Z"/><path class="cls-1" d="M57.47,35.79c0,.07,0,.15-.07.23a.74.74,0,0,0,.28.77.87.87,0,0,0,.84,0,.44.44,0,0,0,.19-.27.68.68,0,0,0-.48-.83L58,35.6a4.28,4.28,0,0,0,.14-.43c.07-.27,0-.39-.25-.5a.55.55,0,0,0-.63.13.48.48,0,0,0-.07.59A2.43,2.43,0,0,0,57.47,35.79Z"/><path class="cls-1" d="M51.91,83.2a.29.29,0,0,0,.33-.27.33.33,0,0,0-.33-.34.3.3,0,0,0-.28.33A.27.27,0,0,0,51.91,83.2Z"/><path class="cls-1" d="M54.58,89.62a.83.83,0,0,0-.74-.72c-.37,0-.64.34-.65.82a.61.61,0,0,0,.61.63A.8.8,0,0,0,54.58,89.62Z"/><path class="cls-1" d="M54.25,85.16a2.81,2.81,0,0,0,0-.58c0-.16-.1-.22-.28-.21s-.11.09-.11.13a.84.84,0,0,1-.23.47.4.4,0,0,0,.08.34.44.44,0,0,0,.35.1C54.14,85.4,54.23,85.25,54.25,85.16Z"/><path class="cls-1" d="M53.73,87.07a.63.63,0,0,0-.62.58c0,.3.38.59.78.58a.48.48,0,0,0,.5-.54A.59.59,0,0,0,53.73,87.07Z"/><path class="cls-1" d="M52.59,86.13c.22,0,.51-.26.5-.44s-.29-.42-.62-.41-.28.14-.29.32S52.39,86.14,52.59,86.13Z"/><path class="cls-1" d="M52.7,84.44a.43.43,0,0,0,.39-.37c0-.17-.26-.44-.4-.43a.53.53,0,0,0-.41.48A.37.37,0,0,0,52.7,84.44Z"/><path class="cls-1" d="M53.32,83.24c0,.28.21.43.55.41s.42-.21.39-.55-.15-.4-.34-.4A.81.81,0,0,0,53.32,83.24Z"/><path class="cls-1" d="M52.24,93.46a.23.23,0,0,0,.32.21c.11,0,.41-.12.38-.29s-.32-.27-.44-.27S52.22,93.26,52.24,93.46Z"/><path class="cls-1" d="M88.41,130.26a1,1,0,0,0,0-.2l-.7-.29a.36.36,0,0,0,0,.36C87.94,130.37,88.18,130.3,88.41,130.26Z"/><path class="cls-1" d="M53.41,98.18c0,.11.15.19.19.25.27,0,.45-.14.39-.29a.59.59,0,0,0-.29-.31C53.56,97.77,53.37,98,53.41,98.18Z"/><path class="cls-1" d="M55.14,91.46a.33.33,0,0,0,.31-.37.31.31,0,0,0-.32-.35.36.36,0,0,0-.38.36A.39.39,0,0,0,55.14,91.46Z"/><path class="cls-1" d="M53.41,91.37c-.37,0-.65.21-.64.46a.69.69,0,0,0,.6.5.62.62,0,0,0,.43-.58A.46.46,0,0,0,53.41,91.37Z"/><path class="cls-1" d="M55,93c.26,0,.56-.17.58-.37,0-.4-.36-.55-.56-.61s-.47.34-.4.67A.37.37,0,0,0,55,93Z"/><path class="cls-1" d="M51.38,92.41c.26,0,.4-.2.34-.34a.42.42,0,0,0-.26-.23c-.15,0-.33.21-.27.37S51.34,92.37,51.38,92.41Z"/><path class="cls-1" d="M51.44,98.71c-.14-.08-.54.07-.55.26s.07.46.41.39S51.59,98.79,51.44,98.71Z"/><path class="cls-1" d="M50.72,94.45c-.2,0-.3.28-.43.4l0,.11a.32.32,0,0,0,.39.13A.42.42,0,0,0,51,95C50.93,94.81,50.92,94.47,50.72,94.45Z"/><path class="cls-1" d="M51.72,102c-.1,0-.36.09-.34.31s.27.21.36.19a.35.35,0,0,0,.24-.23A.23.23,0,0,0,51.72,102Z"/><path class="cls-1" d="M50.69,91.09a.45.45,0,0,0-.36-.5.46.46,0,0,0-.43.4c0,.18.27.36.61.36C50.55,91.3,50.68,91.2,50.69,91.09Z"/><path class="cls-1" d="M53.79,100.66c-.08-.15-.6-.14-.66.07a.38.38,0,0,0,.22.43C53.57,101.21,53.87,100.8,53.79,100.66Z"/><path class="cls-1" d="M53.67,105.59a.27.27,0,0,0-.05.28.33.33,0,0,0,.32.1c.1,0,.06-.31,0-.36A.26.26,0,0,0,53.67,105.59Z"/><path class="cls-1" d="M52.79,94.47c-.32,0-.63.28-.6.53a.64.64,0,0,0,.58.56c.21,0,.45-.33.45-.61A.44.44,0,0,0,52.79,94.47Z"/><path class="cls-1" d="M55.1,96.16c.25-.49-.28-.65,0-.89s.37.11.72-.25.24-.88-.1-1-.54.18-.61.14-.35-.3-.55-.09c-.4.43.08.69,0,.86s-.41.35-.55.58a.6.6,0,0,0,.18.91A.66.66,0,0,0,55.1,96.16Z"/><path class="cls-1" d="M50.16,83.91c-.07-.08-.32,0-.48,0a.15.15,0,0,0-.14.18.46.46,0,0,0,.48.31A.33.33,0,0,0,50.16,83.91Z"/><path class="cls-1" d="M54.58,97.32a.49.49,0,0,0-.29.23c0,.1.14.41.31.4a.35.35,0,0,0,.31-.37A.26.26,0,0,0,54.58,97.32Z"/><path class="cls-1" d="M51.61,90.92c-.18,0-.34.17-.27.32s.12.38.33.32.24-.3.25-.43S51.76,90.91,51.61,90.92Z"/><path class="cls-1" d="M51.51,98.11c.07,0,.29,0,.31-.19s-.22-.22-.3-.21-.23.05-.23.19S51.43,98.1,51.51,98.11Z"/><path class="cls-1" d="M51.86,89.88c.3,0,.54-.25.52-.47a.76.76,0,0,0-.71-.63.54.54,0,0,0-.4.54A.53.53,0,0,0,51.86,89.88Z"/><path class="cls-1" d="M49,98c-.06,0-.15.14-.13.19a.23.23,0,0,0,.18.16c.06,0,.22,0,.2-.21S49,98,49,98Z"/><path class="cls-1" d="M49.11,88.12a.19.19,0,0,0-.15.15c0,.07.12.14.2.15s.2,0,.2-.16S49.18,88.12,49.11,88.12Z"/><path class="cls-1" d="M48.38,92.64A.35.35,0,0,0,48,93c0,.22.15.35.34.34s.51-.23.49-.4S48.57,92.64,48.38,92.64Z"/><path class="cls-1" d="M48.4,88.57c0-.1-.12-.16-.18-.17s-.26.07-.26.16.19.18.25.18S48.4,88.66,48.4,88.57Z"/><path class="cls-1" d="M51.46,95.09c0-.06-.06-.06-.09-.1s-.09.06-.1.1,0,.09.07.08S51.46,95.14,51.46,95.09Z"/><path class="cls-1" d="M64.28,115.12a.5.5,0,0,0,.09.44.41.41,0,0,0,.39.06.43.43,0,0,0,.13-.65A.38.38,0,0,0,64.28,115.12Z"/><path class="cls-1" d="M62.66,111.52a.26.26,0,0,0-.27-.32.43.43,0,0,0-.33.18c-.05.09.06.42.23.44A.33.33,0,0,0,62.66,111.52Z"/><path class="cls-1" d="M63.25,109.28c.2-.12.28,0,.43,0-.28-.48-.55-1-.81-1.42a1.24,1.24,0,0,0-.27,0,.9.9,0,0,0-.6,1c.1.29.49.21.63,0s.1-.11.15-.11a.16.16,0,0,1,0,.12c-.11.14-.47.26-.65.47s-.32.69,0,.92a.65.65,0,0,0,1-.14C63.44,109.72,62.94,109.47,63.25,109.28Z"/><path class="cls-1" d="M64.67,111c-.2,0-.44.25-.46.5a.47.47,0,0,0,.47.56c.3,0,.54-.11.55-.35a.31.31,0,0,0,0-.08c-.13-.19-.27-.38-.39-.58A.44.44,0,0,0,64.67,111Z"/><path class="cls-1" d="M60,101.92c-.46-1.12-.88-2.25-1.26-3.36-.23,0-.46.23-.46.41a.69.69,0,0,0,.56.59l.11,0a.82.82,0,0,0-.11.3,1.18,1.18,0,0,0,.21.78.63.63,0,0,1,.07.3c0,.39.15.59.54.59a.39.39,0,0,0,0,.14C59.66,101.79,59.83,101.9,60,101.92Z"/><path class="cls-1" d="M68.57,116.84c0,.3.12.59.34.61a.71.71,0,0,0,.57-.36c-.21-.23-.4-.46-.6-.7A.48.48,0,0,0,68.57,116.84Z"/><path class="cls-1" d="M60.82,109.17s0,0,.09,0h0c.21,0,.51-.24.56-.52a.46.46,0,0,0-.35-.56c-.3,0-.66.17-.68.42a.68.68,0,0,0,.19.49.05.05,0,0,0,0,0C60.62,109.09,60.74,109.15,60.82,109.17Z"/><path class="cls-1" d="M62.13,115.56c.09.12.67-.16.7-.32s-.28-.33-.56-.26S62.05,115.44,62.13,115.56Z"/><path class="cls-1" d="M73.13,122.42a.35.35,0,0,0,.44-.28.37.37,0,0,0-.29-.43.45.45,0,0,0-.46.29A.36.36,0,0,0,73.13,122.42Z"/><path class="cls-1" d="M79.4,127.62a.37.37,0,0,0,0,.45c.17.11.56-.14.53-.3S79.52,127.46,79.4,127.62Z"/><path class="cls-1" d="M79.89,126.24a.51.51,0,0,0-.37.11c-.13.18,0,.32.15.45s.39-.09.39-.33C80.06,126.39,80,126.24,79.89,126.24Z"/><path class="cls-1" d="M72.54,120.31a.47.47,0,0,0-.41.4.4.4,0,0,0,.37.39.32.32,0,0,0,.23-.07.1.1,0,0,0,0,0c0,.06.16.13.24.08a.2.2,0,0,0,.06-.24.35.35,0,0,0-.17-.13,0,0,0,0,0,0,0A.37.37,0,0,0,72.54,120.31Z"/><path class="cls-1" d="M59.7,106.31c0-.09-.11-.16-.18-.17s-.26.08-.25.17.18.18.24.17S59.7,106.41,59.7,106.31Z"/><path class="cls-1" d="M69.06,118.39a.35.35,0,0,0,.27.4.34.34,0,0,0,.43-.28.39.39,0,0,0-.32-.47A.36.36,0,0,0,69.06,118.39Z"/><path class="cls-1" d="M73.8,121.8a.24.24,0,0,0-.07.4.93.93,0,0,0,.32.15.38.38,0,0,0,.09-.53C74,121.69,73.92,121.73,73.8,121.8Z"/><path class="cls-1" d="M59.11,107.69c-.2-.06-.35.22-.5.31l0,.12a.34.34,0,0,0,.36.2.45.45,0,0,0,.31-.09C59.25,108.07,59.3,107.74,59.11,107.69Z"/><path class="cls-1" d="M57.67,101.61a.21.21,0,0,0,.21-.13c0-.09-.08-.18-.15-.2s-.26,0-.28.12S57.6,101.61,57.67,101.61Z"/><path class="cls-1" d="M56.88,94.55a.66.66,0,0,0,.61.6.27.27,0,0,0,.19-.11c-.08-.32-.18-.64-.26-1A.61.61,0,0,0,56.88,94.55Z"/><path class="cls-1" d="M57.71,101.24a.44.44,0,0,0,0-.67.38.38,0,0,0-.57.27.49.49,0,0,0,.17.41A.42.42,0,0,0,57.71,101.24Z"/><path class="cls-1" d="M57.47,97.34a.73.73,0,0,0-.67-.6.56.56,0,0,0-.37.57.47.47,0,0,0,.56.47C57.3,97.75,57.5,97.57,57.47,97.34Z"/><path class="cls-1" d="M55,99.17a.47.47,0,0,0,.39.77,2.92,2.92,0,0,0,.78-.09.74.74,0,0,0,.45-.74c0-.17-.11-.29-.27-.3a2.1,2.1,0,0,0-1.21.22A.6.6,0,0,0,55,99.17Z"/><path class="cls-1" d="M61.94,113.84c.08-.08,0-.25-.06-.28a.27.27,0,0,0-.26,0c-.07.06,0,.2,0,.26A.27.27,0,0,0,61.94,113.84Z"/><path class="cls-1" d="M61.66,111.91a.62.62,0,0,0-.23-.37c-.13-.07-.36.12-.35.3s.11.21.14.27C61.49,112.16,61.69,112.06,61.66,111.91Z"/><path class="cls-1" d="M60.52,105.52a.44.44,0,0,0-.21-.27c-.15-.06-.37.15-.34.31a.76.76,0,0,0,.15.24C60.38,105.81,60.55,105.68,60.52,105.52Z"/><path class="cls-1" d="M55.09,84.12c0,.29.24.44.61.4h0c0-.35-.07-.7-.1-1a.21.21,0,0,0-.1,0C55.27,83.46,55.07,83.8,55.09,84.12Z"/><path class="cls-1" d="M60.55,105c.21,0,.3-.26.33-.39s-.11-.24-.27-.26-.35.11-.32.27S60.35,105,60.55,105Z"/><path class="cls-1" d="M61,106.19a1.26,1.26,0,0,0,.28-.2.38.38,0,0,0-.41-.35c-.17,0-.19.15-.18.29S60.82,106.25,61,106.19Z"/><path class="cls-1" d="M56,89.89a.33.33,0,0,0,.29-.38.39.39,0,0,0-.42-.33.29.29,0,0,0-.26.35A.37.37,0,0,0,56,89.89Z"/><path class="cls-1" d="M60.9,104.25a.25.25,0,0,0,.25.27c-.08-.15-.14-.31-.21-.46A.38.38,0,0,0,60.9,104.25Z"/><path class="cls-1" d="M56.53,92.85c.08.12.39.08.6,0-.12-.52-.23-1-.34-1.54-.4,0-.7.43-.54.69s.36.24.34.35S56.4,92.69,56.53,92.85Z"/><path class="cls-1" d="M55,86.25a.61.61,0,0,0,.37.52c.14,0,.41-.19.45-.37a.29.29,0,0,0-.28-.33C55.21,86,55,86.11,55,86.25Z"/><path class="cls-1" d="M58.66,101.17a.18.18,0,0,0-.17.12c0,.07.09.15.16.19s.21,0,.23-.12S58.73,101.19,58.66,101.17Z"/><path class="cls-1" d="M61.05,107.25c.12,0,.43,0,.43-.21s-.27-.34-.39-.36-.29.11-.31.3A.23.23,0,0,0,61.05,107.25Z"/><path class="cls-1" d="M81.66,128.84a.52.52,0,1,0-.55-.87c-.25.17-.38.53-.25.72A.72.72,0,0,0,81.66,128.84Z"/><path class="cls-1" d="M85.2,129.3a.64.64,0,0,0,.29-.53l-.92-.43h0a.58.58,0,0,0-.14.75A.62.62,0,0,0,85.2,129.3Z"/><path class="cls-1" d="M76.73,127.17a.38.38,0,0,0-.12.51.35.35,0,0,0,.5.15.37.37,0,0,0,.14-.5A.45.45,0,0,0,76.73,127.17Z"/><path class="cls-1" d="M80.08,125.89a.61.61,0,0,0,.32.43.69.69,0,0,0,.53.06Z"/><path class="cls-1" d="M77.55,125.74a.27.27,0,0,0-.21-.16.29.29,0,0,0-.27.13.4.4,0,0,0,0,.34l.08,0a.41.41,0,0,0,.06.24.36.36,0,0,0,.52.07.37.37,0,0,0,.11-.54A.4.4,0,0,0,77.55,125.74Z"/><path class="cls-1" d="M54.62,100c.06-.08-.06-.24-.12-.26a.23.23,0,0,0-.25,0c0,.06,0,.2.07.25S54.56,100.07,54.62,100Z"/><path class="cls-1" d="M75.58,125.91c-.16.1-.07.35,0,.46a.24.24,0,0,0,.34.16c.17-.08.28-.32.17-.43S75.73,125.8,75.58,125.91Z"/><path class="cls-1" d="M87.16,129.51l-.49-.2a.22.22,0,0,0-.11.05.35.35,0,0,0,0,.51c.12.13.24.28.4.18S87.24,129.68,87.16,129.51Z"/><path class="cls-1" d="M59.64,108.33s-.1,0-.11.08,0,.1,0,.1.13,0,.14-.07S59.67,108.38,59.64,108.33Z"/><path class="cls-1" d="M59.25,103a.51.51,0,0,0-.49.55.41.41,0,0,0,.33.38.45.45,0,0,0-.17.24c0,.18.2.4.53.46.06,0,.2-.12.23-.22a.48.48,0,0,0-.15-.5.31.31,0,0,0,.21-.32C59.73,103.34,59.43,103,59.25,103Z"/><path class="cls-1" d="M58.46,112.17c-.06.26,0,.45.33.45s.39-.51.26-.62S58.5,112,58.46,112.17Z"/><path class="cls-1" d="M60,119.17a.32.32,0,0,0-.1.27.33.33,0,0,0,.3.16c.1,0,.11-.29.08-.36A.31.31,0,0,0,60,119.17Z"/><path class="cls-1" d="M59.31,111c-.08,0-.24,0-.27.15s.1.21.18.24.3,0,.34-.13S59.38,111.05,59.31,111Z"/><path class="cls-1" d="M60.34,114.29a.4.4,0,0,0,.14.47c.21.09.58-.26.52-.42S60.44,114.1,60.34,114.29Z"/><path class="cls-1" d="M63.87,113a2.1,2.1,0,0,0-1.24,0,.85.85,0,0,0-.16.11.47.47,0,0,0,.25.82,2.9,2.9,0,0,0,.78.06.72.72,0,0,0,.57-.65C64.08,113.16,64,113,63.87,113Z"/><path class="cls-1" d="M62.26,117.77a.67.67,0,0,0-.59-.8.54.54,0,0,0-.65.43c-.06.38.26.88.58.9A.62.62,0,0,0,62.26,117.77Z"/><path class="cls-1" d="M56.73,110.89a.25.25,0,0,0-.17.16c0,.07.09.19.15.2s.23,0,.24-.17S56.8,110.9,56.73,110.89Z"/><path class="cls-1" d="M56.61,106.77a.8.8,0,0,0-.67.72.72.72,0,0,0,.67.71,1,1,0,0,0,.75-.81A.7.7,0,0,0,56.61,106.77Z"/><path class="cls-1" d="M55.15,101.06c-.26.12-.14.49,0,.59s.62-.28.63-.44S55.41,100.93,55.15,101.06Z"/><path class="cls-1" d="M64,117.68c0,.21-.05.47.25.55a.35.35,0,0,0,.44-.21.43.43,0,0,0,0-.35C64.5,117.48,64.33,117.5,64,117.68Z"/><path class="cls-1" d="M54.92,103.12a.54.54,0,0,0-.57.54c0,.39.42.82.73.78a.62.62,0,0,0,.56-.64A.67.67,0,0,0,54.92,103.12Z"/><path class="cls-1" d="M58.49,101.82a.38.38,0,0,0-.35-.39.39.39,0,0,0-.39.36.42.42,0,0,0,.39.42A.38.38,0,0,0,58.49,101.82Z"/><path class="cls-1" d="M58.74,115.24c-.1,0-.37,0-.4.24s.24.26.33.26a.32.32,0,0,0,.27-.18A.23.23,0,0,0,58.74,115.24Z"/><path class="cls-1" d="M57.13,105.48a.34.34,0,0,0-.4.33.31.31,0,0,0,.27.39c.23,0,.54-.13.55-.3S57.32,105.51,57.13,105.48Z"/><path class="cls-1" d="M57.3,103.41c.05.21,0,.47.34.49a.35.35,0,0,0,.4-.28.46.46,0,0,0-.1-.34C57.79,103.12,57.62,103.16,57.3,103.41Z"/><path class="cls-1" d="M71.09,123.3c-.06,0,0,.17,0,.24s.15.15.24.1,0-.22,0-.29A.19.19,0,0,0,71.09,123.3Z"/><path class="cls-1" d="M71.57,121.82c-.14,0-.45.06-.46.25s.22.27.33.31a.25.25,0,0,0,.35-.15C71.84,122.05,71.72,121.8,71.57,121.82Z"/><path class="cls-1" d="M75.59,123.88c-.18-.1-.37-.23-.57,0s-.32.29-.49.43a.3.3,0,0,0-.2.45.39.39,0,0,0,.53.19.94.94,0,0,1,.4-.07.56.56,0,0,0,.59-.24C76,124.46,75.78,124,75.59,123.88Z"/><path class="cls-1" d="M73.11,124.43a.89.89,0,0,0-1.19,0c-.2.23.07.53.29.56s.14,0,.22.26a.38.38,0,0,0,.56.23s.05,0,.07,0,.29-.32.27-.37l-.06-.16A.92.92,0,0,0,73.11,124.43Z"/><path class="cls-1" d="M71,124.39a.24.24,0,0,0-.21.11s0,.25.11.27.18-.15.21-.22S71.07,124.39,71,124.39Z"/><path class="cls-1" d="M74.4,124.05a.73.73,0,0,0,.71-.57c0-.22-.23-.48-.51-.5a.5.5,0,0,0-.57.48C74,123.77,74.16,124,74.4,124.05Z"/><path class="cls-1" d="M71.15,119.08a.6.6,0,0,0,.19-.06c-.28-.27-.54-.56-.81-.84a.59.59,0,0,0-.06.16s0,0,0,.07a.62.62,0,0,0-.39.07.7.7,0,0,0-.27.93,1,1,0,0,0,1.07.25A.62.62,0,0,0,71.15,119.08Z"/><path class="cls-1" d="M67.93,119.33a.38.38,0,0,0-.34-.42c-.18,0-.22.12-.24.25a.25.25,0,0,0,.26.32A1.19,1.19,0,0,0,67.93,119.33Z"/><path class="cls-1" d="M66.34,118.28a.77.77,0,0,0-.38-.67.5.5,0,0,0-.58.45c0,.23.15.44.48.5A.37.37,0,0,0,66.34,118.28Z"/><path class="cls-1" d="M65.66,120.77c-.07,0-.27,0-.28.12s.14.21.21.21.2,0,.21-.13S65.72,120.79,65.66,120.77Z"/><path class="cls-1" d="M67.51,116.4a.36.36,0,0,0-.36-.39h0a.7.7,0,0,0,.07-.37.64.64,0,0,1,.09-.5.6.6,0,0,0,.06-.55L67,114.1a.66.66,0,0,0-.33-.07h-.07a.63.63,0,0,0,.18-.22c-.16-.22-.34-.43-.5-.65-.24,0-.5.14-.53.32a.7.7,0,0,0,.45.69h.11a.56.56,0,0,0-.16.27,1.19,1.19,0,0,0,0,.81.44.44,0,0,1,0,.3.48.48,0,0,0,.43.68.27.27,0,0,0,0,.14c0,.16.18.33.4.36A.44.44,0,0,0,67.51,116.4Z"/><path class="cls-1" d="M65.14,115.89a.38.38,0,0,0-.44.28.43.43,0,0,0,.31.49.37.37,0,0,0,.41-.33A.37.37,0,0,0,65.14,115.89Z"/><path class="cls-1" d="M68.38,123a.89.89,0,0,0-.77.9c0,.31.44.29.61.15s.13-.08.34,0,.56,0,.56-.36A.76.76,0,0,0,68.38,123Z"/><path class="cls-1" d="M69.57,120.75c-.2.07-.41.13-.38.42s0,.43,0,.64a.31.31,0,0,0,.21.46.42.42,0,0,0,.49-.29,1.1,1.1,0,0,1,.2-.35.55.55,0,0,0,.2-.61C70.24,120.84,69.78,120.68,69.57,120.75Z"/><path class="cls-1" d="M67.07,120.52c-.18,0-.22.11-.24.25s.09.34.26.31a1.12,1.12,0,0,0,.31-.15A.36.36,0,0,0,67.07,120.52Z"/><path class="cls-1" d="M124.22,137.55c-.06,0-.23,0-.23.18s.19.13.26.14.15-.12.13-.15A.27.27,0,0,0,124.22,137.55Z"/><path class="cls-1" d="M122.15,137.46c-.13,0-.23.23-.2.44a.21.21,0,0,0,.27.2c.17,0,.31-.11.3-.32A.39.39,0,0,0,122.15,137.46Z"/><path class="cls-1" d="M123.87,135.36a.61.61,0,0,0-.57.7.75.75,0,0,0,.79.64.81.81,0,0,0,.61-.78C124.68,135.56,124.33,135.33,123.87,135.36Z"/><path class="cls-1" d="M122.67,134.54a.17.17,0,0,0-.27,0,.39.39,0,0,0,0,.32.51.51,0,0,0,.1.29c.11.1.25,0,.29-.16A.56.56,0,0,0,122.67,134.54Z"/><path class="cls-1" d="M126.64,132.93c-.38-.05-.75-.12-1.12-.18.14.14.24.35.5.39A.68.68,0,0,0,126.64,132.93Z"/><path class="cls-1" d="M126.87,135.77c-.29,0-.42.28-.35.64a.5.5,0,0,0,.5.37c.23,0,.6-.45.57-.64A.64.64,0,0,0,126.87,135.77Z"/><path class="cls-1" d="M124.3,133.24c-.21.17-.11.59.12.9a.68.68,0,0,0,.87,0,.69.69,0,0,0-.15-.94A.68.68,0,0,0,124.3,133.24Z"/><path class="cls-1" d="M122.12,136.22a.41.41,0,0,0,.18-.32.3.3,0,0,0-.34-.32.33.33,0,0,0-.29.33C121.66,136.06,122,136.3,122.12,136.22Z"/><path class="cls-1" d="M126.86,134.27c0-.24.15-.46-.1-.6a.37.37,0,0,0-.48.09.3.3,0,0,0,0,.4C126.39,134.39,126.61,134.35,126.86,134.27Z"/><path class="cls-1" d="M127.2,133a.67.67,0,0,0,0,.2c0,.32.17.46.4.43s.52-.25.48-.51h0Z"/><path class="cls-1" d="M119.07,137.61a.6.6,0,0,0-.5-.4.39.39,0,0,0-.29.45.37.37,0,0,0,.45.28C119,137.91,119.11,137.77,119.07,137.61Z"/><path class="cls-1" d="M118.77,135.48c.19,0,.37-.41.33-.7a.44.44,0,0,0-.48-.32.51.51,0,0,0-.44.5A.67.67,0,0,0,118.77,135.48Z"/><path class="cls-1" d="M117.34,131.51a.71.71,0,0,0-.47.66.64.64,0,0,0,.6.41.47.47,0,0,0,.39-.42C117.82,131.76,117.59,131.48,117.34,131.51Z"/><path class="cls-1" d="M120.7,135.15a.26.26,0,0,0-.24.34c.05.11.11.24.23.26s.35-.25.31-.43S120.83,135.14,120.7,135.15Z"/><path class="cls-1" d="M120.89,132.07a.38.38,0,0,0-.43-.15.43.43,0,0,0-.32.43c.06.29.31.33.53.39C121,132.43,121,132.26,120.89,132.07Z"/><path class="cls-1" d="M119.69,137.33c-.09,0-.14.17-.13.22s.06.24.15.22a.26.26,0,0,0,.17-.2C119.88,137.51,119.78,137.31,119.69,137.33Z"/><path class="cls-1" d="M119.41,131.92c.27,0,.42-.18.45-.35l-.73-.18a.45.45,0,0,0,0,.2C119.18,131.76,119.23,131.94,119.41,131.92Z"/><path class="cls-1" d="M119.87,133.09a.52.52,0,0,0-.44,0c-.25.15-.09.36,0,.59.28,0,.52,0,.59-.27A.35.35,0,0,0,119.87,133.09Z"/><path class="cls-1" d="M130.54,134.65a.21.21,0,0,0-.2.06c0,.07,0,.18.1.23s.2.05.25,0S130.61,134.69,130.54,134.65Z"/><path class="cls-1" d="M138.53,136.68a.49.49,0,0,0-.69.26c-.13.29-.07.59.16.68a.71.71,0,0,0,.85-.3C139,137.12,138.79,136.79,138.53,136.68Z"/><path class="cls-1" d="M137.83,135.55a.38.38,0,0,0-.13-.51.45.45,0,0,0-.53.13.36.36,0,0,0,.16.5A.35.35,0,0,0,137.83,135.55Z"/><path class="cls-1" d="M136.32,137.83a.27.27,0,0,0-.15-.22.38.38,0,0,0-.48.1.27.27,0,0,0,0,.39c.13.2.3.2.51.15,0,.14,0,.28.09.33s.38-.21.38-.26,0-.38-.15-.48A.16.16,0,0,0,136.32,137.83Z"/><path class="cls-1" d="M137.63,134a.36.36,0,0,0-.06-.45l-.81,0a.65.65,0,0,0,.18.15.39.39,0,0,0,.22.47A.34.34,0,0,0,137.63,134Z"/><path class="cls-1" d="M135.2,134c-.12.05-.42.22-.4.35s.35.22.48.24.27-.2.23-.36S135.37,133.92,135.2,134Z"/><path class="cls-1" d="M139.14,134.6c-.31-.15-.76,0-.81.29a.54.54,0,0,0,.26.59.42.42,0,0,0,.58-.07c.13-.13.47-.33.4-.59S139.26,134.66,139.14,134.6Z"/><path class="cls-1" d="M141.42,135.42a.85.85,0,0,0-.11-.16.48.48,0,0,0-.83.23,2.94,2.94,0,0,0-.06.78.72.72,0,0,0,.63.59c.18,0,.54-.1.48-.44C141.17,136,141.57,135.83,141.42,135.42Z"/><path class="cls-1" d="M142.26,134.09a.52.52,0,1,0-.92-.46.59.59,0,0,0,.15.74A.72.72,0,0,0,142.26,134.09Z"/><path class="cls-1" d="M140,137.94s0-.1,0-.12a.11.11,0,0,0-.15,0,.12.12,0,0,0,.07.14S140,138,140,137.94Z"/><path class="cls-1" d="M139.7,134.2a.35.35,0,0,0,.27.35c.2,0,.41-.41.3-.52S139.72,134,139.7,134.2Z"/><path class="cls-1" d="M128.73,137.17c-.12.05-.41.22-.4.37s.37.19.5.18.25-.13.2-.31S128.9,137.12,128.73,137.17Z"/><path class="cls-1" d="M135.05,133.59h-1.17c0,.08,0,.15-.07.23a.31.31,0,0,0,.05.5.42.42,0,0,0,.56-.11,1,1,0,0,1,.3-.27A.58.58,0,0,0,135.05,133.59Z"/><path class="cls-1" d="M130.09,138.85c-.09,0-.16.2-.15.26s.09.18.18.17.15-.12.15-.19S130.18,138.84,130.09,138.85Z"/><path class="cls-1" d="M128.66,135.61a.41.41,0,0,0-.33.46.34.34,0,0,0,.38.29.37.37,0,0,0,.37-.42A.41.41,0,0,0,128.66,135.61Z"/><path class="cls-1" d="M130.16,133.35l-1.08-.1a.8.8,0,0,0,.43.65C129.8,134,129.94,133.89,130.16,133.35Z"/><path class="cls-1" d="M116.29,133.77a.42.42,0,0,0-.33.47.34.34,0,0,0,.38.28.37.37,0,0,0,.37-.42A.41.41,0,0,0,116.29,133.77Z"/><path class="cls-1" d="M130,136.43a.19.19,0,0,0,.12.07.12.12,0,0,0,.09-.1c0-.05-.06-.11-.12-.1A.13.13,0,0,0,130,136.43Z"/><path class="cls-1" d="M133.13,135.52a.77.77,0,0,0-.48-.86.89.89,0,0,0-1,.6c-.05.3.33.42.54.33s.14,0,.32.11l.06,0a.66.66,0,0,0-.11.45c0,.32.31.47.67.41a.51.51,0,0,0,.46-.63A.54.54,0,0,0,133.13,135.52Z"/><path class="cls-1" d="M134.43,136.87s-.06.24,0,.29.22-.08.27-.14a.15.15,0,0,0-.05-.19A.26.26,0,0,0,134.43,136.87Z"/><path class="cls-1" d="M132.54,133.52l-1.23-.07a.71.71,0,0,0,.68.45A.76.76,0,0,0,132.54,133.52Z"/><path class="cls-1" d="M131.15,134.68a.62.62,0,0,0-.53.56.43.43,0,0,0,.43.38.52.52,0,0,0,.45-.55A.36.36,0,0,0,131.15,134.68Z"/><path class="cls-1" d="M162.93,127.71c.1-.07.25-.25.21-.33a.37.37,0,0,0-.31-.16c-.09,0-.29.22-.27.32S162.88,127.74,162.93,127.71Z"/><path class="cls-1" d="M168.18,123.32a.64.64,0,0,0,.62.52.71.71,0,0,0,.48-.67.55.55,0,0,0-.62-.34C168.3,122.89,168.15,123.05,168.18,123.32Z"/><path class="cls-1" d="M171,120.17c.19,0,.55-.47.53-.63a.39.39,0,0,0-.12-.24l-.76.7A.37.37,0,0,0,171,120.17Z"/><path class="cls-1" d="M127.29,135.35c.1-.07.26-.24.22-.32a.39.39,0,0,0-.3-.18c-.09,0-.3.21-.28.31S127.24,135.38,127.29,135.35Z"/><path class="cls-1" d="M115.08,132.78a.49.49,0,0,0,.57.47c.27,0,.51-.27.47-.47a.74.74,0,0,0-.73-.53A.45.45,0,0,0,115.08,132.78Z"/><path class="cls-1" d="M143.87,134a.31.31,0,0,0,.17.44.42.42,0,0,0,.5-.18.39.39,0,0,0-.2-.49A.36.36,0,0,0,143.87,134Z"/><path class="cls-1" d="M136.29,136.3a.37.37,0,0,0,.18-.17s-.09-.15-.13-.15-.23,0-.24.16S136.26,136.31,136.29,136.3Z"/><path class="cls-1" d="M136,134.59c-.13,0-.44-.09-.51.08s.12.33.21.41a.24.24,0,0,0,.38,0C136.22,134.9,136.2,134.63,136,134.59Z"/><path class="cls-1" d="M151.69,131.15a.25.25,0,0,0,.19.15c.06,0,.15-.12.15-.18a.31.31,0,0,0,0-.08l-.32.1Z"/><path class="cls-1" d="M142.45,139a.38.38,0,0,0-.54.15.4.4,0,0,0,.2.53.38.38,0,0,0,.53-.18A.4.4,0,0,0,142.45,139Z"/><path class="cls-1" d="M176.93,115a.59.59,0,0,0-.67-.26.46.46,0,0,0-.26.48c.11.35.39.57.62.48A.64.64,0,0,0,176.93,115Z"/><path class="cls-1" d="M177,113.69a.37.37,0,0,0,.18-.46.08.08,0,0,0,0,0c-.15.19-.31.38-.47.56A.54.54,0,0,0,177,113.69Z"/><path class="cls-1" d="M166.68,123.34l-.25.19A.33.33,0,0,0,166.68,123.34Z"/><path class="cls-1" d="M177.56,113.1c.25,0,.5-.27.47-.47a.56.56,0,0,0-.17-.34l-.58.71A.44.44,0,0,0,177.56,113.1Z"/><path class="cls-1" d="M115.4,135c-.17,0-.36.35-.29.46a.42.42,0,0,0,.36.13.22.22,0,0,0,.24-.28C115.67,135.18,115.61,135,115.4,135Z"/><path class="cls-1" d="M114.17,130.1c-.09,0-.33.12-.33.24s.25.23.35.25a.27.27,0,0,0,.27-.33A.37.37,0,0,0,114.17,130.1Z"/><path class="cls-1" d="M113.82,132.36a.29.29,0,0,0-.32.34.35.35,0,0,0,.37.36.36.36,0,0,0,.34-.35A.37.37,0,0,0,113.82,132.36Z"/><path class="cls-1" d="M115.67,130.8c0-.26-.26-.4-.6-.35s-.43.19-.41.4.39.58.6.56S115.71,131.14,115.67,130.8Z"/><path class="cls-1" d="M123.75,134.71a.32.32,0,0,0,.19-.23.41.41,0,0,0-.15-.32c-.23-.12-.34.07-.46.23C123.4,134.61,123.51,134.76,123.75,134.71Z"/><path class="cls-1" d="M122.72,133.38a1.21,1.21,0,0,1,.32-.11.54.54,0,0,0,.5-.5c0-.28-.13-.43-.54-.38a5.55,5.55,0,0,0-.68.4.34.34,0,0,0-.07.49A.34.34,0,0,0,122.72,133.38Z"/><path class="cls-1" d="M121.88,132.36a.7.7,0,0,0,.44-.21l-.87-.2a.3.3,0,0,0,0,.13A.34.34,0,0,0,121.88,132.36Z"/><path class="cls-1" d="M151.48,131.64c.1,0,.18.11.3.08s.13-.21,0-.33a.6.6,0,0,0-.39-.17l-.13,0a.18.18,0,0,0-.06.18A.43.43,0,0,0,151.48,131.64Z"/><path class="cls-1" d="M145.54,132.69h0l-.83.16s0,0,.06,0A.62.62,0,0,0,145.54,132.69Z"/><path class="cls-1" d="M171.35,121.34a.41.41,0,0,0-.48-.3.4.4,0,0,0-.27.45.41.41,0,0,0,.45.27A.36.36,0,0,0,171.35,121.34Z"/><path class="cls-1" d="M170.57,122.92a.33.33,0,0,0,.23-.42.43.43,0,0,0-.54-.26,1.18,1.18,0,0,0-.17.39C170.08,122.84,170.35,123,170.57,122.92Z"/><path class="cls-1" d="M172.58,119.48a.55.55,0,0,0-.49.66.67.67,0,1,0,1.33-.2C173.37,119.6,173,119.41,172.58,119.48Z"/><path class="cls-1" d="M173.29,117.48l-.4.39v0c0,.15.15.27.34.24s.31-.14.24-.33A.78.78,0,0,0,173.29,117.48Z"/><path class="cls-1" d="M170.31,120.43l-.06-.05-.4.37.09.15a.14.14,0,0,0,.2.08A.46.46,0,0,0,170.31,120.43Z"/><path class="cls-1" d="M149,132.79c-.07-.07-.27-.12-.33-.07a.6.6,0,0,0-.26.37c0,.28.25.27.48.34C149,133.21,149.15,133,149,132.79Z"/><path class="cls-1" d="M151.86,132.38a.33.33,0,0,0,.11.43c.12.1.5-.05.51-.19a.41.41,0,0,0-.17-.34A.3.3,0,0,0,151.86,132.38Z"/><path class="cls-1" d="M155.06,132a.3.3,0,0,0-.12-.13l.1-.12s0-.18,0-.19a.28.28,0,0,0-.24,0,.21.21,0,0,0,0,.29c-.06,0-.11.1-.1.13s.19.13.27.13S155.07,132,155.06,132Z"/><path class="cls-1" d="M152.2,136.94a.12.12,0,0,0,.06.14s.11,0,.12-.06a.11.11,0,0,0,0-.13A.12.12,0,0,0,152.2,136.94Z"/><path class="cls-1" d="M151.32,136.11a.36.36,0,0,0,.21.48.35.35,0,0,0,.48-.21c.1-.21.07-.4-.08-.47A.61.61,0,0,0,151.32,136.11Z"/><path class="cls-1" d="M151.11,133c-.17-.06-.24,0-.31.16s0,.35.14.38.27.05.35,0S151.28,133.1,151.11,133Z"/><path class="cls-1" d="M153.18,136.76s0,.26,0,.29.22-.08.26-.14,0-.19,0-.19A.27.27,0,0,0,153.18,136.76Z"/><path class="cls-1" d="M154.15,131.17c-.06,0-.08.09-.07.13s.09.07.12.06.09-.05.08-.1A.11.11,0,0,0,154.15,131.17Z"/><path class="cls-1" d="M154.82,130.34a.52.52,0,0,0-.19-.24l-.6.22v.1a.37.37,0,0,0,.46.26C154.73,130.64,154.86,130.5,154.82,130.34Z"/><path class="cls-1" d="M154,131.25a.79.79,0,0,0-.2-.84c-.36.13-.71.27-1.07.39a.59.59,0,0,0,.29.74A.76.76,0,0,0,154,131.25Z"/><path class="cls-1" d="M154,133.16a.39.39,0,0,0-.48.11c-.06.12.07.32.26.42a.2.2,0,0,0,.31-.11C154.16,133.42,154.18,133.26,154,133.16Z"/><path class="cls-1" d="M150.6,138.64a.26.26,0,0,0,.12.27.24.24,0,0,0,.23-.06.24.24,0,0,0,0-.23C150.84,138.59,150.64,138.54,150.6,138.64Z"/><path class="cls-1" d="M152,135.24c0,.09.07.22.11.24s.23.08.26,0a.25.25,0,0,0-.06-.25C152.29,135.19,152.08,135.15,152,135.24Z"/><path class="cls-1" d="M145.81,139.12a.33.33,0,0,0-.46.14.41.41,0,0,0,.14.55.41.41,0,0,0,.5-.18A.45.45,0,0,0,145.81,139.12Z"/><path class="cls-1" d="M146.28,135.66a.72.72,0,0,0-.85.31c-.1.17,0,.45.26.56a.5.5,0,0,0,.71-.21C146.52,136.07,146.46,135.74,146.28,135.66Z"/><path class="cls-1" d="M145.9,133.94a.71.71,0,0,0,.29.76.65.65,0,0,0,.68-.27.47.47,0,0,0-.14-.56C146.38,133.68,146,133.71,145.9,133.94Z"/><path class="cls-1" d="M145.15,137.21a.37.37,0,0,0-.51.12.28.28,0,0,0,.1.45.35.35,0,1,0,.41-.57Z"/><path class="cls-1" d="M149.6,134.31a.43.43,0,0,0-.53.21.5.5,0,0,0,.17.65A.68.68,0,0,0,150,135C150.07,134.8,149.86,134.44,149.6,134.31Z"/><path class="cls-1" d="M144.38,134.93c-.24-.12-.47,0-.63.3a.4.4,0,0,0,.11.56.75.75,0,0,0,.79-.18A.48.48,0,0,0,144.38,134.93Z"/><path class="cls-1" d="M143.26,135.63a.36.36,0,0,0-.3.15c-.05.08-.08.34,0,.41s.32-.08.4-.16A.26.26,0,0,0,143.26,135.63Z"/><path class="cls-1" d="M148,138c.12,0,.23-.11.31-.22a.22.22,0,0,0-.1-.36c-.16-.07-.32-.1-.43.08S147.83,138,148,138Z"/><path class="cls-1" d="M147.7,135.91a.42.42,0,0,0-.51.16.43.43,0,0,0,.2.54.34.34,0,0,0,.45-.16A.37.37,0,0,0,147.7,135.91Z"/><path class="cls-1" d="M165.88,131.08c-.09,0-.15.21-.14.27s.1.18.19.17.15-.14.15-.21S166,131.07,165.88,131.08Z"/><path class="cls-1" d="M164.31,127.91a.42.42,0,0,0-.31.48.33.33,0,0,0,.39.27.37.37,0,0,0,.35-.44A.4.4,0,0,0,164.31,127.91Z"/><path class="cls-1" d="M169,124.3c-.14,0-.17.36-.14.46s.19.15.3.15a.19.19,0,0,0,.18-.27C169.27,124.53,169.11,124.27,169,124.3Z"/><path class="cls-1" d="M164.45,129.47c-.12.05-.4.24-.38.38s.37.17.51.17a.23.23,0,0,0,.18-.33C164.71,129.54,164.61,129.4,164.45,129.47Z"/><path class="cls-1" d="M163.08,132.52c-.11,0-.38.21-.35.31s.29.22.41.24.26-.13.25-.34A.23.23,0,0,0,163.08,132.52Z"/><path class="cls-1" d="M162.92,125.94a.29.29,0,0,0,.25,0c.3,0,.48-.26.44-.5Z"/><path class="cls-1" d="M165.85,128.63a.11.11,0,0,0-.13-.09.12.12,0,0,0-.07.13s.09.07.12.06S165.86,128.68,165.85,128.63Z"/><path class="cls-1" d="M168.15,125.34c0-.38-.35-.7-.65-.67a.91.91,0,0,0-.7.82.72.72,0,0,0,.76.56A.69.69,0,0,0,168.15,125.34Z"/><path class="cls-1" d="M166.76,126.87a.63.63,0,0,0-.51.58.43.43,0,0,0,.45.37.55.55,0,0,0,.43-.57C167.1,127,167,126.86,166.76,126.87Z"/><path class="cls-1" d="M166.32,125.38a.38.38,0,0,0-.13-.48c-.06,0-.17-.08-.22-.05a4.32,4.32,0,0,0-.48.31c-.44-.12-.79,0-.87.23a.76.76,0,0,0,.47.77c.3.1.43,0,.64-.62C166,125.6,166.21,125.69,166.32,125.38Z"/><path class="cls-1" d="M162.21,126.72l.25-.06a1.32,1.32,0,0,0,0-.44l-.63.37h0a.33.33,0,0,0,.09.21s.21,0,.26,0S162.21,126.74,162.21,126.72Z"/><path class="cls-1" d="M157.34,134.59c0,.1,0,.29,0,.34a.34.34,0,0,0,.32-.07c.06-.07.08-.35,0-.4S157.36,134.53,157.34,134.59Z"/><path class="cls-1" d="M157.89,130.05c-.13,0-.22.24-.18.45a.21.21,0,0,0,.27.19c.17,0,.31-.13.29-.33A.38.38,0,0,0,157.89,130.05Z"/><path class="cls-1" d="M159,130.46a.22.22,0,0,0-.36.12c0,.11,0,.43,0,.47s.35-.11.44-.19S159.13,130.57,159,130.46Z"/><path class="cls-1" d="M157.68,132.7a.35.35,0,1,0-.68.11.3.3,0,0,0,.36.3A.36.36,0,0,0,157.68,132.7Z"/><path class="cls-1" d="M155.43,130a.26.26,0,0,0-.13.23c0,.08.08.23.16.2a.23.23,0,0,0,.16-.2C155.62,130.2,155.52,130,155.43,130Z"/><path class="cls-1" d="M159.1,133.9c-.09,0-.25.14-.25.22s.16.21.25.22.33-.15.32-.25S159.16,133.88,159.1,133.9Z"/><path class="cls-1" d="M163.26,128.49a.65.65,0,0,0-.74-.34c-.28.06-.4.3-.32.65a.52.52,0,0,0,.52.36C163,129.11,163.31,128.67,163.26,128.49Z"/><path class="cls-1" d="M155.53,135a.35.35,0,1,0-.31.62.29.29,0,0,0,.45-.12A.36.36,0,0,0,155.53,135Z"/><path class="cls-1" d="M159.52,127.88l-.06,0-.29.14a.63.63,0,0,0-.2.56.75.75,0,0,0,.82.6.78.78,0,0,0,.57-.8C160.33,128,160,127.82,159.52,127.88Z"/><path class="cls-1" d="M160,130c-.06,0-.22,0-.22.19s.19.13.27.13.13-.12.12-.15A.31.31,0,0,0,160,130Z"/><path class="cls-1" d="M190.54,38.34l-.07,0,.35.72a.62.62,0,0,0,.16-.54A.33.33,0,0,0,190.54,38.34Z"/><path class="cls-1" d="M189.52,36.57c.17.31.34.63.5,1a.6.6,0,0,0,.13-.56A.63.63,0,0,0,189.52,36.57Z"/><path class="cls-1" d="M195.63,80a.34.34,0,0,0-.34-.38.36.36,0,0,0-.38.36.45.45,0,0,0,.36.4A.36.36,0,0,0,195.63,80Z"/><path class="cls-1" d="M194.73,83a.75.75,0,0,0-.14.76c.1.19.19.39.48.31s.42-.08.63-.12a.31.31,0,0,0,.41-.28.41.41,0,0,0-.36-.44.91.91,0,0,1-.38-.14A.57.57,0,0,0,194.73,83Z"/><path class="cls-1" d="M189.94,89.92a.49.49,0,0,0,.41-.17.39.39,0,0,0-.67-.41A.38.38,0,0,0,189.94,89.92Z"/><path class="cls-1" d="M196.76,48.1a.78.78,0,0,0-.43.63.5.5,0,0,0,.67.32c.22-.06.32-.33.23-.65A.37.37,0,0,0,196.76,48.1Z"/><path class="cls-1" d="M195.39,43.54a.69.69,0,0,0-.79-.39.74.74,0,0,0-.51.56.52.52,0,0,0-.4-.17.82.82,0,0,0-.76.37c.19.49.37,1,.55,1.48h.07a.36.36,0,0,0,.25-.45.09.09,0,0,0,0-.07.68.68,0,0,0,.48-.55.43.43,0,0,0,0-.05.61.61,0,0,0,.7.12.74.74,0,0,0,.28-.14.32.32,0,0,0,.13.23.5.5,0,0,0,.67-.19.62.62,0,0,0-.06-.68A.49.49,0,0,0,195.39,43.54Z"/><path class="cls-1" d="M197.67,50a.35.35,0,0,0-.38-.3.46.46,0,0,0-.3.19c-.11.19,0,.34.31.58C197.48,50.38,197.73,50.32,197.67,50Z"/><path class="cls-1" d="M195.67,81.32c-.18,0-.41.13-.37.29s.14.42.33.41.23-.27.25-.38A.24.24,0,0,0,195.67,81.32Z"/><path class="cls-1" d="M193.48,42.68a.32.32,0,0,0,.42.23.36.36,0,0,0,.29-.44.4.4,0,0,0-.47-.27A.41.41,0,0,0,193.48,42.68Z"/><path class="cls-1" d="M194.27,40.77c.17-.14.06-.31,0-.46s-.41,0-.46.22a.31.31,0,0,0,.11.27A.49.49,0,0,0,194.27,40.77Z"/><path class="cls-1" d="M198.91,52.32a.63.63,0,0,0-.77-.36.68.68,0,0,0-.45.89.55.55,0,0,0,.68.4A.86.86,0,0,0,198.91,52.32Z"/><path class="cls-1" d="M198.63,55a.7.7,0,0,0-1,0,.5.5,0,0,0,0,.74.64.64,0,0,0,1,.07A.65.65,0,0,0,198.63,55Z"/><path class="cls-1" d="M194.68,77a.73.73,0,0,0,.2-.84.48.48,0,0,0-.33-.26c-.12.45-.26.9-.4,1.35A3.65,3.65,0,0,0,194.68,77Z"/><path class="cls-1" d="M196.29,50.52a.54.54,0,0,0,0-.64.48.48,0,0,0-.55-.21,2.14,2.14,0,0,0-.46.17,2.12,2.12,0,0,0-.2-.12.89.89,0,0,0-.32-.08c.13.5.26,1,.37,1.5l.05-.06a.43.43,0,0,0-.09-.35.69.69,0,0,0,.11-.13l.1-.14a.36.36,0,0,0,.21,0l.2.14A.37.37,0,0,0,196.29,50.52Z"/><path class="cls-1" d="M198.25,58.9c.17-.12.21-.28.06-.4s-.31-.33-.5-.19,0,.41,0,.54S198.1,59,198.25,58.9Z"/><path class="cls-1" d="M199.24,61.26a.75.75,0,0,0,0-.9.66.66,0,0,0-1,0,.55.55,0,0,0-.11.81A.75.75,0,0,0,199.24,61.26Z"/><path class="cls-1" d="M196.87,73.83a.38.38,0,0,0-.38-.36c.13-.09.14-.24,0-.37s-.27-.18-.37,0-.24.4-.15.52.13,0,.23,0a.4.4,0,0,0-.1.26.38.38,0,0,0,.39.4A.41.41,0,0,0,196.87,73.83Z"/><path class="cls-1" d="M196.73,76.84c.16,0,.17-.24.05-.41a.22.22,0,0,0-.37,0c-.08.09-.22.37-.16.44S196.62,76.88,196.73,76.84Z"/><path class="cls-1" d="M195.67,72.38a.38.38,0,0,0,.09-.56.4.4,0,0,0-.26-.12c-.05.24-.09.48-.14.72A.35.35,0,0,0,195.67,72.38Z"/><path class="cls-1" d="M197.25,65.2a.53.53,0,0,0-.7,0,.64.64,0,0,0-.25.32s0,.06,0,.1a.38.38,0,0,0,.08.24.64.64,0,0,0,.79.14A.67.67,0,0,0,197.25,65.2Z"/><path class="cls-1" d="M198.11,63.11a.37.37,0,0,0,.06-.52.39.39,0,0,0-.59.5A.42.42,0,0,0,198.11,63.11Z"/><path class="cls-1" d="M197.3,61.73a1,1,0,0,0,.16-.81.53.53,0,0,0-.78,0c-.2.17-.19.42,0,.7S197.14,61.87,197.3,61.73Z"/><path class="cls-1" d="M191.57,36.79a.31.31,0,0,0,.18-.44.41.41,0,0,0-.48-.22.4.4,0,0,0-.2.49A.38.38,0,0,0,191.57,36.79Z"/><path class="cls-1" d="M200.69,53.33s.09-.26,0-.34-.32,0-.36.09a.29.29,0,0,0,.06.28A.34.34,0,0,0,200.69,53.33Z"/><path class="cls-1" d="M199.29,47.59c0,.06.15.22.23.2s.12-.23.1-.29-.12-.16-.21-.13S199.28,47.52,199.29,47.59Z"/><path class="cls-1" d="M201.1,61.89a.37.37,0,0,0-.11.55.64.64,0,0,0,.82.19.56.56,0,0,0,0-.71A.52.52,0,0,0,201.1,61.89Z"/><path class="cls-1" d="M200.51,54.4c-.27.1-.27.33-.18.62.23,0,.44.15.59-.09a.31.31,0,0,0-.06-.44A.42.42,0,0,0,200.51,54.4Z"/><path class="cls-1" d="M199,52.28a.43.43,0,0,0,.53.09.52.52,0,0,0,.18-.65.59.59,0,0,0-.7-.19C198.85,51.65,198.84,52,199,52.28Z"/><path class="cls-1" d="M197.33,67.64a.7.7,0,0,0-.89-.26.89.89,0,0,0-.21,1.06.72.72,0,0,0,.93.12A.71.71,0,0,0,197.33,67.64Z"/><path class="cls-1" d="M198.76,46.54c.18-.06.27-.23.17-.37a1.13,1.13,0,0,0-.28-.22.37.37,0,0,0-.21.49C198.51,46.6,198.64,46.58,198.76,46.54Z"/><path class="cls-1" d="M195.62,52.59c-.07,0-.11.11-.12.21a2.38,2.38,0,0,1,.05.26.75.75,0,0,0,.09.15c.19.21.51,0,.58-.14S195.78,52.55,195.62,52.59Z"/><path class="cls-1" d="M203.14,60.05a.2.2,0,0,0,0,.31.22.22,0,0,0,.29,0,.19.19,0,0,0,0-.26A.21.21,0,0,0,203.14,60.05Z"/><path class="cls-1" d="M195.64,45.62a.35.35,0,0,0,.23-.42.33.33,0,0,0-.44-.26.39.39,0,0,0-.28.49A.37.37,0,0,0,195.64,45.62Z"/><path class="cls-1" d="M197.85,56.49c.21-.08.13-.32.09-.4a.34.34,0,0,0-.29-.16.23.23,0,0,0-.19.32C197.5,56.35,197.65,56.57,197.85,56.49Z"/><path class="cls-1" d="M196.86,69.66a.62.62,0,0,0-.16.75.42.42,0,0,0,.57.11.55.55,0,0,0,.1-.71A.36.36,0,0,0,196.86,69.66Z"/><path class="cls-1" d="M196.21,57.05a.87.87,0,0,0,0-1,.55.55,0,0,0-.23-.17c.06.42.12.84.16,1.25Z"/><path class="cls-1" d="M195.81,54.6c0,.22.06.43.09.64a.36.36,0,0,0,.34-.33C196.24,54.75,196,54.62,195.81,54.6Z"/><path class="cls-1" d="M196.56,58.23c-.05-.07-.19-.09-.34-.09,0,.31.05.62.07.93l.1,0A.63.63,0,0,0,196.56,58.23Z"/><path class="cls-1" d="M194,45.84a.4.4,0,0,0-.28.37l.16.45a.46.46,0,0,0,.55.09c.29-.1.48-.38.4-.58A.75.75,0,0,0,194,45.84Z"/><path class="cls-1" d="M195.06,48.1a0,0,0,0,0,0,0,.41.41,0,0,0-.5-.23.31.31,0,0,0-.19.2c.11.39.24.78.34,1.18a.47.47,0,0,0,.11-.53.24.24,0,0,0,.27-.17.42.42,0,0,0,.13.07.35.35,0,0,0,.34-.29A.32.32,0,0,0,195.06,48.1Z"/><path class="cls-1" d="M191.45,85a.43.43,0,0,0-.13-.26l-.3.67C191.27,85.33,191.47,85.15,191.45,85Z"/><path class="cls-1" d="M189.68,88l.06,0a.53.53,0,0,1,.3-.07c.39,0,.6-.14.6-.53a.23.23,0,0,0,.14,0,.42.42,0,0,0,.29-.46.44.44,0,0,0-.43-.45.37.37,0,0,0-.32.42h-.07C190.07,87.31,189.87,87.68,189.68,88Z"/><path class="cls-1" d="M193.61,79.53c-.07.08-.15.25-.11.32s.25.11.33.07.21-.29.15-.37S193.66,79.49,193.61,79.53Z"/><path class="cls-1" d="M191.48,40.46c.11.23.21.47.31.7l.05,0a1.29,1.29,0,0,0,.67.14l.08.15a.67.67,0,0,0,.86.14.7.7,0,0,0,0-1,.77.77,0,0,0-.53-.18.3.3,0,0,0,0-.1c-.1-.38-.4-.44-.73-.42,0-.21,0-.46-.29-.5a.34.34,0,0,0-.39.23c-.11.28.12.39.32.51l-.11.38Z"/><path class="cls-1" d="M197.52,53.43a.6.6,0,0,0,.08-.76c-.15-.22-.38-.23-.68,0a.6.6,0,0,0-.2.65A.66.66,0,0,0,197.52,53.43Z"/><path class="cls-1" d="M196.91,71.77s.05-.09,0-.13a.12.12,0,0,0-.16,0,.13.13,0,0,0,0,.16A.17.17,0,0,0,196.91,71.77Z"/><path class="cls-1" d="M198.07,81.6s-.15.06-.14.13a.25.25,0,0,0,.15.19c.06,0,.24-.06.24-.15S198.15,81.61,198.07,81.6Z"/><path class="cls-1" d="M198.15,86.15c-.1,0-.14.17-.14.25s.08.15.15.15.13-.13.15-.2S198.26,86.15,198.15,86.15Z"/><path class="cls-1" d="M198,84.19c0-.22-.05-.55-.45-.49a.76.76,0,0,0-.54.85.89.89,0,0,0,1,.61c.29-.1.21-.49,0-.63S198,84.42,198,84.19Z"/><path class="cls-1" d="M198.16,73.76c-.08.06,0,.26,0,.31a.23.23,0,0,0,.25.05.23.23,0,0,0,0-.25C198.4,73.82,198.23,73.71,198.16,73.76Z"/><path class="cls-1" d="M197.54,66.33c-.11.09,0,.4.1.48s.25,0,.34,0a.18.18,0,0,0,0-.31C197.91,66.4,197.64,66.24,197.54,66.33Z"/><path class="cls-1" d="M198,75.29a.32.32,0,0,0,.17.24.43.43,0,0,0,.34-.06.35.35,0,0,0-.12-.5C198.31,74.91,198,75.05,198,75.29Z"/><path class="cls-1" d="M198.29,79.3c-.13.09-.33.17-.35.36s.22.21.29.19.47-.2.47-.34S198.34,79.27,198.29,79.3Z"/><path class="cls-1" d="M194.67,93.17a.28.28,0,0,0,0,.28.31.31,0,0,0,.28.06.32.32,0,0,0,.11-.32C195,93.09,194.73,93.12,194.67,93.17Z"/><path class="cls-1" d="M194.44,80.81a.36.36,0,0,0-.41-.32.38.38,0,0,0-.38.41.45.45,0,0,0,.47.33A.39.39,0,0,0,194.44,80.81Z"/><path class="cls-1" d="M193.11,86c0,.17.15.19.29.19a.24.24,0,0,0,.26-.31.88.88,0,0,0-.2-.28A.37.37,0,0,0,193.11,86Z"/><path class="cls-1" d="M196.49,89.78a.71.71,0,0,0-.63.75.81.81,0,0,0,.71.68.71.71,0,0,0,.72-.67A1.05,1.05,0,0,0,196.49,89.78Z"/><path class="cls-1" d="M195.33,86.15a.93.93,0,0,0-.2-.29.37.37,0,0,0-.35.4c0,.18.15.19.29.19S195.39,86.31,195.33,86.15Z"/><path class="cls-1" d="M197,78.44a.73.73,0,0,0-.68-.61c-.22,0-.44.31-.41.59a.49.49,0,0,0,.57.48C196.82,78.88,197.05,78.68,197,78.44Z"/><path class="cls-1" d="M195.44,87.43c-.09,0-.16.11-.17.18s.07.26.16.26.18-.19.18-.25S195.53,87.43,195.44,87.43Z"/><path class="cls-1" d="M202,59.15c-.07.06,0,.22,0,.26s.18.16.24.1a.22.22,0,0,0,0-.25C202.25,59.2,202.06,59.08,202,59.15Z"/><path class="cls-1" d="M202,68s-.17.14-.12.26.23.06.25,0a.34.34,0,0,0,.06-.24S202,68,202,68Z"/><path class="cls-1" d="M202.67,69.51a.37.37,0,0,0-.36.33.3.3,0,0,0,.17.36c.26.12.42,0,.6-.23C203,69.74,203,69.49,202.67,69.51Z"/><path class="cls-1" d="M193.26,82.83a.48.48,0,0,0-.54-.23.77.77,0,0,0-.29-.47c-.16.38-.31.76-.47,1.13l.1,0a.75.75,0,0,0,.31-.06.33.33,0,0,0,.06.26.49.49,0,0,0,.7,0A.62.62,0,0,0,193.26,82.83Z"/><path class="cls-1" d="M201.89,57.6c-.09-.08-.31-.13-.38-.07s-.1.25-.13.34c.16.22.32.19.43.1S202,57.72,201.89,57.6Z"/><path class="cls-1" d="M203.61,65.39c-.34,0-.64.4-.54.67a.55.55,0,0,0,.53.37.43.43,0,0,0,.46-.37c0-.18.23-.53,0-.71S203.74,65.37,203.61,65.39Z"/><path class="cls-1" d="M203.59,63.29a.34.34,0,0,0-.1.47.38.38,0,0,0,.49.07.32.32,0,0,0,.1-.46A.38.38,0,0,0,203.59,63.29Z"/><path class="cls-1" d="M200.32,67c-.12-.12-.28-.17-.38,0s-.25.41-.16.51.41,0,.53,0S200.44,67.08,200.32,67Z"/><path class="cls-1" d="M200,63.7a.38.38,0,0,0-.14-.48.37.37,0,0,0-.5,0,.56.56,0,0,0,0,.68A.53.53,0,0,0,200,63.7Z"/><path class="cls-1" d="M198.26,63.87a.45.45,0,0,0-.61,0,1.07,1.07,0,0,0,0,.42c.09.19.39.18.56,0A.34.34,0,0,0,198.26,63.87Z"/><path class="cls-1" d="M198.74,69.46a.62.62,0,0,0,0,.81.58.58,0,0,0,.84-.79A.61.61,0,0,0,198.74,69.46Z"/><path class="cls-1" d="M201,74.07c-.05.05,0,.18,0,.25s.16.13.24.07,0-.23,0-.29A.19.19,0,0,0,201,74.07Z"/><path class="cls-1" d="M200.57,58.15c.19.08.31,0,.41-.16a.34.34,0,0,0,0-.41c-.19-.35-.36-.4-.71-.19s-.52.3-.78.45c-.31-.45-.38-.46-.7-.11.05.29.24.37.52.33.26.63.66.65,1.12.07Z"/><path class="cls-1" d="M201.47,65.28a.4.4,0,0,0-.52-.1.38.38,0,0,0-.07.48.46.46,0,0,0,.53.11A.37.37,0,0,0,201.47,65.28Z"/><path class="cls-1" d="M190.07,35.41a.69.69,0,0,0,.32-.74.63.63,0,0,0-.67-.28.47.47,0,0,0-.29.5C189.55,35.27,189.83,35.5,190.07,35.41Z"/><path class="cls-1" d="M196.77,46.69c.07.16.2.14.32.1a.24.24,0,0,0,.17-.37,1,1,0,0,0-.27-.21A.36.36,0,0,0,196.77,46.69Z"/><path class="cls-1" d="M191.26,95.11a.23.23,0,0,0-.28.25c0,.1.09.36.31.35s.21-.28.2-.37A.33.33,0,0,0,191.26,95.11Z"/><path class="cls-1" d="M190.94,88.59a.38.38,0,0,0-.4.35.39.39,0,0,0,.36.39.42.42,0,0,0,.42-.39A.37.37,0,0,0,190.94,88.59Z"/><path class="cls-1" d="M190.29,91.32c-.16,0-.28.34-.16.6s.49.14.59,0S190.45,91.33,190.29,91.32Z"/><path class="cls-1" d="M192.89,91.46a.68.68,0,0,0-.7.72.54.54,0,0,0,.54.57c.38,0,.82-.41.79-.72A.62.62,0,0,0,192.89,91.46Z"/><path class="cls-1" d="M189.72,93.28c-.15.08-.15.59.06.66a.38.38,0,0,0,.43-.22C190.27,93.5,189.86,93.2,189.72,93.28Z"/><path class="cls-1" d="M193,89.46a.35.35,0,0,0-.28-.4.45.45,0,0,0-.33.1c-.17.15-.12.31.12.64C192.72,89.75,193,89.77,193,89.46Z"/><path class="cls-1" d="M192.69,87.36c-.22,0-.58.3-.59.48a.49.49,0,0,0,.54.5c.24,0,.41-.23.41-.56A.36.36,0,0,0,192.69,87.36Z"/><path class="cls-1" d="M192.35,84a.41.41,0,0,0-.42.39.38.38,0,0,0,.42.32.36.36,0,0,0,.35-.33A.34.34,0,0,0,192.35,84Z"/><path class="cls-1" d="M188.35,90.44c-.15.25-.29.52-.45.77a1.73,1.73,0,0,0,.21.69.46.46,0,0,0,.14.14.47.47,0,0,0,.76-.38,2.91,2.91,0,0,0-.07-.78A.68.68,0,0,0,188.35,90.44Z"/><path class="cls-1" d="M187.21,93a.63.63,0,0,0-.33.29c0,.14.18.34.35.3s.2-.15.25-.19C187.48,93.16,187.35,93,187.21,93Z"/><path class="cls-1" d="M188.79,92.55a.28.28,0,0,0,0,.25c.07.06.2,0,.25-.06s.06-.24,0-.3S188.82,92.5,188.79,92.55Z"/><path class="cls-1" d="M146.46,9.19a.5.5,0,0,0,0-.78.49.49,0,0,0-.76-.12.58.58,0,0,0-.09.83A.62.62,0,0,0,146.46,9.19Z"/><path class="cls-1" d="M162,16.48c.18,0,.21-.13.23-.26s-.11-.34-.28-.3a1.06,1.06,0,0,0-.3.16A.37.37,0,0,0,162,16.48Z"/><path class="cls-1" d="M165.52,23.85a2.15,2.15,0,0,0,1.23-.06.56.56,0,0,0,.16-.13.47.47,0,0,0-.29-.8,2.56,2.56,0,0,0-.78,0,.74.74,0,0,0-.55.67C165.29,23.68,165.35,23.82,165.52,23.85Z"/><path class="cls-1" d="M159.45,16.37c.19-.08.4-.15.36-.44s0-.43,0-.64a.32.32,0,0,0-.23-.45.42.42,0,0,0-.48.31,1,1,0,0,1-.18.36.55.55,0,0,0-.17.62A.77.77,0,0,0,159.45,16.37Z"/><path class="cls-1" d="M157.85,12.8a.26.26,0,0,0,.21-.12c0-.06,0-.25-.13-.26s-.17.15-.2.22S157.77,12.8,157.85,12.8Z"/><path class="cls-1" d="M157.6,18.28c.33.25.68.49,1,.74a.59.59,0,0,0,.07-.2.82.82,0,0,0,0-.32.33.33,0,0,0,.27,0,.48.48,0,0,0,.09-.68.61.61,0,0,0-.64-.22.51.51,0,0,0-.3.51A.83.83,0,0,0,157.6,18.28Z"/><path class="cls-1" d="M162.49,13.29s.16-.06.16-.13-.1-.15-.17-.18-.21,0-.22.14S162.42,13.28,162.49,13.29Z"/><path class="cls-1" d="M164.11,21a.39.39,0,0,0,.43-.3.43.43,0,0,0-.34-.47.36.36,0,0,0-.39.34A.37.37,0,0,0,164.11,21Z"/><path class="cls-1" d="M163.36,16.16c.06,0,.26,0,.27-.13s-.15-.2-.22-.21a.22.22,0,0,0-.21.15C163.19,16.06,163.3,16.14,163.36,16.16Z"/><path class="cls-1" d="M165.2,19.16c0-.21,0-.46-.28-.53a.35.35,0,0,0-.43.23.48.48,0,0,0,.06.35C164.67,19.39,164.84,19.36,165.2,19.16Z"/><path class="cls-1" d="M161.72,20.62a.36.36,0,0,0,.37.37h0a.69.69,0,0,0,0,.36.71.71,0,0,1-.07.48c.56.5,1.1,1,1.63,1.51a.69.69,0,0,0-.47-.57H163a.58.58,0,0,0,.15-.28,1.22,1.22,0,0,0-.09-.8.52.52,0,0,1,0-.3.47.47,0,0,0-.45-.66.37.37,0,0,0,0-.14c0-.16-.2-.32-.42-.34A.44.44,0,0,0,161.72,20.62Z"/><path class="cls-1" d="M163.2,19.33a.49.49,0,0,0,.56-.48c0-.23-.17-.43-.5-.47a.36.36,0,0,0-.46.3A.78.78,0,0,0,163.2,19.33Z"/><path class="cls-1" d="M157.41,15.39c.13,0,.43-.08.44-.27s-.23-.26-.35-.3a.24.24,0,0,0-.33.18C157.12,15.17,157.25,15.42,157.41,15.39Z"/><path class="cls-1" d="M161.52,18.1c.17,0,.21-.12.22-.25s-.1-.34-.27-.31a1.14,1.14,0,0,0-.31.17A.36.36,0,0,0,161.52,18.1Z"/><path class="cls-1" d="M149.56,12.19c.12-.08,0-.41-.07-.53a.21.21,0,0,0-.36,0c-.12.12-.2.26-.08.38S149.44,12.27,149.56,12.19Z"/><path class="cls-1" d="M147.67,12.47l.66.3a.33.33,0,0,0,0-.37.37.37,0,0,0-.54-.13A.34.34,0,0,0,147.67,12.47Z"/><path class="cls-1" d="M156.5,17a.45.45,0,0,0,.39-.43.4.4,0,0,0-.38-.37.37.37,0,0,0-.37.37A.38.38,0,0,0,156.5,17Z"/><path class="cls-1" d="M150.21,10a.2.2,0,0,0,.07-.24.2.2,0,0,0-.24-.05c-.06,0-.18.2-.13.28S150.16,10.08,150.21,10Z"/><path class="cls-1" d="M146.31,5.59a.28.28,0,0,0,.37-.14c.13-.25,0-.43-.19-.61-.23.07-.48.08-.49.37A.37.37,0,0,0,146.31,5.59Z"/><path class="cls-1" d="M147.82,11.26s0-.11,0-.14-.09-.06-.13,0a.1.1,0,1,0,.12.17Z"/><path class="cls-1" d="M149.46,13.27s0,0,0,.06l.59.28a.33.33,0,0,0,.2-.29.41.41,0,0,0-.38-.42A.38.38,0,0,0,149.46,13.27Z"/><path class="cls-1" d="M155.45,15.07s-.06,0-.06.1a.36.36,0,0,0,.31.41.44.44,0,0,0,.44-.31.35.35,0,0,0-.33-.4s-.05,0-.07,0,0-.06,0-.08-.27-.24-.36-.18-.09.31,0,.36A.41.41,0,0,0,155.45,15.07Z"/><path class="cls-1" d="M154.32,14.37a.48.48,0,0,0,.54-.5c0-.31-.15-.57-.39-.57a.71.71,0,0,0-.68.6C153.76,14.12,154,14.37,154.32,14.37Z"/><path class="cls-1" d="M150.68,7.22s.14-.16.09-.25-.23,0-.29,0a.16.16,0,0,0,0,.2C150.47,7.25,150.61,7.24,150.68,7.22Z"/><path class="cls-1" d="M155.79,12.54c.18,0,.24-.19.23-.27s-.14-.48-.28-.5-.28.33-.26.38S155.61,12.5,155.79,12.54Z"/><path class="cls-1" d="M151.46,11.91a.27.27,0,0,0,.26-.14.4.4,0,0,0,0-.34.35.35,0,0,0-.51.06C151.12,11.6,151.22,11.88,151.46,11.91Z"/><path class="cls-1" d="M152.83,12.15c.08-.06.07-.36,0-.48s-.23-.18-.41-.08a.22.22,0,0,0-.06.37C152.48,12.05,152.75,12.21,152.83,12.15Z"/><path class="cls-1" d="M160.53,14.07a.88.88,0,0,0,.73-.94c-.06-.3-.46-.27-.62-.11s-.12.08-.34,0-.56,0-.54.39A.76.76,0,0,0,160.53,14.07Z"/><path class="cls-1" d="M166.79,25.25a.26.26,0,0,0,.29.31.51.51,0,0,0,.32-.19c0-.09-.08-.42-.25-.44A.35.35,0,0,0,166.79,25.25Z"/><path class="cls-1" d="M160.08,18.7a.36.36,0,0,0-.29-.39.34.34,0,0,0-.42.3.4.4,0,0,0,.34.46A.37.37,0,0,0,160.08,18.7Z"/><path class="cls-1" d="M160.64,20.22c0-.3-.15-.59-.37-.59a.66.66,0,0,0-.51.32l.76.61A.62.62,0,0,0,160.64,20.22Z"/><path class="cls-1" d="M165,21.73a.53.53,0,0,0-.12-.43.41.41,0,0,0-.39,0,.44.44,0,0,0-.1.66A.39.39,0,0,0,165,21.73Z"/><path class="cls-1" d="M169.15,28.18a.67.67,0,0,0-.51-.64c-.21,0-.49.27-.53.55,0,0,0,.05,0,.07l.37.46C168.8,28.65,169.14,28.42,169.15,28.18Z"/><path class="cls-1" d="M167.13,21.2c-.09-.12-.66.19-.69.35s.3.32.58.23S167.21,21.31,167.13,21.2Z"/><path class="cls-1" d="M130.1,6.93s-.1,0-.1,0-.08.1-.05.14.08,0,.14,0S130.12,7,130.1,6.93Z"/><path class="cls-1" d="M121.93,6a.49.49,0,0,0-.38-.21.38.38,0,0,0-.31.24.43.43,0,0,0,.4.53A.38.38,0,0,0,121.93,6Z"/><path class="cls-1" d="M167.4,22.91c-.07.07,0,.24.08.27a.23.23,0,0,0,.25,0c.07-.06,0-.2,0-.26S167.47,22.83,167.4,22.91Z"/><path class="cls-1" d="M152.73,13.74a.13.13,0,0,0-.11-.11s-.09.07-.09.1a.12.12,0,0,0,.07.11C152.65,13.84,152.73,13.81,152.73,13.74Z"/><path class="cls-1" d="M112.56,8.76a.44.44,0,0,0,0-.57.4.4,0,0,0-.54,0,.37.37,0,0,0,0,.52.4.4,0,0,0,.39.13h0A.32.32,0,0,0,112.56,8.76Z"/><path class="cls-1" d="M142.94,10c.05,0,0-.24,0-.33a.18.18,0,0,0-.32,0c-.08.09-.25.34-.17.45S142.85,10.09,142.94,10Z"/><path class="cls-1" d="M166.33,15.92a.79.79,0,0,0,.76-.62.71.71,0,0,0-.57-.79,1,1,0,0,0-.86.7A.71.71,0,0,0,166.33,15.92Z"/><path class="cls-1" d="M146.46,11.23a.44.44,0,0,0,.15-.56.54.54,0,0,0-.7-.15.37.37,0,0,0-.19.49A.61.61,0,0,0,146.46,11.23Z"/><path class="cls-1" d="M170.17,25.58c.08,0,.24,0,.25-.16a.23.23,0,0,0-.19-.24c-.07,0-.29,0-.33.15S170.09,25.57,170.17,25.58Z"/><path class="cls-1" d="M169,22.37a.36.36,0,0,0-.17-.45c-.21-.08-.56.28-.5.44S168.88,22.57,169,22.37Z"/><path class="cls-1" d="M170,28.29s.09-.05.11-.08,0-.1-.06-.09-.12,0-.13.07S169.93,28.25,170,28.29Z"/><path class="cls-1" d="M169.08,17.49a.27.27,0,0,0,.09-.27c0-.06-.2-.19-.3-.15s-.1.3-.06.36S169,17.52,169.08,17.49Z"/><path class="cls-1" d="M167.77,24.82a.65.65,0,0,0,.25.35c.13.07.36-.13.34-.31a.77.77,0,0,0-.16-.27C167.93,24.56,167.74,24.67,167.77,24.82Z"/><path class="cls-1" d="M167.52,19.77a.54.54,0,0,0,.63-.47c0-.38-.3-.86-.62-.87a.63.63,0,0,0-.64.56A.69.69,0,0,0,167.52,19.77Z"/><path class="cls-1" d="M172.75,25.6a.25.25,0,0,0,.16-.17c0-.07-.1-.18-.16-.18a.21.21,0,0,0-.24.18C172.51,25.58,172.68,25.6,172.75,25.6Z"/><path class="cls-1" d="M167.43,27.38c.24-.3.29-.71-.06-.92a.65.65,0,0,0-.76,0C166.89,26.75,167.16,27.07,167.43,27.38Z"/><path class="cls-1" d="M170.61,28.28a.44.44,0,0,0-.31.1c.07.16,0,.49.22.54s.34-.24.49-.34l0-.12A.34.34,0,0,0,170.61,28.28Z"/><path class="cls-1" d="M170.37,24.6c.14.1.55,0,.59-.19s0-.46-.36-.44S170.24,24.5,170.37,24.6Z"/><path class="cls-1" d="M170.53,21.35c.1,0,.37,0,.38-.26s-.24-.24-.33-.24a.35.35,0,0,0-.27.2A.23.23,0,0,0,170.53,21.35Z"/><path class="cls-1" d="M120.27,6.07a.37.37,0,1,0,.6-.43.43.43,0,0,0-.57-.09A.37.37,0,0,0,120.27,6.07Z"/><path class="cls-1" d="M144.73,6c.12,0,.08-.22.05-.24a.32.32,0,0,0-.23-.08s-.09.15-.07.18S144.61,6,144.73,6Z"/><path class="cls-1" d="M117.78,8.07c-.2-.21-.51-.28-.66-.13a.39.39,0,0,0-.12.23Z"/><path class="cls-1" d="M124.7,5.27a.24.24,0,0,0,.17-.19c0-.08-.13-.15-.21-.15s-.22.1-.21.2S124.64,5.28,124.7,5.27Z"/><path class="cls-1" d="M123.41,7.06a.29.29,0,0,0,.39.08,2.11,2.11,0,0,0,.82-.93.5.5,0,0,0,0-.2.47.47,0,0,0-.78-.35,3.18,3.18,0,0,0-.56.54A.75.75,0,0,0,123.41,7.06Z"/><path class="cls-1" d="M110.52,8.31a.37.37,0,0,0,.51.07.44.44,0,0,0,.08-.54.36.36,0,0,0-.51,0A.34.34,0,0,0,110.52,8.31Z"/><path class="cls-1" d="M115.84,7.37a.33.33,0,0,0-.08.5.39.39,0,0,0,.56.08.36.36,0,0,0,0-.52A.35.35,0,0,0,115.84,7.37Z"/><path class="cls-1" d="M114.48,8.43s0,.06-.06.08l.85-.12-.09-.08a.37.37,0,0,0,.17-.21c.07-.24-.17-.51-.43-.55a.62.62,0,0,0-.6.31A.5.5,0,0,0,114.48,8.43Z"/><path class="cls-1" d="M116.9,6c.12-.13.06-.23,0-.34a.25.25,0,0,0-.41,0,1.09,1.09,0,0,0-.09.33A.37.37,0,0,0,116.9,6Z"/><path class="cls-1" d="M118.84,7.59a.36.36,0,0,0,.52,0h0a.87.87,0,0,0,.23.29l0,0,1.52-.1a1.21,1.21,0,0,0-.59-.43.57.57,0,0,1-.24-.19.48.48,0,0,0-.79-.14.19.19,0,0,0-.07-.12.41.41,0,0,0-.53.06A.43.43,0,0,0,118.84,7.59Z"/><path class="cls-1" d="M138.82,6.36c.28-.19.41-.6.26-.8a.57.57,0,0,0-.72,0,.5.5,0,0,0-.07.69C138.44,6.44,138.63,6.49,138.82,6.36Z"/><path class="cls-1" d="M138.77,9.19a.38.38,0,0,0-.12.16l.69.18a.36.36,0,0,0-.57-.34Z"/><path class="cls-1" d="M136.58,8.87l.79.16a.75.75,0,0,0,.15-1,.75.75,0,0,0-.9-.12.66.66,0,0,0-.05,1Z"/><path class="cls-1" d="M140.17,8.11a.54.54,0,0,0-.16-.66.37.37,0,0,0-.49.11.36.36,0,0,0,0,.49A.57.57,0,0,0,140.17,8.11Z"/><path class="cls-1" d="M143.42,10.77l1.26.47a.72.72,0,0,0,0-.61.69.69,0,0,0-.9-.23A.81.81,0,0,0,143.42,10.77Z"/><path class="cls-1" d="M143.72,7.94c.11-.09,0-.41,0-.54s-.3-.15-.43,0-.18.26-.05.38S143.62,8,143.72,7.94Z"/><path class="cls-1" d="M142,6.71a.46.46,0,0,0,.15-.52.36.36,0,0,0-.48-.1.41.41,0,0,0-.15.52A.4.4,0,0,0,142,6.71Z"/><path class="cls-1" d="M140.05,9.19a.44.44,0,0,0-.07.5l.38.11.11,0a.36.36,0,0,0,.06-.55A.33.33,0,0,0,140.05,9.19Z"/><path class="cls-1" d="M128.05,6.81a.59.59,0,0,0-.25.68c.1.21.45.24.75.07a.43.43,0,0,0,.13-.52A.52.52,0,0,0,128.05,6.81Z"/><path class="cls-1" d="M128.52,7.79l1,.06a.42.42,0,0,0-.08-.28.65.65,0,0,0-.81-.09A.38.38,0,0,0,128.52,7.79Z"/><path class="cls-1" d="M126.5,6.27c.14,0,.15-.35,0-.45a.65.65,0,0,0-.31-.08c-.21.17-.27.38-.13.46A.57.57,0,0,0,126.5,6.27Z"/><path class="cls-1" d="M130.93,7.1c.17-.11.06-.41.09-.58l-.1-.07a.36.36,0,0,0-.39.14.48.48,0,0,0-.14.29C130.55,7,130.76,7.21,130.93,7.1Z"/><path class="cls-1" d="M131.68,8.06h0Z"/><path class="cls-1" d="M133.89,7.08l0,0,.22.45c-.48.29-.49.35-.16.7.29,0,.38-.21.36-.5.65-.21.7-.61.15-1.11,0,0,0-.09,0-.13s0-.31-.13-.43A.36.36,0,0,0,134,6c-.26.12-.36.24-.34.43a.26.26,0,0,0-.2.07c-.18.15-.26.49-.14.61S133.74,7.2,133.89,7.08Z"/><path class="cls-1" d="M131.37,6.47c.07-.22.19-.43,0-.6a.32.32,0,0,0-.45,0,.44.44,0,0,0-.11.34C130.85,6.52,131.08,6.54,131.37,6.47Z"/><path class="cls-1" d="M134.43,5.21c-.08-.13-.24-.23-.36-.1a.42.42,0,0,0-.11.37c.06.1.25.12.34.16C134.53,5.49,134.51,5.33,134.43,5.21Z"/><path class="cls-1" d="M125.7,7.21a.26.26,0,0,0,.42,0,.5.5,0,0,0,.09-.36c0-.09-.36-.23-.49-.12A.33.33,0,0,0,125.7,7.21Z"/><path class="cls-1" d="M57,62.89h0a1.8,1.8,0,0,1,1.15,2.37A13.41,13.41,0,0,0,56.9,70.6a2.12,2.12,0,0,1-2.14,1.85h0a2,2,0,0,1-2.14-2,15.92,15.92,0,0,1,1.48-6.31A2.35,2.35,0,0,1,57,62.89Z"/><ellipse class="cls-1" cx="53.97" cy="79.3" rx="2.08" ry="1.7"/><path class="cls-1" d="M94.5,122.3h0a2.72,2.72,0,0,1,3.11-.16,21.07,21.07,0,0,0,5.8,2.62A1.86,1.86,0,0,1,104.9,127h0c-.31.93-1.68,1.45-3,1a24.75,24.75,0,0,1-6.87-3.1C93.9,124.24,93.7,123,94.5,122.3Z"/><ellipse class="cls-1" cx="112.61" cy="129.73" rx="2.08" ry="1.7"/><path class="cls-1" d="M171.93,108.66h0a1.71,1.71,0,0,1,.77-2.47,18.73,18.73,0,0,0,4.84-3.72,2.68,2.68,0,0,1,3.06-.47h0a1.62,1.62,0,0,1,.28,2.66,21.85,21.85,0,0,1-5.72,4.4A2.54,2.54,0,0,1,171.93,108.66Z"/><ellipse class="cls-1" cx="186.15" cy="96.84" rx="2.08" ry="1.7"/><path class="cls-1" d="M181.72,44.92h0a2.38,2.38,0,0,1-2.63-1.36,15,15,0,0,0-2.82-4.92,1.68,1.68,0,0,1,.4-2.53h0a2.53,2.53,0,0,1,3.18.6,17.64,17.64,0,0,1,3.33,5.82A1.78,1.78,0,0,1,181.72,44.92Z"/><ellipse class="cls-1" cx="172.4" cy="30.19" rx="2.08" ry="1.7"/><path class="cls-2" d="M185,50.16c-.75-1.6-3.26-2.48-3.91.38a50,50,0,0,1-2.73,9.86c-2.77,6.48-9.49,4.55-8.77-4.63a2.44,2.44,0,0,0,0-.28c1.55-14.35-10.23-30.15-26.93-36.31s-26-5.82-27.92-5.72c-2.08.11-3.85,1.82-.71,3.17a79.21,79.21,0,0,1,10.69,5.05c6.39,3.89,4.34,8.18-3.6,6.57-16-4.49-37-1.08-47.43,8.93s-14.82,18.54-15.29,20,.91,3.56,3.46,1.54A69.85,69.85,0,0,1,71.07,52c6-3.49,11,1.23,6.41,6.49a30.72,30.72,0,0,0-2.33,2.07l-.2.15a.39.39,0,0,0-.19.23c-10.83,10.91-13.69,28.17-4.93,40.37s16.92,17.37,18.51,18.2c1.76.92,4.42.4,2.86-2.22a55,55,0,0,1-5-9.24C84,102.19,89.8,99.49,95,105c8.49,12.21,28.44,19.6,44.79,16.39s25.48-7.58,26.95-8.56c1.62-1.07,1.86-3.31-1.66-2.92a86.84,86.84,0,0,1-12.28,1c-7.56-.13-7.62-5.46.41-7.68.87-.16,1.73-.34,2.59-.55l.32,0a.82.82,0,0,0,.3-.11c15.47-4,29-16.4,30.2-28.73S185.71,51.6,185,50.16ZM159.52,71.77l0,0,9.62.73Z"/><path class="cls-1" d="M107.68,14.09h0a2.25,2.25,0,0,1-2.39,1.63,23.75,23.75,0,0,0-6.58.67A2.48,2.48,0,0,1,95.9,15.3h0c-.42-.91.32-2,1.68-2.29a27.79,27.79,0,0,1,7.78-.8C106.78,12.23,107.81,13.12,107.68,14.09Z"/><ellipse class="cls-1" cx="87.71" cy="16.8" rx="2.08" ry="1.7"/><path class="cls-3" d="M127.18,44l8.18-1.47c8.8-1.58,17.32,3.49,18.21,10.85l.82,6.82a10.82,10.82,0,0,0,2,5l4.23,5.92c4.56,6.37,1.31,14.58-7,17.54L146,91.41a15.11,15.11,0,0,0-5.22,3.11l-5.56,5.12c-6,5.53-16.52,5.53-22.51,0l-5.56-5.12a15,15,0,0,0-5.22-3.11l-7.67-2.75c-8.26-3-11.51-11.17-7-17.54l4.23-5.92a10.94,10.94,0,0,0,2-5l.81-6.82c.89-7.36,9.41-12.43,18.22-10.85L120.73,44A17.93,17.93,0,0,0,127.18,44Z"/><path class="cls-3" d="M141.48,98.29c.09-.06.07-.31.08-.48a.14.14,0,0,0-.13-.18A.44.44,0,0,0,141,98,.33.33,0,0,0,141.48,98.29Z"/><path class="cls-3" d="M141.18,99.49a.73.73,0,0,0,.71-.56c0-.2-.18-.42-.42-.45a.5.5,0,0,0-.62.42C140.82,99.17,141,99.46,141.18,99.49Z"/><path class="cls-3" d="M136.31,98.63l-.31.28A.7.7,0,0,0,136.31,98.63Z"/><path class="cls-3" d="M123.66,103.77l-.47,0A.69.69,0,0,0,123.66,103.77Z"/><path class="cls-3" d="M134.27,100.56a.23.23,0,0,0,0-.13,2.31,2.31,0,0,1-.24.2l.05,0A.31.31,0,0,0,134.27,100.56Z"/><path class="cls-3" d="M134.18,102.39a.33.33,0,0,0,.3.38.39.39,0,0,0,.43-.31c0-.2-.09-.3-.28-.34A.38.38,0,0,0,134.18,102.39Z"/><path class="cls-3" d="M162.65,56.92a.42.42,0,0,0,.44-.31.44.44,0,0,0-.36-.45.34.34,0,0,0-.38.29A.37.37,0,0,0,162.65,56.92Z"/><path class="cls-3" d="M165.37,57.72a.74.74,0,0,0-.88.18c-.19.26-.12.42.38.82-.13.2-.29.4,0,.61a.38.38,0,0,0,.49,0,.27.27,0,0,0,.12-.2,4.45,4.45,0,0,0-.14-.55C165.56,58.24,165.6,57.87,165.37,57.72Z"/><path class="cls-3" d="M121.75,103.76l0,0a.72.72,0,0,0,1-.06c-.39,0-.78-.07-1.17-.12A.38.38,0,0,0,121.75,103.76Z"/><path class="cls-3" d="M162.81,59.49a.36.36,0,0,0,.47-.23.61.61,0,0,0-.39-.66.43.43,0,0,0-.49.3A.54.54,0,0,0,162.81,59.49Z"/><path class="cls-3" d="M163.29,61.54c.16.05.36-.26.3-.54s-.43-.26-.56-.19S163.14,61.49,163.29,61.54Z"/><path class="cls-3" d="M163.13,57.35a.33.33,0,0,0,.16.28.23.23,0,0,0,.33-.17c0-.11,0-.38-.21-.42S163.14,57.26,163.13,57.35Z"/><path class="cls-3" d="M145.87,98.22a.5.5,0,0,0,.87-.35,3.42,3.42,0,0,0-.17-.77.76.76,0,0,0-.79-.36c-.17.05-.48.26-.32.57C145.94,97.64,145.6,97.88,145.87,98.22Z"/><path class="cls-3" d="M162.91,54.33a.52.52,0,0,0-.5.37c0,.24.27.72.46.73s.51-.27.55-.59S163.28,54.37,162.91,54.33Z"/><path class="cls-3" d="M163.1,77.42c.09-.35-.08-.6-.46-.72a9.61,9.61,0,0,1,0,1.2A.72.72,0,0,0,163.1,77.42Z"/><path class="cls-3" d="M88,53.66c-.1-.13-.54-.06-.57.14a.33.33,0,0,0,.25.36C87.87,54.19,88.1,53.78,88,53.66Z"/><path class="cls-3" d="M119.26,103.71a.33.33,0,0,0,.19.26.48.48,0,0,0,.44-.1.5.5,0,0,0,.32.11c.21,0,.29-.16.37-.32l.1-.18c-.3,0-.6-.12-.89-.19,0,0,0,0,0,0a.38.38,0,0,0-.52.21.09.09,0,0,0,0,0,.25.25,0,0,0-.2-.17c-.18,0-.35.06-.34.23a1,1,0,0,0,.13.33A.37.37,0,0,0,119.26,103.71Z"/><path class="cls-3" d="M90.15,89.75a1.26,1.26,0,0,0,.29.27c.16.07.28,0,.32-.2s0-.3-.14-.36A.41.41,0,0,0,90.15,89.75Z"/><path class="cls-3" d="M88.41,90.68a.73.73,0,0,0,.94-.21.41.41,0,0,0,.17.2.32.32,0,0,0,.45-.15.37.37,0,0,0-.17-.46.31.31,0,0,0-.39.07.81.81,0,0,0-.43-.67.66.66,0,0,0-.83.29A.63.63,0,0,0,88.41,90.68Z"/><path class="cls-3" d="M89.79,86.23a.18.18,0,0,0-.13.2.27.27,0,0,0,.23.18c.09,0,.13-.15.12-.24h0l-.14-.11S89.82,86.22,89.79,86.23Z"/><path class="cls-3" d="M85.21,76.58a.5.5,0,0,0,0,.17s0,0,.06.08c0-.14,0-.28,0-.42a.54.54,0,0,0,0,.11Z"/><path class="cls-3" d="M88.31,87.48a.82.82,0,0,0,.71-.41c0-.26-.1-.47-.41-.56s-.46,0-.55.38S88.08,87.43,88.31,87.48Z"/><path class="cls-3" d="M84.83,78.72a1.18,1.18,0,0,0,.41.4l.15,0a12.36,12.36,0,0,1-.14-1.35h0l0,0c0-.15,0-.31,0-.46a.4.4,0,0,0-.15-.14A15.24,15.24,0,0,0,84.83,78.72Z"/><path class="cls-3" d="M92.14,88.24a.22.22,0,0,0,.14.24c0,.13,0,.24.12.37s.36.41.59.21.11-.38.05-.44-.08-.26,0-.21.17,0,.25-.14c-.29-.13-.58-.25-.86-.39a.48.48,0,0,0-.06.21A.2.2,0,0,0,92.14,88.24Z"/><path class="cls-3" d="M89,85.71a.29.29,0,0,0,.15,0c-.21-.2-.41-.41-.61-.61a.05.05,0,0,0,0,0A.65.65,0,0,0,89,85.71Z"/><path class="cls-3" d="M90.66,87.89a.14.14,0,0,0-.09-.21c-.1,0-.16,0-.2.09a.13.13,0,0,0,.08.2C90.56,88,90.62,88,90.66,87.89Z"/><path class="cls-3" d="M96.64,96.57a.52.52,0,0,0,.62-.26.6.6,0,0,0-.29-.67c-.21-.08-.49.14-.59.46A.42.42,0,0,0,96.64,96.57Z"/><path class="cls-3" d="M95.41,94c0-.07-.1-.16-.16-.19s-.21,0-.23.11.14.18.21.2S95.4,94.05,95.41,94Z"/><path class="cls-3" d="M97.54,100.14c0-.21.06-.47-.24-.55a.33.33,0,0,0-.44.2.43.43,0,0,0,0,.35C97,100.32,97.17,100.31,97.54,100.14Z"/><path class="cls-3" d="M93,89.65s.18,0,.19-.07a.3.3,0,0,0-.06-.23.21.21,0,0,0-.29.05C92.79,89.53,93,89.61,93,89.65Z"/><path class="cls-3" d="M94.56,90.05c.15-.11.13-.23-.1-.54a.32.32,0,0,0-.33.45A.33.33,0,0,0,94.56,90.05Z"/><path class="cls-3" d="M92.67,92.23a.48.48,0,0,0,.19-.34c0-.27-.28-.33-.54-.32-.14.17-.27.35-.12.56A.32.32,0,0,0,92.67,92.23Z"/><path class="cls-3" d="M93.37,93.49a.59.59,0,1,0,.27-1.13.46.46,0,0,0-.54.37C93,93,93.16,93.43,93.37,93.49Z"/><path class="cls-3" d="M165.29,65.2a.52.52,0,0,0-.33.58.36.36,0,0,0,.42.26.35.35,0,0,0,.36-.33C165.77,65.41,165.41,65.2,165.29,65.2Z"/><path class="cls-3" d="M159.23,67.72a.35.35,0,0,0,.25.46.41.41,0,0,0,.5-.28.37.37,0,0,0-.33-.41A.36.36,0,0,0,159.23,67.72Z"/><path class="cls-3" d="M161.9,57.84s.13,0,.13-.09-.06-.11-.1-.12-.09.07-.1.1A.12.12,0,0,0,161.9,57.84Z"/><path class="cls-3" d="M160.73,63.12c.19-.11.19-.28,0-.66-.21,0-.46-.08-.57.21a.36.36,0,0,0,.18.46A.47.47,0,0,0,160.73,63.12Z"/><path class="cls-3" d="M161.25,56.46c.16,0,.32,0,.31-.22s-.09-.45-.24-.48-.28.3-.32.43S161.06,56.46,161.25,56.46Z"/><path class="cls-3" d="M160.81,60.76h.11a.48.48,0,0,0,.46.45.6.6,0,0,0,.64-.54.56.56,0,0,0-.35-.54.53.53,0,0,0-.38-.59.85.85,0,0,0-.95.51A.62.62,0,0,0,160.81,60.76Z"/><path class="cls-3" d="M160,64.78a.75.75,0,0,0,.69-.31.47.47,0,0,0-.19-.52s.1,0,.1-.07,0-.23-.08-.27-.21.11-.21.14a.33.33,0,0,0,0,.13l-.06,0c-.23-.07-.45.12-.54.44A.36.36,0,0,0,160,64.78Z"/><path class="cls-3" d="M147,44.37a14.18,14.18,0,0,1,1.45.91c.09-.07.17-.13.22-.12s.3.6.75.64a.68.68,0,0,0,.45-.12,21.94,21.94,0,0,0-1.83-2h0a.36.36,0,0,0-.14,0,.22.22,0,0,0-.18,0A1.2,1.2,0,0,0,147,44.37Z"/><path class="cls-3" d="M150.33,46.32h.08l-.42-.55A.44.44,0,0,0,150.33,46.32Z"/><path class="cls-3" d="M145.84,43.72v0q.32.14.63.3s0,0,0,0a.42.42,0,0,0,0-.63,1.23,1.23,0,0,1,.41.1.43.43,0,0,0,.35-.09,2.82,2.82,0,0,1,.36-.24l-.67-.59-.07.06-.25-.14a.33.33,0,0,0-.21-.05.23.23,0,0,0,.19-.15l-.43-.35a.63.63,0,0,0-.12.23c0,.17.09.27.26.27h.06a.4.4,0,0,0-.2.09.54.54,0,0,0-.12.56.33.33,0,0,0,.19.26A.51.51,0,0,0,145.84,43.72Z"/><path class="cls-3" d="M145,41.65a.31.31,0,0,0,.44-.18s0,0,0,0l-.54-.38a.37.37,0,0,0-.1.16A.32.32,0,0,0,145,41.65Z"/><path class="cls-3" d="M152.08,49.11l0,0c-.17-.33-.35-.67-.55-1l-.22,0A13.06,13.06,0,0,1,152.08,49.11Z"/><path class="cls-3" d="M165.4,53.77a.67.67,0,0,0,.51.24l-.21-1.07h0A.68.68,0,0,0,165.4,53.77Z"/><path class="cls-3" d="M165.26,56.14a.47.47,0,0,0,.36.6.83.83,0,0,0,.57-.47c0-.21-.1-.35-.39-.4S165.3,55.91,165.26,56.14Z"/><path class="cls-3" d="M164,59.23c-.1.19.17.53.33.54a.76.76,0,0,0-.49.51.7.7,0,0,0,1.33.39.9.9,0,0,0-.56-.92.74.74,0,0,0-.21,0c.15-.09.25-.52.08-.63A.39.39,0,0,0,164,59.23Z"/><path class="cls-3" d="M165.48,52.39h.1c0-.17-.07-.34-.11-.51a.27.27,0,0,0-.16.25A.31.31,0,0,0,165.48,52.39Z"/><path class="cls-3" d="M165.22,50.83a.18.18,0,0,0,.05.23C165.25,51,165.24,50.91,165.22,50.83Z"/><path class="cls-3" d="M164,55.07c-.11,0-.3.24-.29.3s.15.32.25.3a.36.36,0,0,0,.25-.24C164.23,55.34,164.1,55.08,164,55.07Z"/><path class="cls-3" d="M161.7,63.59a.4.4,0,0,0,.76.2.44.44,0,0,0,0-.23l.08,0a.26.26,0,0,0,.26-.1.45.45,0,0,0,.61.13.39.39,0,0,0-.11-.63.57.57,0,0,0-.44.06.44.44,0,0,0-.06.12c0-.14-.1-.28-.19-.29s-.3.27-.36.39a.16.16,0,0,0,0,.07h0A.44.44,0,0,0,161.7,63.59Z"/><path class="cls-3" d="M87.33,59.76a.32.32,0,0,0-.3,0c-.15.12,0,.3.06.34s.46.2.57.11,0,0,0-.09l.07,0a.33.33,0,0,0-.07-.5.3.3,0,0,0-.29,0A.35.35,0,0,0,87.33,59.76Z"/><path class="cls-3" d="M166.5,62.36c.06-.36-.05-.56-.32-.61a.66.66,0,0,0-.58.23,1.21,1.21,0,0,0,0-.46.5.5,0,0,0-.1-.17.47.47,0,0,0-.84.18,3.15,3.15,0,0,0-.09.42.46.46,0,0,0-.14.2.19.19,0,0,0,.14.25.77.77,0,0,0,.57.53c.17,0,.32,0,.37-.18l.09-.33a.67.67,0,0,0,.43.41C166.19,62.87,166.46,62.63,166.5,62.36Z"/><path class="cls-3" d="M166.46,58c0-.21,0-.42-.06-.63-.09,0-.16.12-.17.31A.32.32,0,0,0,166.46,58Z"/><path class="cls-3" d="M165.47,55.32a.38.38,0,0,0,.05-.49.3.3,0,0,0-.37-.15c-.27.09-.29.31-.29.58C165.09,55.36,165.27,55.53,165.47,55.32Z"/><path class="cls-3" d="M162.14,51.75s.07.17.1.17a.32.32,0,0,0,.22-.12.22.22,0,0,0-.11-.27C162.2,51.49,162.16,51.68,162.14,51.75Z"/><path class="cls-3" d="M163.12,46s.13,0,.13-.09-.06-.11-.1-.12a.17.17,0,0,0-.1.1S163.07,46,163.12,46Z"/><path class="cls-3" d="M162.7,50.1a.38.38,0,0,0,.41-.25c0-.14-.15-.29-.36-.32s-.26,0-.27.2S162.5,50.06,162.7,50.1Z"/><path class="cls-3" d="M162.16,46.54a.32.32,0,0,0,.22-.12c0-.05,0-.25-.11-.26s-.19.14-.21.21S162.13,46.54,162.16,46.54Z"/><path class="cls-3" d="M163.64,47.63c.06,0,.28,0,.28-.11a.25.25,0,0,0-.18-.19c-.08,0-.24,0-.24.08A.24.24,0,0,0,163.64,47.63Z"/><path class="cls-3" d="M163.82,46.84a.39.39,0,0,0,.2-.05c-.07-.23-.15-.45-.22-.67a.38.38,0,0,0-.2.3C163.57,46.66,163.66,46.83,163.82,46.84Z"/><path class="cls-3" d="M163.88,52.72c.36.08.68-.19.77-.64a.61.61,0,0,0-.51-.75.78.78,0,0,0-.84.58A.82.82,0,0,0,163.88,52.72Z"/><path class="cls-3" d="M164.57,50.42a.3.3,0,0,0,.4-.24.32.32,0,0,0-.23-.37c-.15-.05-.47.2-.43.34A.41.41,0,0,0,164.57,50.42Z"/><path class="cls-3" d="M95.18,95.23c.08-.26-.06-.45-.4-.55s-.58.07-.63.25a.65.65,0,0,0,.38.71A.6.6,0,0,0,95.18,95.23Z"/><path class="cls-3" d="M96.56,92.49a.5.5,0,0,0-.18-.57,4.23,4.23,0,0,0-.42-.25,2,2,0,0,0,0-.24.75.75,0,0,0-.58-.59.86.86,0,0,0-.75.37.45.45,0,0,0-.07.32.69.69,0,0,0,.78.56l.25,0a3.14,3.14,0,0,0,0,.45c.05.27.16.36.43.35A.55.55,0,0,0,96.56,92.49Z"/><path class="cls-3" d="M95.76,96.81c0,.09.09.19.15.2s.26,0,.28-.1-.14-.22-.21-.23S95.78,96.72,95.76,96.81Z"/><path class="cls-3" d="M126.88,104.32a.75.75,0,0,0,.66-.29.35.35,0,0,0,.41.15c.17-.08.17-.21,0-.55a.27.27,0,0,0-.25,0,.63.63,0,0,0,0-.27c-.43.09-.87.17-1.31.22A.84.84,0,0,0,126.88,104.32Z"/><path class="cls-3" d="M133.18,101.54a.32.32,0,0,0,.42-.22.41.41,0,0,0-.09-.36l-.57.38A.33.33,0,0,0,133.18,101.54Z"/><path class="cls-3" d="M136.24,100.6a.37.37,0,0,0-.35-.39.4.4,0,0,0-.19,0,.85.85,0,0,0-.59-.52c-.26.24-.53.46-.81.68a.8.8,0,0,0,.52.68.78.78,0,0,0,.7-.26.25.25,0,0,0,.2.16A.62.62,0,0,0,136.24,100.6Z"/><path class="cls-3" d="M129.66,102.86l-.37.11A.5.5,0,0,0,129.66,102.86Z"/><path class="cls-3" d="M135,104c0-.13-.16-.29-.37-.32a.21.21,0,0,0-.27.2.81.81,0,0,0,0,.16.31.31,0,0,0-.28.23.31.31,0,0,0,.23.41.36.36,0,0,0,.47-.23.28.28,0,0,0,0-.22A.4.4,0,0,0,135,104Z"/><path class="cls-3" d="M129.65,103.56c-.07.21,0,.34.19.35s.33,0,.37-.14-.1-.31-.2-.4S129.69,103.4,129.65,103.56Z"/><path class="cls-3" d="M143.65,43a16.35,16.35,0,0,1,1.58.55c.72-.17.71-.74.51-1.22a.77.77,0,0,0-.33-.38.8.8,0,0,0-.68,0c-.25.08-.5,0-.7.13A1.18,1.18,0,0,0,143.65,43Z"/><path class="cls-3" d="M85.76,61.52c.07-.06,0-.23-.05-.29a.15.15,0,0,0-.2,0,.23.23,0,0,0,0,.24S85.69,61.59,85.76,61.52Z"/><path class="cls-3" d="M86.53,82.51a.34.34,0,0,0,.19.44.65.65,0,0,0,.22.08c-.14-.22-.29-.44-.41-.66A.65.65,0,0,1,86.53,82.51Z"/><path class="cls-3" d="M86.55,57.49a.49.49,0,0,0,0,.74c.23.22.54.25.69.06a.68.68,0,0,0,.1-.69.14.14,0,0,0,.1-.05s0-.1,0-.13a.12.12,0,0,0-.15,0h0a.56.56,0,0,1,0-.08A.53.53,0,0,0,86.55,57.49Z"/><path class="cls-3" d="M87.69,87.12a.42.42,0,0,0,.1-.79.57.57,0,0,0-.6.33A.54.54,0,0,0,87.69,87.12Z"/><path class="cls-3" d="M87,85.76c.15,0,.38-.24.4-.43a.26.26,0,0,0,0-.12.37.37,0,0,0,.38-.22.42.42,0,0,0-.26-.51.41.41,0,0,0-.47.24.41.41,0,0,0,.08.33c-.3,0-.5.1-.51.25a.31.31,0,0,0,0,.08.54.54,0,0,0-.26-.2c-.09.06-.27.12-.35.25s0,.43.25.5a.34.34,0,0,0,.42-.24.34.34,0,0,0,0-.22A.63.63,0,0,0,87,85.76Z"/><path class="cls-3" d="M91.73,92c.12-.28-.19-.54-.18-.87,0-.78-.57-.89-1.09-.81a.84.84,0,0,0-.44.25.8.8,0,0,0-.18.65c0,.27-.15.48,0,.72a1.12,1.12,0,0,0,1.21.58A.92.92,0,0,0,91.73,92Z"/><path class="cls-3" d="M90.53,93.13a.17.17,0,0,0,.11.16.24.24,0,0,0,.21-.11c0-.05,0-.25-.1-.27S90.56,93.05,90.53,93.13Z"/><path class="cls-3" d="M85.81,84.28c-.26,0-.3.24-.28.46a.42.42,0,0,0,.65,0C86.14,84.47,86.08,84.24,85.81,84.28Z"/><path class="cls-3" d="M94.48,96.67a1.12,1.12,0,0,0-.31.15.36.36,0,0,0,.32.42c.18,0,.22-.11.24-.24A.25.25,0,0,0,94.48,96.67Z"/><path class="cls-3" d="M166.33,58.4a.57.57,0,0,0,.21.51c0-.24,0-.47-.06-.71A.29.29,0,0,0,166.33,58.4Z"/><path class="cls-3" d="M163.78,71.73a.32.32,0,0,0,.22-.12s0-.22-.11-.26-.18.14-.21.21S163.75,71.73,163.78,71.73Z"/><path class="cls-3" d="M163.36,70.83a.28.28,0,0,0-.27.17,1.11,1.11,0,0,0-.79-.28.77.77,0,0,0-.48.16.78.78,0,0,0-.29.62c0,.26-.24.44-.15.69a1.53,1.53,0,0,0,.14.29l0,.08v0a3.13,3.13,0,0,1,.15.32.86.86,0,0,0,.36,0,1,1,0,0,0,.47.09.86.86,0,0,0,.77-.38c.18-.26-.08-.57,0-.89a1.22,1.22,0,0,0,0-.17.33.33,0,0,0,.36,0c.15-.1.23-.26.12-.41S163.49,70.83,163.36,70.83Z"/><path class="cls-3" d="M89.37,58.87a.41.41,0,0,0,.17.54.37.37,0,0,0,.53-.16.39.39,0,0,0-.15-.5A.38.38,0,0,0,89.37,58.87Z"/><path class="cls-3" d="M89.07,55.11a.5.5,0,0,0-.1-.17.47.47,0,0,0-.84.19,3.41,3.41,0,0,0-.11.78.74.74,0,0,0,.61.61c.17,0,.54-.06.5-.41C88.8,55.63,89.2,55.53,89.07,55.11Z"/><path class="cls-3" d="M164.57,65.65c.23,0,.43-.14.51-.47a.55.55,0,0,0-.28-.61.7.7,0,0,0-.72.39.41.41,0,0,0,0,.11.66.66,0,0,0-.26-.18,1.19,1.19,0,0,0-.81,0,.51.51,0,0,1-.3,0,.48.48,0,0,0-.71.37.19.19,0,0,0-.13-.06c-.17,0-.35.15-.39.37a.43.43,0,0,0,.29.54.35.35,0,0,0,.42-.32h0a.66.66,0,0,0,.36.09A.72.72,0,0,1,163,66a.77.77,0,0,0,.75,0,.66.66,0,0,0,.41-.61v-.07A.57.57,0,0,0,164.57,65.65Z"/><path class="cls-3" d="M148.33,99.6c-.15.18-.2.36,0,.52s.25.07.29,0a.47.47,0,0,0,.16-.35C148.72,99.57,148.51,99.59,148.33,99.6Z"/><path class="cls-3" d="M135.81,101.65c0-.09-.12-.19-.17-.19s-.24,0-.25.09a.25.25,0,0,0,.14.21C135.59,101.78,135.81,101.74,135.81,101.65Z"/><path class="cls-3" d="M164.81,68.32a.51.51,0,0,0,.52-.4h0a.68.68,0,0,0,.62-.37c0-.2-.23-.54-.48-.61a.32.32,0,0,0-.41.24,1.49,1.49,0,0,0,0,.21h0a.48.48,0,0,0-.12,0,.41.41,0,0,0,0-.08.38.38,0,0,0-.29-.44.4.4,0,0,0-.47.31.43.43,0,0,0,.19.43.37.37,0,0,0-.08.18C164.29,68,164.54,68.29,164.81,68.32Z"/><path class="cls-3" d="M166.64,60.62c0-.26,0-.5,0-.76l0,0a1.43,1.43,0,0,0,0,.29h0C166.48,60.4,166.53,60.57,166.64,60.62Z"/><path class="cls-3" d="M139,100.66c.22,0,.48-.18.55-.5a.27.27,0,0,0-.23-.36.52.52,0,0,0-.62.25A.6.6,0,0,0,139,100.66Z"/><path class="cls-3" d="M147.52,98.6c-.19.05-.26.52-.12.59s.53-.13.49-.33A.36.36,0,0,0,147.52,98.6Z"/><path class="cls-3" d="M140.18,99.37a.43.43,0,0,0-.36-.45.35.35,0,0,0-.38.29.38.38,0,0,0,.31.47A.4.4,0,0,0,140.18,99.37Z"/><path class="cls-3" d="M135.19,103.86a.41.41,0,0,0,.64,0c0-.23-.09-.46-.37-.42S135.16,103.64,135.19,103.86Z"/><path class="cls-3" d="M136.34,100.77a.48.48,0,0,0,.39.62.59.59,0,0,0,.77-.48.63.63,0,0,0-.39-.75C136.82,100.07,136.43,100.38,136.34,100.77Z"/><path class="cls-3" d="M137.85,101.27c0,.19.29.48.58.52a.43.43,0,0,0,.44-.37.51.51,0,0,0-.36-.56A.66.66,0,0,0,137.85,101.27Z"/><path class="cls-3" d="M90.13,87.83a.52.52,0,0,0-.33-.63.35.35,0,0,0-.52.18.74.74,0,0,0,0,.65.41.41,0,0,0-.22,0,.61.61,0,0,0-.36.67A.52.52,0,0,0,89,89a.71.71,0,0,0,.94-.34,2.6,2.6,0,0,0-.19-.42.27.27,0,0,0-.08-.07A.67.67,0,0,0,90.13,87.83Z"/><path class="cls-3" d="M92.19,57.19a.29.29,0,0,0,.07.46.36.36,0,0,0,.52-.08.36.36,0,0,0-.08-.48A.37.37,0,0,0,92.19,57.19Z"/><path class="cls-3" d="M135.56,41.64c-.28,0-.49.15-.48.36a1,1,0,0,0,.31.5c.21,0,.41,0,.62-.08a.62.62,0,0,0,.11-.37C136.12,41.79,135.92,41.64,135.56,41.64Z"/><path class="cls-3" d="M135.06,41.06a.35.35,0,0,0-.46.24.33.33,0,0,0,.19.44c.23.07.56,0,.61-.19S135.24,41.13,135.06,41.06Z"/><path class="cls-3" d="M133.85,41.36a.43.43,0,0,0-.35.41.38.38,0,0,0,.37.37.42.42,0,0,0,.37-.43A.41.41,0,0,0,133.85,41.36Z"/><path class="cls-3" d="M134.63,39.28a.4.4,0,0,0-.45.22.45.45,0,0,0,.27.58.47.47,0,0,0,.48-.48A.3.3,0,0,0,134.63,39.28Z"/><path class="cls-3" d="M140.21,41.75c-.35-.13-.69,0-.77.19v0a.36.36,0,0,0-.36.26c.44,0,.88,0,1.31.08l0-.06A.47.47,0,0,0,140.21,41.75Z"/><path class="cls-3" d="M90.59,56c.09.07.33-.07.41-.14a.26.26,0,0,0-.1-.4.36.36,0,0,0-.31.13C90.54,55.62,90.49,55.88,90.59,56Z"/><path class="cls-3" d="M88.05,56.67a.13.13,0,0,0,.16,0,.17.17,0,0,0,0-.14s-.1,0-.13,0A.1.1,0,0,0,88.05,56.67Z"/><path class="cls-3" d="M90,54.47A.38.38,0,0,0,90,55a.4.4,0,0,0,.56,0,.37.37,0,0,0,0-.56A.39.39,0,0,0,90,54.47Z"/><path class="cls-3" d="M90.26,56.86a.31.31,0,0,0-.05.29c.05.09.18.21.27.2.25,0,.32-.3.28-.43A.34.34,0,0,0,90.26,56.86Z"/><path class="cls-3" d="M94.1,51.42a.34.34,0,0,0,0,.34c0,.07.3.18.38.12s0-.33,0-.37S94.17,51.38,94.1,51.42Z"/><path class="cls-3" d="M93,55.87a.46.46,0,0,0,.24.57.5.5,0,0,0,.71-.16l.06-.47a.36.36,0,0,0-.14-.21A.75.75,0,0,0,93,55.87Z"/><path class="cls-3" d="M92.05,54.78c-.23-.14-.47,0-.64.26a.4.4,0,0,0,.08.57.79.79,0,0,0,.8-.14A.48.48,0,0,0,92.05,54.78Z"/><path class="cls-3" d="M92.33,52a.56.56,0,0,0,.22.73.57.57,0,0,0,.64-.95A.83.83,0,0,0,92.33,52Z"/><path class="cls-3" d="M91.64,51.29a.44.44,0,0,0-.48,0,.38.38,0,0,0-.47.13.57.57,0,0,0,.19.69.33.33,0,0,0,.46-.12s0-.05,0-.07a.32.32,0,0,0,.28-.1A.41.41,0,0,0,91.64,51.29Z"/><path class="cls-3" d="M130.52,36.24a.51.51,0,0,0-.65-.25.76.76,0,0,0-.25.91.53.53,0,0,0,.63.13.68.68,0,1,0,1,.74.9.9,0,0,0-.69-.83.53.53,0,0,0-.24.06A.53.53,0,0,0,130.52,36.24Z"/><path class="cls-3" d="M130.17,39.2c-.09,0,0,.22,0,.29a.19.19,0,0,0,.2.07c.06,0,.06-.17,0-.25S130.27,39.15,130.17,39.2Z"/><path class="cls-3" d="M117.05,35.82c.06,0,.22-.14.17-.24s-.21-.07-.25,0-.16.1-.11.21A.13.13,0,0,0,117.05,35.82Z"/><path class="cls-3" d="M114.5,35.47a.33.33,0,0,0,0-.57.34.34,0,0,0-.38.22A.32.32,0,0,0,114.5,35.47Z"/><path class="cls-3" d="M94.56,52a.39.39,0,0,0,0,.24c0-.1,0-.21.07-.31Z"/><path class="cls-3" d="M123.92,37.86c.24-.14.29-.37.12-.67s-.37-.28-.67-.11a.4.4,0,0,0-.21.48A.81.81,0,0,0,123.92,37.86Z"/><path class="cls-3" d="M131.06,40.32c.08,0,.08-.24,0-.3a.2.2,0,0,0-.23-.09c-.08,0-.09.17-.07.24S131,40.36,131.06,40.32Z"/><path class="cls-3" d="M159.84,70a.57.57,0,0,0,.15-.12.52.52,0,0,0,.26.36.72.72,0,0,0,1-.08.83.83,0,0,0,0-.74.34.34,0,0,0,.37-.25.4.4,0,0,0-.3-.44.37.37,0,0,0-.45.26s0,0,0,.07a.68.68,0,0,0-.69.22l0,0a.62.62,0,0,0-.54-.46.89.89,0,0,0-.32,0,.29.29,0,0,0,0-.26.47.47,0,0,0-.61-.2Z"/><path class="cls-3" d="M159.25,66c0-.17-.1-.22-.23-.25s-.35.06-.33.23a1.19,1.19,0,0,0,.12.32A.37.37,0,0,0,159.25,66Z"/><path class="cls-3" d="M161.09,66.1a.54.54,0,0,0-.64.08.43.43,0,0,0-.1.58c.08.13.16.4.33.5a.28.28,0,0,0-.08.15.75.75,0,0,0,.54.72.43.43,0,0,0,.52-.38.47.47,0,0,0-.42-.63h-.17a.41.41,0,0,1,.07-.15A.6.6,0,0,0,161.09,66.1Z"/><path class="cls-3" d="M132.12,36.76a.4.4,0,1,0,.26.75c.16-.09.21-.4.06-.7A.54.54,0,0,0,132.12,36.76Z"/><path class="cls-3" d="M132.86,39.23c0-.37-.14-.55-.41-.56a.65.65,0,0,0-.61.53.69.69,0,0,0,.58.58C132.63,39.78,132.86,39.5,132.86,39.23Z"/><path class="cls-3" d="M112.7,99.64l-.15-.14-.07,0c.14.22.31.48.52.76a1,1,0,0,1,.37-.12C113.14,100,112.91,99.84,112.7,99.64Z"/><path class="cls-3" d="M113.53,101l.33.37A.61.61,0,0,0,113.53,101Z"/><path class="cls-3" d="M116.25,102.05h0c-.44-.22-.87-.45-1.29-.71-.19.12-.48.28-.53.6h0c.28.27.59.54.92.82A1.34,1.34,0,0,0,116.25,102.05Z"/><path class="cls-3" d="M118.71,103.16a.37.37,0,0,0,0-.18l-.62-.19-.37.07a.33.33,0,0,0-.18-.11.36.36,0,0,0-.18,0c-.14-.11-.21-.06-.46.15,0,.16.23.35,0,.47a2.91,2.91,0,0,0-.37-.33.49.49,0,0,0-.53,0l-.07.06c.27.21.56.41.87.61l0,0v.06a16.78,16.78,0,0,0,1.75,1l.15-.1c.27-.26.25-.5-.05-.88A2.55,2.55,0,0,0,118.71,103.16Z"/><path class="cls-3" d="M133.27,103.3c-.29-.06-.59.08-.63.3a.8.8,0,0,0,.58.79c.22,0,.46-.18.51-.48S133.65,103.37,133.27,103.3Z"/><path class="cls-3" d="M121.65,105a.51.51,0,0,0-.38-.24.66.66,0,0,0-.28,0c0-.06,0-.12-.08-.15-.2-.13-.41-.05-.54.23,0,0,0,.07,0,.1s-.19.18-.31,0a1.53,1.53,0,0,0-.11-.16.64.64,0,0,0-.72-.13.55.55,0,0,0-.29.21c.54.24,1.11.46,1.72.67a1.09,1.09,0,0,0,.08-.15.8.8,0,0,0,.31.27c.34.11.7.21,1.07.3a1.1,1.1,0,0,0,.1-.45C122.21,105.34,121.91,105.08,121.65,105Z"/><path class="cls-3" d="M133.43,105.92a.38.38,0,0,0-.09-.44.51.51,0,0,0-.58,0,.36.36,0,0,0-.24.21.5.5,0,0,0-.37-.32.31.31,0,0,0-.37.26.57.57,0,0,0,.12.43.4.4,0,0,0,.61-.12,1.2,1.2,0,0,1,0,.42.32.32,0,0,0,0,.16l1-.13-.18-.16Z"/><path class="cls-3" d="M136,105.47a.38.38,0,0,0-.21,0,.49.49,0,0,0-.25-.16.75.75,0,0,0-.75.25.85.85,0,0,0-.51.15.16.16,0,0,0-.08,0c-.14,0-.18.14-.21.21s0,.1.07.13,0,0,0,0a.62.62,0,0,0,0,.19c.78-.13,1.58-.28,2.41-.45A.57.57,0,0,0,136,105.47Z"/><path class="cls-3" d="M132,103.27c.17.07.44,0,.59-.35l0,0a.38.38,0,0,0,.41-.26.37.37,0,0,0-.31-.43.24.24,0,0,0-.17,0,.4.4,0,0,0-.43-.2c-.3.09-.32.29-.43.24s-.12-.1-.21-.15a3.88,3.88,0,0,1-.36.15,1.23,1.23,0,0,0,0,.62c0,.09.27.28.12.43a3.39,3.39,0,0,1-.34.23.37.37,0,0,0-.27.16.49.49,0,0,0,.08.33.65.65,0,0,0,.15.65c.28.21.41-.07.61-.12a.48.48,0,0,0,.39-.5c0-.27-.19-.52-.15-.65S131.76,103.19,132,103.27Z"/><path class="cls-3" d="M125.83,105.43a.45.45,0,0,0,.17-.2c0-.19-.23-.53-.48-.6a.31.31,0,0,0-.41.23.63.63,0,0,0,.17.69.3.3,0,0,0,0,.29.32.32,0,0,0,.45.18.46.46,0,0,0,.24-.31A.38.38,0,0,0,125.83,105.43Z"/><path class="cls-3" d="M130.06,105.34a.35.35,0,0,0,.41.16.32.32,0,0,0,0-.56C130.17,104.84,130,105.18,130.06,105.34Z"/><path class="cls-3" d="M124.82,104.6a.71.71,0,0,0-.69-.82h-.41a.77.77,0,0,0-.33.15.8.8,0,0,0-.28.61c0,.27-.23.45-.14.7a1.24,1.24,0,0,0,.34.51l-.07,0c-.21.09-.38.2-.62,0s-.34,0-.43.21c0,0,0,0,0,0,.62.15,1.27.28,2,.38a1,1,0,0,0-.06-.44.9.9,0,0,0,.73-.39.5.5,0,0,0,0-.4A.36.36,0,0,0,125,105,.39.39,0,0,0,124.82,104.6Z"/><path class="cls-3" d="M129.85,105.92a.36.36,0,0,0-.46,0l-.24.14-.09-.06a1,1,0,0,0,0-.24.65.65,0,0,0,0-.2.71.71,0,0,0,.7-.52.71.71,0,0,0-1.37-.32.79.79,0,0,0,0,.34.85.85,0,0,0-.56.23.55.55,0,0,0-.43-.48c-.45-.1-.85.09-.91.43a.58.58,0,0,0,0,.29.36.36,0,0,0-.32,0,.38.38,0,0,0-.23.44c0,.23.22.27.42.31a.56.56,0,0,0-.31.28s0,0,0,.08l1,0a.74.74,0,0,0-.36-.4.35.35,0,0,0-.11,0,.87.87,0,0,0,.18-.38.63.63,0,0,0,.26.15.79.79,0,0,0,.71-.3.67.67,0,0,0,.66.56l.24,0a.86.86,0,0,1,0,.16.43.43,0,0,0-.05.21v0c.44,0,.9,0,1.37,0v0a1.36,1.36,0,0,1,0-.24C130,106.19,130,106,129.85,105.92Z"/><path class="cls-3" d="M96.7,102.18a.43.43,0,0,0-.14.65.38.38,0,0,0,.61-.14.54.54,0,0,0-.08-.44A.42.42,0,0,0,96.7,102.18Z"/><path class="cls-3" d="M93.16,100.26l-.5-.19.77.91s0,0,0,0C93.61,100.57,93.54,100.4,93.16,100.26Z"/><path class="cls-3" d="M94.18,98.59c0-.18-.08-.35-.25-.32a1.06,1.06,0,0,0-.32.14.36.36,0,0,0,.33.42C94.11,98.84,94.15,98.72,94.18,98.59Z"/><path class="cls-3" d="M93.23,94.74a.89.89,0,0,0,.79-.89c0-.3-.44-.3-.61-.15s-.13.07-.34,0a.45.45,0,0,0-.5.11.35.35,0,0,0-.14-.06.59.59,0,0,0-.5.11.35.35,0,0,0-.33-.19c-.25,0-.32.22-.41.44.16.17.31.39.57.25l.06,0a.91.91,0,0,0,.53.42.36.36,0,0,0,.37-.21A.89.89,0,0,0,93.23,94.74Z"/><path class="cls-3" d="M92.39,96.54c0-.21,0-.42,0-.64a.32.32,0,0,0-.2-.46.41.41,0,0,0-.5.28s0,.07,0,.1a.64.64,0,0,0-.44-.31.65.65,0,0,0-.89.53.73.73,0,0,0,.58.84.62.62,0,0,0,.44-.14A.82.82,0,0,0,92,97C92.19,96.89,92.41,96.84,92.39,96.54Z"/><path class="cls-3" d="M90.48,95.61c0-.19-.21-.28-.32-.33h0a.77.77,0,0,0,.34-.45.81.81,0,0,0-.51-.85.68.68,0,0,0-.83.42,1.1,1.1,0,0,0,.57,1,1,1,0,0,0,.17,0,.43.43,0,0,0,0,.07c-.06.18,0,.43.21.42S90.46,95.79,90.48,95.61Z"/><path class="cls-3" d="M142.74,40.49a.69.69,0,0,0-.21.81c.11.24.55.26.9.12a.67.67,0,0,0,.26-.83A.69.69,0,0,0,142.74,40.49Z"/><path class="cls-3" d="M91.17,98.12l.36.49a.5.5,0,0,0-.07-.27A.66.66,0,0,0,91.17,98.12Z"/><path class="cls-3" d="M93.83,101.31s-.07,0-.1,0l.27.31C94,101.52,93.91,101.33,93.83,101.31Z"/><path class="cls-3" d="M92.77,97.19a.64.64,0,1,0,1.24.29c.07-.31-.23-.65-.64-.73A.5.5,0,0,0,92.77,97.19Z"/><path class="cls-3" d="M89.12,92.37a.66.66,0,0,0-.75-.43.69.69,0,0,0-.3.9.67.67,0,0,0,.74.38C89.08,93.17,89.19,92.75,89.12,92.37Z"/><path class="cls-3" d="M99.09,106a.32.32,0,0,0-.35.2l.43.36a.26.26,0,0,0,.14-.11C99.37,106.39,99.26,106.05,99.09,106Z"/><path class="cls-3" d="M96.77,101.63a.43.43,0,0,0-.3-.49.36.36,0,0,0-.41.32.37.37,0,0,0,.26.45A.39.39,0,0,0,96.77,101.63Z"/><path class="cls-3" d="M95.66,99.22h-.13a.3.3,0,0,0,.27-.3.45.45,0,0,0-.15-.33c-.25-.15-.43,0-.6.24.1.19.16.4.38.41a.31.31,0,0,0-.25.27.74.74,0,0,0,.36.67.5.5,0,0,0,.59-.44C96.18,99.5,96,99.29,95.66,99.22Z"/><path class="cls-3" d="M95.24,102.21a.48.48,0,0,0-.4-.69.21.21,0,0,0,0-.13c0-.17-.18-.34-.4-.37a.43.43,0,0,0-.52.33.37.37,0,0,0,.34.4h0a1,1,0,0,0,0,.18c.35.38.71.76,1.07,1.13a1.46,1.46,0,0,0-.09-.54A.66.66,0,0,1,95.24,102.21Z"/><path class="cls-3" d="M98.93,104.74a.46.46,0,0,0-.23-.82,2.91,2.91,0,0,0-.78-.07.72.72,0,0,0-.58.63.29.29,0,0,0,.2.35,2.06,2.06,0,0,0,1.23,0A.55.55,0,0,0,98.93,104.74Z"/><path class="cls-3" d="M136.84,104.19a.35.35,0,0,0-.21-.25c-.15,0-.46.2-.42.35a.6.6,0,0,0,.06.11,0,0,0,0,0,0,0,.63.63,0,0,0,.44.47c.14,0,.38-.24.39-.43S137,104.22,136.84,104.19Z"/><path class="cls-3" d="M162,80.89l.15-.23-.06,0C162.09,80.71,162.07,80.8,162,80.89Z"/><path class="cls-3" d="M162.64,78.5h0c0,.26-.09.52-.14.79.32,0,.52,0,.57-.18A.63.63,0,0,0,162.64,78.5Z"/><path class="cls-3" d="M162.39,79.7h0a.52.52,0,0,0,0-.27A2.8,2.8,0,0,1,162.39,79.7Z"/><path class="cls-3" d="M163,78.09a.35.35,0,0,0,.22.44.33.33,0,0,0,.14,0c.09-.18.18-.37.26-.56a.27.27,0,0,0-.13-.1A.39.39,0,0,0,163,78.09Z"/><path class="cls-3" d="M156.47,95.31s-.21,0-.23.11.15.18.22.2a.19.19,0,0,0,.17-.12C156.64,95.43,156.54,95.34,156.47,95.31Z"/><path class="cls-3" d="M164,73.79a.31.31,0,0,0-.26-.26.44.44,0,0,0-.46.28.34.34,0,0,0,.12.31c-.15.24-.23.55-.33.57s-.43-.25-.78-.25a10.12,10.12,0,0,1,.37,1.66.45.45,0,0,0,.23,0A.31.31,0,0,0,163,76s-.06.06-.07.09a.61.61,0,0,0,.35.64h0a.74.74,0,0,0,.45.84c.18-.42.36-.86.53-1.31a1,1,0,0,0-.46,0,.45.45,0,0,0-.22-.49.61.61,0,0,0-.53.14c.11-.16.15-.37.21-.39s.54.34,1,.21a.61.61,0,0,0,.31-.24c.1-.28.19-.56.28-.85a0,0,0,0,0,0,0,1.07,1.07,0,0,0-.38-.68A1,1,0,0,0,164,73.79Z"/><path class="cls-3" d="M153.41,97a.42.42,0,0,0-.5.28,1.1,1.1,0,0,1-.2.35.54.54,0,0,0-.22.6c0,.1.19.19.36.25l.76-.52v-.5A.31.31,0,0,0,153.41,97Z"/><path class="cls-3" d="M154.64,95.22c-.17.14-.13.07-.35,0s-.56,0-.57.36a.76.76,0,0,0,.73.69.88.88,0,0,0,.79-.89C155.2,95.07,154.8,95.07,154.64,95.22Z"/><path class="cls-3" d="M165.06,70.61a.2.2,0,0,0-.21-.24.23.23,0,0,0-.2.2.19.19,0,0,0,.15.23A.2.2,0,0,0,165.06,70.61Z"/><path class="cls-3" d="M166.31,65.77a.72.72,0,0,0,.17.59c0-.13,0-.26,0-.39l0-.5A.5.5,0,0,0,166.31,65.77Z"/><path class="cls-3" d="M165.93,68.32a.33.33,0,0,0,.28.27c0-.25.08-.5.11-.75a.34.34,0,0,0-.16,0A.38.38,0,0,0,165.93,68.32Z"/><path class="cls-3" d="M165.82,70.88c0-.11,0-.22.07-.33a.29.29,0,0,0-.09.15A.36.36,0,0,0,165.82,70.88Z"/><path class="cls-3" d="M166.29,63.63a.41.41,0,0,0,0,.19l-.05,0c-.19-.07-.41.13-.43.36a.34.34,0,0,0,.32.36.44.44,0,0,0,.4-.32l.06,0h0c0-.33,0-.66,0-1A.46.46,0,0,0,166.29,63.63Z"/><path class="cls-3" d="M165,72.8a.51.51,0,0,0-.69.35c-.07.27,0,.57.25.62a.71.71,0,0,0,.65-.26c0-.13.08-.27.11-.4A.52.52,0,0,0,165,72.8Z"/><path class="cls-3" d="M165.05,74.05c0-.13.07-.25.1-.38a.84.84,0,0,0-.16.24A1.14,1.14,0,0,0,165.05,74.05Z"/><path class="cls-3" d="M165.37,69.22c-.25-.07-.56.06-.6.26a.28.28,0,0,0,0,.09.74.74,0,0,0-.52-.38.65.65,0,0,0-.24,0,1,1,0,0,0,.06-.92.71.71,0,0,0-.85-.19c-.21.1-.38.21-.62,0a.2.2,0,0,0-.22,0l-.05,0a.39.39,0,0,0-.42.27.32.32,0,0,0,.24.41.46.46,0,0,0,.32-.13.31.31,0,0,0,.18,0,3.18,3.18,0,0,0,.38.59.81.81,0,0,0,.68.15.74.74,0,0,0-.19.44c-.07.52.06.71.48.81a.7.7,0,0,0,.84-.63s0-.06,0-.1a.72.72,0,0,0,.44.4c.2.06.45-.14.52-.4S165.72,69.32,165.37,69.22Z"/><path class="cls-3" d="M164.7,71.4a.35.35,0,0,0-.22-.43.34.34,0,0,0-.45.17c-.08.22,0,.56.16.61s.27,0,.4-.16l0,0a.56.56,0,0,0,.42.7,2,2,0,0,0,.51,0c.09-.35.17-.69.25-1.05a.67.67,0,0,0-.33-.24A.89.89,0,0,0,164.7,71.4Z"/><path class="cls-3" d="M151.38,96.8A.25.25,0,0,0,151,97c-.05.17.06.42.22.41s.44-.06.46-.24S151.49,96.85,151.38,96.8Z"/><path class="cls-3" d="M143.26,100.28a.38.38,0,0,0,.34.4.37.37,0,0,0,.38-.36.32.32,0,0,0-.3-.37A.42.42,0,0,0,143.26,100.28Z"/><path class="cls-3" d="M141.49,102.71c-.18,0-.37,0-.4.17s.08.52.28.55a.4.4,0,0,0,.48-.35A.34.34,0,0,0,141.49,102.71Z"/><path class="cls-3" d="M141.55,100.37a.62.62,0,0,0-.48.29.52.52,0,0,0-.35-.38.36.36,0,0,0-.41.32.42.42,0,0,0,.25.47.64.64,0,0,0,.44-.15.47.47,0,0,0,.29.41c.4.07.73-.07.77-.32A.7.7,0,0,0,141.55,100.37Z"/><path class="cls-3" d="M141.68,102.23a.82.82,0,0,0-.38-.72c-.27-.06-.46.09-.53.43s.1.45.43.51A.37.37,0,0,0,141.68,102.23Z"/><path class="cls-3" d="M142.05,100a.26.26,0,0,0-.33.19.3.3,0,0,0,.16.4.34.34,0,0,0,.42-.23A.3.3,0,0,0,142.05,100Z"/><path class="cls-3" d="M138,102.32a.63.63,0,0,0-.6.23.44.44,0,0,0,.09.36h-.09c-.12,0-.26,0-.31.15s.14.4.33.42.21-.11.23-.25a.26.26,0,0,0,0-.15h0a.28.28,0,0,0,.38-.18C138.12,102.61,138.11,102.39,138,102.32Z"/><path class="cls-3" d="M140.54,103.49a.68.68,0,0,0-.54-.5.35.35,0,0,0-.15,0,.62.62,0,0,0,.12-.42c-.07-.28-.32-.19-.56-.19-.1.27-.15.5.09.65a.31.31,0,0,0,.17,0,.65.65,0,0,0-.21.42.51.51,0,0,0,.34.52.45.45,0,0,0,.22,0c.18.28.32.36.52.29a.35.35,0,0,0,.25-.37A.41.41,0,0,0,140.54,103.49Z"/><path class="cls-3" d="M143.21,99.6c.26,0,.45-.14.5-.48a.41.41,0,0,0-.27-.51c-.22,0-.67.22-.7.42S142.87,99.54,143.21,99.6Z"/><path class="cls-3" d="M138.88,104c-.37-.07-.65,0-.69.28a.66.66,0,0,0,.48.61.65.65,0,0,0,.52-.45A.41.41,0,0,0,138.88,104Z"/><path class="cls-3" d="M140,101.85s0-.13-.1-.14-.27-.19-.39-.34a.39.39,0,0,0-.35,0,.45.45,0,0,0-.18.31c0,.08.11.2.2.24a2.49,2.49,0,0,0,.55.16C139.93,102.11,140,102,140,101.85Z"/><path class="cls-3" d="M144,102.87a.12.12,0,0,0-.16.11c0,.08,0,.23.12.27s.19-.14.18-.18S144.14,102.89,144,102.87Z"/><path class="cls-3" d="M148.2,100.47a.7.7,0,0,0-.41.38l-.1,0c-.38-.08-.57.15-.71.46-.21-.07-.4-.24-.58,0a.35.35,0,0,0,0,.45c.2.24.4.08.6,0l.13.13c.63-.33,1.25-.68,1.86-1A.68.68,0,0,0,148.2,100.47Z"/><path class="cls-3" d="M137.46,104.91a.41.41,0,0,0-.31,0c-.12.07-.07.24.07.32a.6.6,0,0,0,.45.05.18.18,0,0,0,.09-.26A.36.36,0,0,0,137.46,104.91Z"/><path class="cls-3" d="M150,97.16a.36.36,0,0,0-.3-.43.35.35,0,0,0-.44.27.37.37,0,0,0,.28.44A.44.44,0,0,0,150,97.16Z"/><path class="cls-3" d="M145.25,101.67a.33.33,0,0,0-.39.28.54.54,0,0,0,0,.31c-.19,0-.38.13-.39.28s.22.29.43.38l.36-.18a.75.75,0,0,0,0-.2.39.39,0,0,0,.41-.29A.57.57,0,0,0,145.25,101.67Z"/><path class="cls-3" d="M146.12,99.25a.7.7,0,0,0-.64.5.52.52,0,1,0,1,.15A.58.58,0,0,0,146.12,99.25Z"/><path class="cls-3" d="M143.46,101.66a.61.61,0,0,0-.67.43.62.62,0,0,0,.41.69.85.85,0,0,0,.73-.52A.57.57,0,0,0,143.46,101.66Z"/><path class="cls-3" d="M150.3,98.06a.4.4,0,0,0-.06.79.43.43,0,0,0,.41-.39A.4.4,0,0,0,150.3,98.06Z"/><path class="cls-3" d="M144.15,98c-.11,0-.28.18-.33.27s.09.37.24.34a.35.35,0,0,0,.24-.23C144.32,98.26,144.27,98,144.15,98Z"/><path class="cls-3" d="M92.2,98.92a.35.35,0,0,0-.36.11c.17.23.36.46.54.68a.77.77,0,0,0,0-.21.48.48,0,0,0,.07-.18A.34.34,0,0,0,92.2,98.92Z"/><path class="cls-3" d="M126.76,34.21a.44.44,0,0,0,.21-.08l-.47-.08A.2.2,0,0,0,126.76,34.21Z"/><path class="cls-3" d="M126.13,37.72a.28.28,0,0,0,.41.12c.24-.12.39-.42.3-.6a.59.59,0,0,0-.63-.25C126,37.09,126,37.44,126.13,37.72Z"/><path class="cls-3" d="M125.9,35.05a.63.63,0,0,0,.3-.56.53.53,0,0,0-.54-.23.27.27,0,0,0-.17.38C125.59,34.93,125.75,35.09,125.9,35.05Z"/><path class="cls-3" d="M88.25,91.5c.06-.27-.19-.29-.27-.4a.59.59,0,0,0-.85-.14h0c.18.42.38.86.6,1.29a.59.59,0,0,0,0-.08.43.43,0,0,0,0-.4C88,91.75,88.2,91.7,88.25,91.5Z"/><path class="cls-3" d="M128.41,34.37l-.5-.09a.36.36,0,0,0,.3.17A.32.32,0,0,0,128.41,34.37Z"/><path class="cls-3" d="M127.63,38.89a.59.59,0,0,0,.54-.63.61.61,0,0,0-.62-.52.58.58,0,0,0,.08,1.15Z"/><path class="cls-3" d="M128.76,37c.25,0,.42-.1.44-.3a.61.61,0,0,0-.49-.59.44.44,0,0,0-.44.38A.53.53,0,0,0,128.76,37Z"/><path class="cls-3" d="M128,36.11c.27-.12.36-.6.18-1a.49.49,0,0,0-.71-.21.59.59,0,0,0-.26.87A.63.63,0,0,0,128,36.11Z"/><path class="cls-3" d="M122.79,33.75a.15.15,0,0,0,0-.09l-.36,0a.37.37,0,0,0,.08.14C122.59,33.82,122.74,33.83,122.79,33.75Z"/><path class="cls-3" d="M121,35.71c.2.06.39.21.55.13a.36.36,0,0,0,.21-.25.57.57,0,0,0,.07-.34.78.78,0,0,0-.4-.55.58.58,0,0,0-.61.09.47.47,0,0,0-.15.47A.6.6,0,0,0,121,35.71Z"/><path class="cls-3" d="M129.79,35.12a.62.62,0,0,0,.33-.38l-1.38-.3a.79.79,0,0,0,0,.46C128.91,35.24,129.35,35.33,129.79,35.12Z"/><path class="cls-3" d="M122.75,37.11c0,.1.17.14.25.15s.15-.07.15-.14S123,37,123,37,122.76,37,122.75,37.11Z"/><path class="cls-3" d="M125.17,38.41a.38.38,0,0,0,.1-.52.41.41,0,0,0-.5-.18.52.52,0,0,0-.21.55A.54.54,0,0,0,125.17,38.41Z"/><path class="cls-3" d="M123.93,35.88c.25-.15.28-.4.09-.72a.52.52,0,0,0-.6-.16.87.87,0,0,0-.3.81A.64.64,0,0,0,123.93,35.88Z"/><path class="cls-3" d="M124.81,36.82a.77.77,0,0,1,.52,0c.08,0,.23-.12.27-.22a.43.43,0,0,0-.07-.36c0-.06-.21-.07-.3,0a2.71,2.71,0,0,0-.52.24c-.15.07-.16.19-.06.34S124.77,36.84,124.81,36.82Z"/><path class="cls-3" d="M124.14,34.43c.3-.18.43-.43.34-.62l-.85-.08a.69.69,0,0,0,0,.58A.42.42,0,0,0,124.14,34.43Z"/><path class="cls-3" d="M130.69,35.88c-.1.22-.23.45.05.61a.38.38,0,0,0,.5-.05s.11-.15.09-.21-.15-.34-.23-.52a.89.89,0,0,0,.08-.71l-.64-.16a.77.77,0,0,0-.36.3C130,35.42,130.13,35.57,130.69,35.88Z"/><path class="cls-3" d="M138.51,41.28c.21,0,.35-.19.4-.31s-.06-.26-.21-.31-.37,0-.37.2S138.31,41.26,138.51,41.28Z"/><path class="cls-3" d="M137.6,37.36c0-.09-.11-.19-.18-.22a.19.19,0,0,0-.19.08c0,.07.06.17.12.22S137.56,37.46,137.6,37.36Z"/><path class="cls-3" d="M137.92,37.27l-.28-.12a.33.33,0,0,0,.13.11A.4.4,0,0,0,137.92,37.27Z"/><path class="cls-3" d="M139.26,38.51a.75.75,0,0,1,.57,0,.42.42,0,0,0,.51-.17c-.61-.3-1.25-.59-1.92-.88a.79.79,0,0,0,0,.13c.17.25.4.58.64.89A.26.26,0,0,0,139.26,38.51Z"/><path class="cls-3" d="M137.83,41.7a.71.71,0,0,0,.1.26c.25.07.45,0,.45-.19a.41.41,0,0,0-.16-.31C138.09,41.37,137.83,41.53,137.83,41.7Z"/><path class="cls-3" d="M139.92,39.63s.05-.05.05-.08a.76.76,0,0,0-.42-.85.48.48,0,0,0-.43.15.32.32,0,0,0-.17-.06.55.55,0,0,0-.33.45.4.4,0,0,0,.42.38h0a.49.49,0,0,0,.26.18.47.47,0,0,0,.16,0,.51.51,0,0,0-.09.25.7.7,0,0,0,.46.52.68.68,0,0,0,.59-.55C140.44,39.81,140.23,39.67,139.92,39.63Z"/><path class="cls-3" d="M143.09,40a1,1,0,0,1,.24,0s0,0,.06,0c-.32-.2-.66-.4-1-.59a.32.32,0,0,1,.12.15A.48.48,0,0,0,143.09,40Z"/><path class="cls-3" d="M141.62,41.88a.47.47,0,0,0-.17,0,1.12,1.12,0,0,0-.73.51c.45.06.89.12,1.33.2a.29.29,0,0,1,0-.09.42.42,0,0,0,.18-.21.33.33,0,0,0-.18-.45A.38.38,0,0,0,141.62,41.88Z"/><path class="cls-3" d="M140.94,41a.8.8,0,0,0,1-.39.77.77,0,0,0-.13-.67.56.56,0,0,0,.21-.17c.06-.09.1-.19.19-.36-.21-.13-.42-.25-.65-.37a.57.57,0,0,0-.13,0c-.39.08-.5.34-.32.63a.91.91,0,0,0-.5.52A.62.62,0,0,0,140.94,41Z"/><path class="cls-3" d="M132.44,41.09a.34.34,0,0,0,.37.31.45.45,0,0,0,.36-.49,1.25,1.25,0,0,0-.36-.24C132.6,40.63,132.43,40.86,132.44,41.09Z"/><path class="cls-3" d="M132.6,35.91l.15,0a.23.23,0,0,0,.16-.06s0,0,0,0a.61.61,0,0,0,.15-.24l-1-.28s0,.05,0,.08A.63.63,0,0,0,132.6,35.91Z"/><path class="cls-3" d="M132,36.11c.08-.09.28-.28.15-.44s-.39-.08-.51,0-.12.24-.05.37S131.87,36.23,132,36.11Z"/><path class="cls-3" d="M132.54,36.77c0,.19,0,.41.25.45.09,0,.24-.09.3-.18a.28.28,0,0,0,0-.29C132.91,36.57,132.73,36.62,132.54,36.77Z"/><path class="cls-3" d="M130.92,39.07c-.07,0-.17.17-.19.27s.07.27.23.23.41-.14.4-.28S131,39.06,130.92,39.07Z"/><path class="cls-3" d="M118.78,34.08c.09,0,.22.14.12.18s-.16.14-.08.39a.38.38,0,0,0,.47.32.56.56,0,0,0,.43-.67c-.06-.31-.24-.32-.26-.53a.27.27,0,0,0-.23-.24h-.59a.22.22,0,0,0-.12.19C118.49,34,118.68,34.08,118.78,34.08Z"/><path class="cls-3" d="M136.72,36.78l-.4-.14a.41.41,0,0,0,.35.15Z"/><path class="cls-3" d="M136.32,38.82l-.14,0c-.34-.06-.5.07-.52.41s0,.56.42.69a1.36,1.36,0,0,1-.37.17.36.36,0,0,0-.34.35.5.5,0,0,0,.22.55c.67.39.89.35,1.36-.25l.05,0h0a.86.86,0,0,0-.12.27.24.24,0,0,0,.22.32.29.29,0,0,0,.35-.26.75.75,0,0,0-.15-.34.33.33,0,0,0,.12,0,.47.47,0,0,1,.1,0c.06,0,.21-.08.26-.18a.44.44,0,0,0-.15-.6.47.47,0,0,0-.45.09h-.07c-.25.07-.36-.07-.53-.19C136.9,39.31,136.79,39,136.32,38.82Z"/><path class="cls-3" d="M134.08,37.16a.9.9,0,0,0,.13,1,.76.76,0,0,0,.5.17.4.4,0,0,0,.32,0l.07-.06a1,1,0,0,0,.47-.38.37.37,0,0,1,.37-.19.44.44,0,0,0,.35-.33.1.1,0,0,0,.07,0,.23.23,0,0,0,.24-.08.22.22,0,0,0-.11-.23.4.4,0,0,0-.22,0c-.06-.15-.19-.18-.35-.16a.86.86,0,0,1-.42,0,9.2,9.2,0,0,1-.86-.39,2.42,2.42,0,0,0,0-.49l-.88-.28a.49.49,0,0,0-.27.71A4.61,4.61,0,0,0,134.08,37.16Z"/><path class="cls-3" d="M124.94,35.24c.06,0,.25-.06.26-.15s-.18-.19-.24-.19a.22.22,0,0,0-.2.16C124.76,35.15,124.87,35.23,124.94,35.24Z"/><path class="cls-3" d="M82.18,64.48a.2.2,0,0,0,0,.21s.19,0,.25,0,.11-.18,0-.25S82.24,64.43,82.18,64.48Z"/><path class="cls-3" d="M80.81,58.91a.53.53,0,0,0,.12,0,.64.64,0,0,0,.57-.35.47.47,0,0,0-.07-.43Z"/><path class="cls-3" d="M82.93,60.66a1,1,0,0,1-.16-.38.55.55,0,0,0-.37-.52c-.18-.06-.59.21-.65.42s-.15.41.1.56a6.28,6.28,0,0,1,.52.38.31.31,0,0,0,.49.1A.41.41,0,0,0,82.93,60.66Z"/><path class="cls-3" d="M82.83,62.47a.9.9,0,0,0,.25,1.17c.27.14.5-.19.48-.41s0-.15.21-.27a.38.38,0,0,0,0-.67A.76.76,0,0,0,82.83,62.47Z"/><path class="cls-3" d="M80.06,62.05c-.11.13,0,.24.06.33a.24.24,0,0,0,.4,0,1.21,1.21,0,0,0,.07-.34A.37.37,0,0,0,80.06,62.05Z"/><path class="cls-3" d="M77.7,65.77a.81.81,0,0,0,0,1,.73.73,0,0,0,1,.06,1,1,0,0,0,0-1.1A.71.71,0,0,0,77.7,65.77Z"/><path class="cls-3" d="M79.41,63.33s-.13.23-.07.29.26,0,.3,0,.09-.18,0-.25S79.47,63.29,79.41,63.33Z"/><path class="cls-3" d="M83.78,58.05a.21.21,0,0,0,0-.06.54.54,0,0,0,.31-.24c0-.16,0-.38-.11-.49s-.3.08-.32.15,0,.06,0,.09a.35.35,0,0,0-.5,0,.46.46,0,0,0,.07.57A.4.4,0,0,0,83.78,58.05Z"/><path class="cls-3" d="M79.55,61a1.21,1.21,0,0,0,.07-.34.41.41,0,0,0-.11-.07l-.33.45C79.31,61.13,79.48,61.13,79.55,61Z"/><path class="cls-3" d="M75.19,67s0,0,0,0h0Z"/><path class="cls-3" d="M87.24,88.91c.06-.54-.08-.63-.58-.8a.53.53,0,0,0-.57.22l.34,1,.12.06,0,0a.33.33,0,0,0,.24,0A.52.52,0,0,0,87.24,88.91Z"/><path class="cls-3" d="M86.07,83.68a.47.47,0,0,0-.26-.62.31.31,0,0,0-.41.16.39.39,0,0,0,0,.5A.43.43,0,0,0,86.07,83.68Z"/><path class="cls-3" d="M86.42,87a.76.76,0,0,0-.5-.81.8.8,0,0,0-.46,0c.11.43.23.86.37,1.3A.74.74,0,0,0,86.42,87Z"/><path class="cls-3" d="M87.24,90.27a.43.43,0,0,0-.48-.16c.11.28.23.56.36.85a1.45,1.45,0,0,0,.09-.22C87.25,90.59,87.35,90.45,87.24,90.27Z"/><path class="cls-3" d="M117.12,34.35a.3.3,0,1,0-.43-.34C116.64,34.19,116.74,34.27,117.12,34.35Z"/><path class="cls-3" d="M85.22,58.33a.35.35,0,0,0,0-.51.37.37,0,0,0-.53,0,.44.44,0,0,0,0,.54A.36.36,0,0,0,85.22,58.33Z"/><path class="cls-3" d="M85,55.48c.07-.19-.26-.52-.41-.45s-.2.51,0,.6A.36.36,0,0,0,85,55.48Z"/><path class="cls-3" d="M83.79,59.23c-.06.11-.21.39-.07.51s.35,0,.45-.08a.24.24,0,0,0,.08-.37C84.15,59.15,83.88,59.09,83.79,59.23Z"/><path class="cls-3" d="M85.16,82a.61.61,0,0,0,.27,0q0,.17.27.27a.56.56,0,0,0,.73-.07,10.57,10.57,0,0,1-.57-1.34,1.08,1.08,0,0,0-.44-.23.58.58,0,0,0-.7.31c0,.22,0,.45,0,.68A.74.74,0,0,0,85.16,82Z"/><path class="cls-3" d="M85,83h-.13c0,.22.05.43.08.65a.35.35,0,0,0,.32-.3A.28.28,0,0,0,85,83Z"/><path class="cls-3" d="M94.12,50.32c-.11.16,0,.51.25.62a.33.33,0,0,0,.44-.18c.16-.3.17-.52,0-.63A.62.62,0,0,0,94.12,50.32Z"/><path class="cls-3" d="M95.22,47c.32,0,.35.28.46.49a.38.38,0,0,0,.61.13l.07-.05a.25.25,0,0,0,.12.13.7.7,0,0,0,.3.09c.12-.14.23-.3.35-.44a1.66,1.66,0,0,0-.23-.23.38.38,0,0,0-.38-.05.47.47,0,0,0-.24-.3c-.15-.1-.33-.15-.32-.44.1,0,.25-.09.28-.17l0-.06-1.19.66a.4.4,0,0,0,.07.19S95.19,47,95.22,47Z"/><path class="cls-3" d="M95.25,49.42a.53.53,0,0,1,.36,0,8.33,8.33,0,0,1,.51-.8h0a.87.87,0,0,1-.74,0A.29.29,0,0,0,95,49C94.89,49.17,95.05,49.45,95.25,49.42Z"/><path class="cls-3" d="M93.88,54.64a.46.46,0,0,0,.31,0l.1-.88c-.28-.12-.56-.09-.66.1A.68.68,0,0,0,93.88,54.64Z"/><path class="cls-3" d="M94.64,49.66a.38.38,0,0,0,0-.48.38.38,0,0,0-.53,0,.29.29,0,0,0,0,.46A.36.36,0,0,0,94.64,49.66Z"/><path class="cls-3" d="M85,55.14a.35.35,0,0,0,.51-.09.36.36,0,0,0-.11-.51.43.43,0,0,0-.53.1A.36.36,0,0,0,85,55.14Z"/><path class="cls-3" d="M103.24,43.27l-.07,0h0Z"/><path class="cls-3" d="M114.57,33.71l.17.16a.75.75,0,0,0,.83.06.78.78,0,0,0,.26-.34c-.7,0-1.39.07-2.08.12a.63.63,0,0,0,.33.09A3,3,0,0,0,114.57,33.71Z"/><path class="cls-3" d="M100.19,44.77s0-.05,0-.08a1,1,0,0,0,0-.3.36.36,0,0,0,.19-.07.3.3,0,0,0,.1.14l.08,0,.75-.4a.94.94,0,0,0-.07-.22c-.73.25-1.47.53-2.25.86a2.83,2.83,0,0,1-.06.42.82.82,0,0,0,0,.44A12.76,12.76,0,0,1,100.19,44.77Z"/><path class="cls-3" d="M97.61,45.77l-.06.06c-.06.11-.14.24-.08.34s.41.14.53,0,0-.24,0-.34a.25.25,0,0,0-.22-.1.41.41,0,0,0,.12-.09.38.38,0,0,0,0-.36l-.88.43a.28.28,0,0,0,.1.09A.85.85,0,0,0,97.61,45.77Z"/><path class="cls-3" d="M86,55.27a3.07,3.07,0,0,0,.72.31.76.76,0,0,0,.75-.43c.06-.16.07-.54-.27-.59-.55.2-.55-.22-1-.2a.61.61,0,0,0-.19.06A.47.47,0,0,0,86,55.27Z"/><path class="cls-3" d="M87,53c.06.07.3.17.4.1s0-.21,0-.32a.28.28,0,0,0,0-.32.33.33,0,0,0-.26-.13.5.5,0,0,0-.28.27.23.23,0,0,0,0,.18A.38.38,0,0,0,87,53Z"/><path class="cls-3" d="M87.38,52.08a.53.53,0,0,0,.32.1.74.74,0,0,0,.52-.21l.08.06a.56.56,0,0,0,.77-.12.28.28,0,0,0,.23.1.26.26,0,0,0,.37,0,.35.35,0,0,0,.15-.43.3.3,0,0,0-.26-.21h0a.34.34,0,0,0-.38-.07l-.11-.24.45-.23a1.9,1.9,0,0,0,0-.41.18.18,0,0,0,0-.09c-.79.59-1.56,1.22-2.31,1.87a.3.3,0,0,0,.15-.07S87.36,52.1,87.38,52.08Z"/><path class="cls-3" d="M85.54,57.13a.73.73,0,0,0,.87-.26c.12-.19,0-.53-.28-.66a.5.5,0,0,0-.71.23A.49.49,0,0,0,85.54,57.13Z"/><path class="cls-3" d="M90.89,50.36a1.28,1.28,0,0,0,1-1c0-.26-.21-.41-.33-.51q-.7.48-1.41,1A.79.79,0,0,0,90.89,50.36Z"/><path class="cls-3" d="M91.59,53.83a.3.3,0,0,0,.15.44.4.4,0,0,0,.51-.15.39.39,0,0,0-.18-.5A.37.37,0,0,0,91.59,53.83Z"/><path class="cls-3" d="M92.53,50.73a.67.67,0,0,0,.69-1.16s0,0-.07,0a.63.63,0,0,0-.1-.3.87.87,0,0,0,.68-.44.76.76,0,0,0-.27-1.06s0,0-.06,0l-1,.65a.67.67,0,0,0,.12.65l-.06,0c-.13.12,0,.41.07.54l0,0a1.08,1.08,0,0,0-.18.23A.57.57,0,0,0,92.53,50.73Z"/><path class="cls-3" d="M89.09,53.31a.58.58,0,0,0,.11.75.7.7,0,0,0,.78-.23.52.52,0,1,0-.89-.52Z"/><ellipse class="cls-4" cx="124.56" cy="71.65" rx="23.77" ry="22.91"/><circle class="cls-5" cx="32.54" cy="34.28" r="1.93"/><circle class="cls-5" cx="223.42" cy="67.02" r="1.93"/><path class="cls-6" d="M145,86.21c.35-.52,33.13,20.58,33.66,20.93a1.14,1.14,0,0,1-1.26,1.9C176.84,108.69,144.62,86.74,145,86.21Z"/><path class="cls-6" d="M140.63,50.56c-.49-.39,23.57-31.07,24-31.56a1.14,1.14,0,1,1,1.77,1.43C166,20.92,141.12,51,140.63,50.56Z"/><path class="cls-6" d="M87.44,93.64c.21.59-36.2,14.52-36.79,14.74a1.14,1.14,0,0,1-.79-2.14C50.45,106,87.22,93.05,87.44,93.64Z"/><path class="cls-6" d="M100.59,92.3c.31.55-33.15,20.56-33.69,20.88a1.14,1.14,0,0,1-1.15-2C66.3,110.89,100.27,91.76,100.59,92.3Z"/><path class="cls-7" d="M204.47,18.65c-5.1,0-7.1,2-7.1,7.1,0-5.1-2-7.1-7.09-7.1,5.09,0,7.09-2,7.09-7.1C197.37,16.65,199.37,18.65,204.47,18.65Z"/><path class="cls-7" d="M68.84,18.65c-3.93,0-5.48,1.55-5.48,5.48,0-3.93-1.54-5.48-5.48-5.48,3.94,0,5.48-1.55,5.48-5.48C63.36,17.1,64.91,18.65,68.84,18.65Z"/><path class="cls-7" d="M184.17,79.21c-4.61,0-6.43,1.81-6.43,6.42,0-4.61-1.81-6.42-6.42-6.42,4.61,0,6.42-1.81,6.42-6.43C177.74,77.4,179.56,79.21,184.17,79.21Z"/><path class="cls-7" d="M55.68,124.7c-5.66,0-7.89,2.22-7.89,7.89,0-5.67-2.22-7.89-7.89-7.89,5.67,0,7.89-2.23,7.89-7.89C47.79,122.47,50,124.7,55.68,124.7Z"/><rect class="cls-8" x="90.25" y="33.05" width="3.26" height="3.26" transform="translate(-2.21 62.83) rotate(-37.34)"/><rect class="cls-5" x="121.32" y="112.16" width="3.45" height="3.45" transform="translate(-31.7 49.35) rotate(-20.15)"/><rect class="cls-5" x="182.53" y="5.79" width="3.45" height="3.45" transform="translate(8.69 63.92) rotate(-20.15)"/><polygon class="cls-9" points="157.62 75.65 156.7 74.28 155.06 74.38 154.32 75.86 155.24 77.23 156.88 77.13 157.62 75.65"/><polygon class="cls-8" points="190.14 106.28 194.69 112.2 199.53 108.06 190.14 106.28"/><polygon class="cls-8" points="35.22 67.85 35.44 73.39 44.44 71.26 35.22 67.85"/><polygon class="cls-5" points="70.39 84.46 71.86 88.71 76.11 85.87 70.39 84.46"/><polygon class="cls-5" points="146.29 27.82 141.84 27.18 142.41 32.26 146.29 27.82"/><rect class="cls-2" x="103.66" y="49.81" width="3.16" height="3.16" transform="translate(-11.58 42.97) rotate(-21.9)"/><rect class="cls-2" x="126.85" y="95.84" width="2.46" height="2.46" transform="translate(-32.63 96.96) rotate(-37.12)"/><circle class="cls-9" cx="126.66" cy="56.78" r="1.21"/><circle class="cls-9" cx="109.51" cy="82.54" r="0.73"/><circle class="cls-9" cx="141.21" cy="61.97" r="0.48"/><circle class="cls-9" cx="127.33" cy="88.64" r="0.48"/><circle class="cls-2" cx="121.37" cy="71.16" r="0.48"/><circle class="cls-2" cx="129.94" cy="75.81" r="1.21"/><circle class="cls-2" cx="110.91" cy="63.5" r="1.21"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/global_search_bar/public/assets/illustration_product_no_search_results_light.svg b/x-pack/plugins/global_search_bar/public/assets/illustration_product_no_search_results_light.svg
new file mode 100644
index 0000000000000..ac5298be17cca
--- /dev/null
+++ b/x-pack/plugins/global_search_bar/public/assets/illustration_product_no_search_results_light.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 140"><defs><style>.cls-1{fill:#e6ebf2;}.cls-2{fill:#0a89db;}.cls-3{fill:#1c1e23;}.cls-4{fill:#00bfb3;}.cls-5{fill:#fec514;}.cls-6{fill:#ff957d;}.cls-7{fill:#f04e98;}.cls-8{fill:#7de2d1;}.cls-9{fill:#294492;}</style></defs><g id="Layer_1" data-name="Layer 1"><path class="cls-1" d="M80.64,19.05a.66.66,0,0,0-.13.76.61.61,0,0,0,.72.08.46.46,0,0,0,.13-.53C81.17,19.05,80.84,18.91,80.64,19.05Z"/><path class="cls-1" d="M80.8,21.08a.36.36,0,0,0-.07.49.72.72,0,0,0,.33.29l.5-.22a1,1,0,0,0,0-.56C81.53,20.87,81,20.85,80.8,21.08Z"/><path class="cls-1" d="M80.31,18c.15.15.39.05.51,0s.11-.24,0-.37-.32-.2-.41-.07S80.16,17.81,80.31,18Z"/><path class="cls-1" d="M81.86,17.28a.51.51,0,0,0,.67.2.77.77,0,0,0,.18-.93.52.52,0,0,0-.66-.07A.54.54,0,0,0,81.86,17.28Z"/><path class="cls-1" d="M85,18.35a.59.59,0,0,0,.2-.88.63.63,0,0,0-.81-.25c-.27.14-.32.63-.11,1A.48.48,0,0,0,85,18.35Z"/><path class="cls-1" d="M82.43,19.18a.8.8,0,0,0,1,.31.83.83,0,0,0,.25-1c-.17-.32-.62-.38-1-.14A.62.62,0,0,0,82.43,19.18Z"/><path class="cls-1" d="M84.52,20.42s0,0,0,0c-.12-.16-.27-.15-.43,0a.38.38,0,0,0-.18.31Z"/><path class="cls-1" d="M76.75,23.79a.25.25,0,0,0,.06-.41.46.46,0,0,0-.34-.14c-.1,0-.28.33-.19.47A.33.33,0,0,0,76.75,23.79Z"/><path class="cls-1" d="M74.9,21.3c.16-.07.08-.3,0-.37a.21.21,0,0,0-.28-.1.23.23,0,0,0-.07.29C74.61,21.19,74.75,21.37,74.9,21.3Z"/><path class="cls-1" d="M74.53,24.76c.1,0,.17-.18.17-.24a.24.24,0,0,0-.17-.19c-.08,0-.16.11-.18.18A.28.28,0,0,0,74.53,24.76Z"/><path class="cls-1" d="M74.7,23.78a.38.38,0,0,0,.41.27.3.3,0,0,0,.31-.26c0-.28-.14-.4-.38-.52C74.85,23.42,74.62,23.51,74.7,23.78Z"/><path class="cls-1" d="M79.91,18.26a.42.42,0,0,0,.06-.34.3.3,0,0,0-.46-.06.64.64,0,0,0-.07.28C79.59,18.34,79.81,18.38,79.91,18.26Z"/><path class="cls-1" d="M75.8,23.28a.56.56,0,0,0,.13-.41c0-.14-.33-.19-.45-.07s-.09.22-.12.29C75.5,23.32,75.71,23.4,75.8,23.28Z"/><path class="cls-1" d="M73.4,21.57c.23.26.64,0,.63-.2s-.34-.43-.51-.34S73.17,21.32,73.4,21.57Z"/><path class="cls-1" d="M73.37,19.17c.12-.09,0-.23,0-.29a.24.24,0,0,0-.23,0,.27.27,0,0,0,0,.24S73.24,19.27,73.37,19.17Z"/><path class="cls-1" d="M77.34,22.59a.66.66,0,0,0,.74.65l.1,0,.24-.12c.16-.17.18-.4.41-.33a.27.27,0,0,1,.12.07l1-.46c-.09-.06-.17-.09-.17-.14s.09-.45-.19-.51c-.58-.14-.56.42-.75.43S78.3,22,78,22,77.3,22.19,77.34,22.59Z"/><path class="cls-1" d="M77.42,20.93c.1.18.51.22.75.08a.45.45,0,0,0,.2-.62.6.6,0,0,0-.76-.25A.64.64,0,0,0,77.42,20.93Z"/><path class="cls-1" d="M79.38,20c.13-.11.08-.42,0-.52a.29.29,0,0,0-.44,0,.23.23,0,0,0,0,.38C79,19.87,79.26,20.08,79.38,20Z"/><path class="cls-1" d="M77.06,19.1c.08-.15.37-.32.28-.5s-.39-.12-.56-.18l-.08.09a.35.35,0,0,0,.09.41A.44.44,0,0,0,77.06,19.1Z"/><path class="cls-1" d="M77.07,19.39s0,.09,0,.1.09.09.14.07,0-.08,0-.13S77.1,19.38,77.07,19.39Z"/><path class="cls-1" d="M73.53,24.37c.08-.14-.18-.58-.39-.53a.37.37,0,0,0-.26.41C72.94,24.46,73.45,24.52,73.53,24.37Z"/><path class="cls-1" d="M65.58,31.11c.13-.09.09-.3-.06-.42s-.32-.13-.41,0-.23.38,0,.52S65.46,31.19,65.58,31.11Z"/><path class="cls-1" d="M60.51,36a.67.67,0,0,0,.06-.81.65.65,0,0,0-.85,0,.67.67,0,0,0,.15.88A.45.45,0,0,0,60.51,36Z"/><path class="cls-1" d="M82.63,21a.32.32,0,0,0,.14-.46.35.35,0,0,0-.5-.14.39.39,0,0,0-.12.52A.36.36,0,0,0,82.63,21Z"/><path class="cls-1" d="M58.44,38.1a.36.36,0,0,0-.36-.26c-.18,0-.22.16-.13.54A.33.33,0,0,0,58.44,38.1Z"/><path class="cls-1" d="M56.15,42.72a.27.27,0,0,0-.42.06.53.53,0,0,0-.08.6l0,0c0,.07,0,.17,0,.24a.08.08,0,0,0,.08,0c.17-.28.36-.56.53-.84A.68.68,0,0,0,56.15,42.72Z"/><path class="cls-1" d="M56.74,41.7a.37.37,0,0,0,0,.39c.11-.18.22-.37.34-.55A.55.55,0,0,0,56.74,41.7Z"/><path class="cls-1" d="M49.84,57.68a.49.49,0,0,0-.13.42c0,.09.13.18.23.22.06-.24.1-.48.16-.72A.37.37,0,0,0,49.84,57.68Z"/><path class="cls-1" d="M73.46,24.64s0,.18,0,.2.19.14.28.05,0-.23,0-.24A.29.29,0,0,0,73.46,24.64Z"/><path class="cls-1" d="M106.1,30.08a.39.39,0,0,0,.2,0s.08-.16.06-.19a.31.31,0,0,0-.23-.08s0,0-.07,0Z"/><path class="cls-1" d="M50.19,53.75a.26.26,0,0,0-.09-.41.44.44,0,0,0-.37,0c-.09.05-.15.4,0,.5A.35.35,0,0,0,50.19,53.75Z"/><path class="cls-1" d="M52,46.87c.12-.13,0-.27-.11-.36a.26.26,0,0,0-.41.07c0,.12-.14.37.05.46S51.91,47,52,46.87Z"/><path class="cls-1" d="M51.56,51.51c-.17.07-.54,0-.79.09s-.62.45-.44.82a.66.66,0,0,0,.92.35c.49-.21.19-.68.54-.69.15-.41.28-.81.44-1.21a.35.35,0,0,0-.11,0C51.52,50.92,51.73,51.43,51.56,51.51Z"/><path class="cls-1" d="M50.75,47.23a.5.5,0,0,0,0,.28c.21.14.43.11.48,0a.45.45,0,0,0,0-.34A.31.31,0,0,0,50.75,47.23Z"/><path class="cls-1" d="M50.76,48.87a.23.23,0,0,0,.11.36c.1.06.4.17.48,0s-.07-.42-.17-.5S50.87,48.71,50.76,48.87Z"/><path class="cls-1" d="M53.05,48.55A.46.46,0,0,0,53,48c-.29-.22-.65-.25-.79,0a.65.65,0,0,0,.14.76A.6.6,0,0,0,53.05,48.55Z"/><path class="cls-1" d="M71.39,25.93a.37.37,0,0,0-.49.06.41.41,0,0,0,0,.53.19.19,0,0,0,.1.05.77.77,0,0,0-.11.83.2.2,0,0,0,.08.08l1-.71a1.34,1.34,0,0,0-.07-.18.62.62,0,0,0-.5-.28A.48.48,0,0,0,71.39,25.93Z"/><path class="cls-1" d="M65.08,26.93c0-.06.12-.21,0-.26a.26.26,0,0,0-.26,0c0,.05-.11.25,0,.3A.22.22,0,0,0,65.08,26.93Z"/><path class="cls-1" d="M65.31,24.29c.11-.11,0-.23-.09-.29a.23.23,0,0,0-.2,0,.29.29,0,0,0,0,.24A.22.22,0,0,0,65.31,24.29Z"/><path class="cls-1" d="M63.56,28.38c-.29.26-.3.45,0,.73s.43.43.64.64c-.37.42-.36.49.06.71.27-.12.3-.32.19-.58.55-.42.46-.81-.21-1.1a.71.71,0,0,1,0-.14c0-.21-.09-.3-.26-.37A.37.37,0,0,0,63.56,28.38Z"/><path class="cls-1" d="M65.42,25.67a.2.2,0,0,0,.3-.08.22.22,0,0,0-.08-.27.19.19,0,0,0-.27,0A.21.21,0,0,0,65.42,25.67Z"/><path class="cls-1" d="M64.13,33.09a.91.91,0,0,0-.91.3.56.56,0,0,0,0,.64Z"/><path class="cls-1" d="M63.75,27.92c.17-.22.1-.36,0-.45s-.3-.14-.38,0a.41.41,0,0,0,0,.39C63.47,28,63.65,27.91,63.75,27.92Z"/><path class="cls-1" d="M53.45,45.83a.76.76,0,0,0-.15-.93.56.56,0,0,0-.55,1A.51.51,0,0,0,53.45,45.83Z"/><path class="cls-1" d="M61.92,32.22a.48.48,0,0,0,.72-.15.63.63,0,0,0-.17-.94.65.65,0,0,0-.84.16A.72.72,0,0,0,61.92,32.22Z"/><path class="cls-1" d="M71.26,24.25a.56.56,0,0,0,.22-.61.37.37,0,0,0-.08-.18.24.24,0,0,0,0-.22c-.07-.08-.27-.27-.45-.14a.19.19,0,0,0-.08.19c-.19,0-.44,0-.53.15s.11.33.15.45C70.6,24.22,71,24.41,71.26,24.25Z"/><path class="cls-1" d="M69,27.19c.09.06.3-.11.32-.17a.27.27,0,0,0-.12-.26.29.29,0,0,0-.27.1A.3.3,0,0,0,69,27.19Z"/><path class="cls-1" d="M66.92,30.25a.8.8,0,0,0,.27.12l.66-.55a.75.75,0,0,0-.29-.67.76.76,0,0,0-.89.17C66.46,29.6,66.57,30,66.92,30.25Z"/><path class="cls-1" d="M68.92,24.41a.38.38,0,0,0,0-.49.33.33,0,0,0-.48,0,.39.39,0,0,0,0,.5A.32.32,0,0,0,68.92,24.41Z"/><path class="cls-1" d="M68.26,27.16a.63.63,0,0,0,0-.84.56.56,0,0,0-.69.19.52.52,0,0,0,.15.68C67.93,27.36,68.12,27.34,68.26,27.16Z"/><path class="cls-1" d="M69.44,28.55l0,0,.57-.44a.49.49,0,0,0-.32-.31.41.41,0,0,0-.3.73Z"/><path class="cls-1" d="M54.93,41.6A.33.33,0,0,0,55,42c.21.24.34.25.67.08.25.07.46.16.68.2a.24.24,0,0,0,.26-.37c-.16-.21-.27-.48-.58-.55l-.33.18C55.36,41.42,55,41.43,54.93,41.6Z"/><path class="cls-1" d="M54.8,40.5a.33.33,0,0,0,.45-.31c0-.11-.25-.2-.4-.28a.14.14,0,0,0-.22.05A.45.45,0,0,0,54.8,40.5Z"/><path class="cls-1" d="M56.34,36.18a.36.36,0,0,0-.36-.26.32.32,0,0,0-.14.54A.33.33,0,0,0,56.34,36.18Z"/><path class="cls-1" d="M54.2,46.47l.1-.17a1,1,0,0,0-.43.3.59.59,0,0,0-.06.69Z"/><path class="cls-1" d="M56.87,39c.07-.09,0-.23-.06-.25s-.16-.11-.25,0a.14.14,0,0,0,0,.21C56.64,39,56.8,39.07,56.87,39Z"/><path class="cls-1" d="M55.08,43.77c.08-.17-.26-.68-.48-.67s-.31.52-.13.68S55,43.93,55.08,43.77Z"/><path class="cls-1" d="M58.91,31.58a.44.44,0,0,0,0-.54.53.53,0,0,0-.67,0,.59.59,0,0,0,0,.72C58.34,31.91,58.68,31.83,58.91,31.58Z"/><path class="cls-1" d="M61.24,29.65c0-.24,0-.47-.23-.56a.32.32,0,0,0-.42.17.45.45,0,0,0,0,.36C60.76,29.86,61,29.8,61.24,29.65Z"/><path class="cls-1" d="M60.46,33.57a.65.65,0,0,0-.06-.81.59.59,0,0,0-.75.1c-.19.21-.14.44.14.67S60.34,33.71,60.46,33.57Z"/><path class="cls-1" d="M57.47,40.76a.33.33,0,0,0,0-.47.29.29,0,0,0-.43.07.27.27,0,0,0,0,.39A.28.28,0,0,0,57.47,40.76Z"/><path class="cls-1" d="M61.84,35.46l.45-.51A.78.78,0,0,0,62,34.5a.37.37,0,0,0-.51.12.52.52,0,0,0,0,.74A.67.67,0,0,0,61.84,35.46Z"/><path class="cls-1" d="M57.47,35.79c0,.07,0,.15-.07.23a.74.74,0,0,0,.28.77.87.87,0,0,0,.84,0,.44.44,0,0,0,.19-.27.68.68,0,0,0-.48-.83L58,35.6a4.28,4.28,0,0,0,.14-.43c.07-.27,0-.39-.25-.5a.55.55,0,0,0-.63.13.48.48,0,0,0-.07.59A2.43,2.43,0,0,0,57.47,35.79Z"/><path class="cls-1" d="M51.91,83.2a.29.29,0,0,0,.33-.27.33.33,0,0,0-.33-.34.3.3,0,0,0-.28.33A.27.27,0,0,0,51.91,83.2Z"/><path class="cls-1" d="M54.58,89.62a.83.83,0,0,0-.74-.72c-.37,0-.64.34-.65.82a.61.61,0,0,0,.61.63A.8.8,0,0,0,54.58,89.62Z"/><path class="cls-1" d="M54.25,85.16a2.81,2.81,0,0,0,0-.58c0-.16-.1-.22-.28-.21s-.11.09-.11.13a.84.84,0,0,1-.23.47.4.4,0,0,0,.08.34.44.44,0,0,0,.35.1C54.14,85.4,54.23,85.25,54.25,85.16Z"/><path class="cls-1" d="M53.73,87.07a.63.63,0,0,0-.62.58c0,.3.38.59.78.58a.48.48,0,0,0,.5-.54A.59.59,0,0,0,53.73,87.07Z"/><path class="cls-1" d="M52.59,86.13c.22,0,.51-.26.5-.44s-.29-.42-.62-.41-.28.14-.29.32S52.39,86.14,52.59,86.13Z"/><path class="cls-1" d="M52.7,84.44a.43.43,0,0,0,.39-.37c0-.17-.26-.44-.4-.43a.53.53,0,0,0-.41.48A.37.37,0,0,0,52.7,84.44Z"/><path class="cls-1" d="M53.32,83.24c0,.28.21.43.55.41s.42-.21.39-.55-.15-.4-.34-.4A.81.81,0,0,0,53.32,83.24Z"/><path class="cls-1" d="M52.24,93.46a.23.23,0,0,0,.32.21c.11,0,.41-.12.38-.29s-.32-.27-.44-.27S52.22,93.26,52.24,93.46Z"/><path class="cls-1" d="M88.41,130.26a1,1,0,0,0,0-.2l-.7-.29a.36.36,0,0,0,0,.36C87.94,130.37,88.18,130.3,88.41,130.26Z"/><path class="cls-1" d="M53.41,98.18c0,.11.15.19.19.25.27,0,.45-.14.39-.29a.59.59,0,0,0-.29-.31C53.56,97.77,53.37,98,53.41,98.18Z"/><path class="cls-1" d="M55.14,91.46a.33.33,0,0,0,.31-.37.31.31,0,0,0-.32-.35.36.36,0,0,0-.38.36A.39.39,0,0,0,55.14,91.46Z"/><path class="cls-1" d="M53.41,91.37c-.37,0-.65.21-.64.46a.69.69,0,0,0,.6.5.62.62,0,0,0,.43-.58A.46.46,0,0,0,53.41,91.37Z"/><path class="cls-1" d="M55,93c.26,0,.56-.17.58-.37,0-.4-.36-.55-.56-.61s-.47.34-.4.67A.37.37,0,0,0,55,93Z"/><path class="cls-1" d="M51.38,92.41c.26,0,.4-.2.34-.34a.42.42,0,0,0-.26-.23c-.15,0-.33.21-.27.37S51.34,92.37,51.38,92.41Z"/><path class="cls-1" d="M51.44,98.71c-.14-.08-.54.07-.55.26s.07.46.41.39S51.59,98.79,51.44,98.71Z"/><path class="cls-1" d="M50.72,94.45c-.2,0-.3.28-.43.4l0,.11a.32.32,0,0,0,.39.13A.42.42,0,0,0,51,95C50.93,94.81,50.92,94.47,50.72,94.45Z"/><path class="cls-1" d="M51.72,102c-.1,0-.36.09-.34.31s.27.21.36.19a.35.35,0,0,0,.24-.23A.23.23,0,0,0,51.72,102Z"/><path class="cls-1" d="M50.69,91.09a.45.45,0,0,0-.36-.5.46.46,0,0,0-.43.4c0,.18.27.36.61.36C50.55,91.3,50.68,91.2,50.69,91.09Z"/><path class="cls-1" d="M53.79,100.66c-.08-.15-.6-.14-.66.07a.38.38,0,0,0,.22.43C53.57,101.21,53.87,100.8,53.79,100.66Z"/><path class="cls-1" d="M53.67,105.59a.27.27,0,0,0-.05.28.33.33,0,0,0,.32.1c.1,0,.06-.31,0-.36A.26.26,0,0,0,53.67,105.59Z"/><path class="cls-1" d="M52.79,94.47c-.32,0-.63.28-.6.53a.64.64,0,0,0,.58.56c.21,0,.45-.33.45-.61A.44.44,0,0,0,52.79,94.47Z"/><path class="cls-1" d="M55.1,96.16c.25-.49-.28-.65,0-.89s.37.11.72-.25.24-.88-.1-1-.54.18-.61.14-.35-.3-.55-.09c-.4.43.08.69,0,.86s-.41.35-.55.58a.6.6,0,0,0,.18.91A.66.66,0,0,0,55.1,96.16Z"/><path class="cls-1" d="M50.16,83.91c-.07-.08-.32,0-.48,0a.15.15,0,0,0-.14.18.46.46,0,0,0,.48.31A.33.33,0,0,0,50.16,83.91Z"/><path class="cls-1" d="M54.58,97.32a.49.49,0,0,0-.29.23c0,.1.14.41.31.4a.35.35,0,0,0,.31-.37A.26.26,0,0,0,54.58,97.32Z"/><path class="cls-1" d="M51.61,90.92c-.18,0-.34.17-.27.32s.12.38.33.32.24-.3.25-.43S51.76,90.91,51.61,90.92Z"/><path class="cls-1" d="M51.51,98.11c.07,0,.29,0,.31-.19s-.22-.22-.3-.21-.23.05-.23.19S51.43,98.1,51.51,98.11Z"/><path class="cls-1" d="M51.86,89.88c.3,0,.54-.25.52-.47a.76.76,0,0,0-.71-.63.54.54,0,0,0-.4.54A.53.53,0,0,0,51.86,89.88Z"/><path class="cls-1" d="M49,98c-.06,0-.15.14-.13.19a.23.23,0,0,0,.18.16c.06,0,.22,0,.2-.21S49,98,49,98Z"/><path class="cls-1" d="M49.11,88.12a.19.19,0,0,0-.15.15c0,.07.12.14.2.15s.2,0,.2-.16S49.18,88.12,49.11,88.12Z"/><path class="cls-1" d="M48.38,92.64A.35.35,0,0,0,48,93c0,.22.15.35.34.34s.51-.23.49-.4S48.57,92.64,48.38,92.64Z"/><path class="cls-1" d="M48.4,88.57c0-.1-.12-.16-.18-.17s-.26.07-.26.16.19.18.25.18S48.4,88.66,48.4,88.57Z"/><path class="cls-1" d="M51.46,95.09c0-.06-.06-.06-.09-.1s-.09.06-.1.1,0,.09.07.08S51.46,95.14,51.46,95.09Z"/><path class="cls-1" d="M64.28,115.12a.5.5,0,0,0,.09.44.41.41,0,0,0,.39.06.43.43,0,0,0,.13-.65A.38.38,0,0,0,64.28,115.12Z"/><path class="cls-1" d="M62.66,111.52a.26.26,0,0,0-.27-.32.43.43,0,0,0-.33.18c-.05.09.06.42.23.44A.33.33,0,0,0,62.66,111.52Z"/><path class="cls-1" d="M63.25,109.28c.2-.12.28,0,.43,0-.28-.48-.55-1-.81-1.42a1.24,1.24,0,0,0-.27,0,.9.9,0,0,0-.6,1c.1.29.49.21.63,0s.1-.11.15-.11a.16.16,0,0,1,0,.12c-.11.14-.47.26-.65.47s-.32.69,0,.92a.65.65,0,0,0,1-.14C63.44,109.72,62.94,109.47,63.25,109.28Z"/><path class="cls-1" d="M64.67,111c-.2,0-.44.25-.46.5a.47.47,0,0,0,.47.56c.3,0,.54-.11.55-.35a.31.31,0,0,0,0-.08c-.13-.19-.27-.38-.39-.58A.44.44,0,0,0,64.67,111Z"/><path class="cls-1" d="M60,101.92c-.46-1.12-.88-2.25-1.26-3.36-.23,0-.46.23-.46.41a.69.69,0,0,0,.56.59l.11,0a.82.82,0,0,0-.11.3,1.18,1.18,0,0,0,.21.78.63.63,0,0,1,.07.3c0,.39.15.59.54.59a.39.39,0,0,0,0,.14C59.66,101.79,59.83,101.9,60,101.92Z"/><path class="cls-1" d="M68.57,116.84c0,.3.12.59.34.61a.71.71,0,0,0,.57-.36c-.21-.23-.4-.46-.6-.7A.48.48,0,0,0,68.57,116.84Z"/><path class="cls-1" d="M60.82,109.17s0,0,.09,0h0c.21,0,.51-.24.56-.52a.46.46,0,0,0-.35-.56c-.3,0-.66.17-.68.42a.68.68,0,0,0,.19.49.05.05,0,0,0,0,0C60.62,109.09,60.74,109.15,60.82,109.17Z"/><path class="cls-1" d="M62.13,115.56c.09.12.67-.16.7-.32s-.28-.33-.56-.26S62.05,115.44,62.13,115.56Z"/><path class="cls-1" d="M73.13,122.42a.35.35,0,0,0,.44-.28.37.37,0,0,0-.29-.43.45.45,0,0,0-.46.29A.36.36,0,0,0,73.13,122.42Z"/><path class="cls-1" d="M79.4,127.62a.37.37,0,0,0,0,.45c.17.11.56-.14.53-.3S79.52,127.46,79.4,127.62Z"/><path class="cls-1" d="M79.89,126.24a.51.51,0,0,0-.37.11c-.13.18,0,.32.15.45s.39-.09.39-.33C80.06,126.39,80,126.24,79.89,126.24Z"/><path class="cls-1" d="M72.54,120.31a.47.47,0,0,0-.41.4.4.4,0,0,0,.37.39.32.32,0,0,0,.23-.07.1.1,0,0,0,0,0c0,.06.16.13.24.08a.2.2,0,0,0,.06-.24.35.35,0,0,0-.17-.13,0,0,0,0,0,0,0A.37.37,0,0,0,72.54,120.31Z"/><path class="cls-1" d="M59.7,106.31c0-.09-.11-.16-.18-.17s-.26.08-.25.17.18.18.24.17S59.7,106.41,59.7,106.31Z"/><path class="cls-1" d="M69.06,118.39a.35.35,0,0,0,.27.4.34.34,0,0,0,.43-.28.39.39,0,0,0-.32-.47A.36.36,0,0,0,69.06,118.39Z"/><path class="cls-1" d="M73.8,121.8a.24.24,0,0,0-.07.4.93.93,0,0,0,.32.15.38.38,0,0,0,.09-.53C74,121.69,73.92,121.73,73.8,121.8Z"/><path class="cls-1" d="M59.11,107.69c-.2-.06-.35.22-.5.31l0,.12a.34.34,0,0,0,.36.2.45.45,0,0,0,.31-.09C59.25,108.07,59.3,107.74,59.11,107.69Z"/><path class="cls-1" d="M57.67,101.61a.21.21,0,0,0,.21-.13c0-.09-.08-.18-.15-.2s-.26,0-.28.12S57.6,101.61,57.67,101.61Z"/><path class="cls-1" d="M56.88,94.55a.66.66,0,0,0,.61.6.27.27,0,0,0,.19-.11c-.08-.32-.18-.64-.26-1A.61.61,0,0,0,56.88,94.55Z"/><path class="cls-1" d="M57.71,101.24a.44.44,0,0,0,0-.67.38.38,0,0,0-.57.27.49.49,0,0,0,.17.41A.42.42,0,0,0,57.71,101.24Z"/><path class="cls-1" d="M57.47,97.34a.73.73,0,0,0-.67-.6.56.56,0,0,0-.37.57.47.47,0,0,0,.56.47C57.3,97.75,57.5,97.57,57.47,97.34Z"/><path class="cls-1" d="M55,99.17a.47.47,0,0,0,.39.77,2.92,2.92,0,0,0,.78-.09.74.74,0,0,0,.45-.74c0-.17-.11-.29-.27-.3a2.1,2.1,0,0,0-1.21.22A.6.6,0,0,0,55,99.17Z"/><path class="cls-1" d="M61.94,113.84c.08-.08,0-.25-.06-.28a.27.27,0,0,0-.26,0c-.07.06,0,.2,0,.26A.27.27,0,0,0,61.94,113.84Z"/><path class="cls-1" d="M61.66,111.91a.62.62,0,0,0-.23-.37c-.13-.07-.36.12-.35.3s.11.21.14.27C61.49,112.16,61.69,112.06,61.66,111.91Z"/><path class="cls-1" d="M60.52,105.52a.44.44,0,0,0-.21-.27c-.15-.06-.37.15-.34.31a.76.76,0,0,0,.15.24C60.38,105.81,60.55,105.68,60.52,105.52Z"/><path class="cls-1" d="M55.09,84.12c0,.29.24.44.61.4h0c0-.35-.07-.7-.1-1a.21.21,0,0,0-.1,0C55.27,83.46,55.07,83.8,55.09,84.12Z"/><path class="cls-1" d="M60.55,105c.21,0,.3-.26.33-.39s-.11-.24-.27-.26-.35.11-.32.27S60.35,105,60.55,105Z"/><path class="cls-1" d="M61,106.19a1.26,1.26,0,0,0,.28-.2.38.38,0,0,0-.41-.35c-.17,0-.19.15-.18.29S60.82,106.25,61,106.19Z"/><path class="cls-1" d="M56,89.89a.33.33,0,0,0,.29-.38.39.39,0,0,0-.42-.33.29.29,0,0,0-.26.35A.37.37,0,0,0,56,89.89Z"/><path class="cls-1" d="M60.9,104.25a.25.25,0,0,0,.25.27c-.08-.15-.14-.31-.21-.46A.38.38,0,0,0,60.9,104.25Z"/><path class="cls-1" d="M56.53,92.85c.08.12.39.08.6,0-.12-.52-.23-1-.34-1.54-.4,0-.7.43-.54.69s.36.24.34.35S56.4,92.69,56.53,92.85Z"/><path class="cls-1" d="M55,86.25a.61.61,0,0,0,.37.52c.14,0,.41-.19.45-.37a.29.29,0,0,0-.28-.33C55.21,86,55,86.11,55,86.25Z"/><path class="cls-1" d="M58.66,101.17a.18.18,0,0,0-.17.12c0,.07.09.15.16.19s.21,0,.23-.12S58.73,101.19,58.66,101.17Z"/><path class="cls-1" d="M61.05,107.25c.12,0,.43,0,.43-.21s-.27-.34-.39-.36-.29.11-.31.3A.23.23,0,0,0,61.05,107.25Z"/><path class="cls-1" d="M81.66,128.84a.52.52,0,1,0-.55-.87c-.25.17-.38.53-.25.72A.72.72,0,0,0,81.66,128.84Z"/><path class="cls-1" d="M85.2,129.3a.64.64,0,0,0,.29-.53l-.92-.43h0a.58.58,0,0,0-.14.75A.62.62,0,0,0,85.2,129.3Z"/><path class="cls-1" d="M76.73,127.17a.38.38,0,0,0-.12.51.35.35,0,0,0,.5.15.37.37,0,0,0,.14-.5A.45.45,0,0,0,76.73,127.17Z"/><path class="cls-1" d="M80.08,125.89a.61.61,0,0,0,.32.43.69.69,0,0,0,.53.06Z"/><path class="cls-1" d="M77.55,125.74a.27.27,0,0,0-.21-.16.29.29,0,0,0-.27.13.4.4,0,0,0,0,.34l.08,0a.41.41,0,0,0,.06.24.36.36,0,0,0,.52.07.37.37,0,0,0,.11-.54A.4.4,0,0,0,77.55,125.74Z"/><path class="cls-1" d="M54.62,100c.06-.08-.06-.24-.12-.26a.23.23,0,0,0-.25,0c0,.06,0,.2.07.25S54.56,100.07,54.62,100Z"/><path class="cls-1" d="M75.58,125.91c-.16.1-.07.35,0,.46a.24.24,0,0,0,.34.16c.17-.08.28-.32.17-.43S75.73,125.8,75.58,125.91Z"/><path class="cls-1" d="M87.16,129.51l-.49-.2a.22.22,0,0,0-.11.05.35.35,0,0,0,0,.51c.12.13.24.28.4.18S87.24,129.68,87.16,129.51Z"/><path class="cls-1" d="M59.64,108.33s-.1,0-.11.08,0,.1,0,.1.13,0,.14-.07S59.67,108.38,59.64,108.33Z"/><path class="cls-1" d="M59.25,103a.51.51,0,0,0-.49.55.41.41,0,0,0,.33.38.45.45,0,0,0-.17.24c0,.18.2.4.53.46.06,0,.2-.12.23-.22a.48.48,0,0,0-.15-.5.31.31,0,0,0,.21-.32C59.73,103.34,59.43,103,59.25,103Z"/><path class="cls-1" d="M58.46,112.17c-.06.26,0,.45.33.45s.39-.51.26-.62S58.5,112,58.46,112.17Z"/><path class="cls-1" d="M60,119.17a.32.32,0,0,0-.1.27.33.33,0,0,0,.3.16c.1,0,.11-.29.08-.36A.31.31,0,0,0,60,119.17Z"/><path class="cls-1" d="M59.31,111c-.08,0-.24,0-.27.15s.1.21.18.24.3,0,.34-.13S59.38,111.05,59.31,111Z"/><path class="cls-1" d="M60.34,114.29a.4.4,0,0,0,.14.47c.21.09.58-.26.52-.42S60.44,114.1,60.34,114.29Z"/><path class="cls-1" d="M63.87,113a2.1,2.1,0,0,0-1.24,0,.85.85,0,0,0-.16.11.47.47,0,0,0,.25.82,2.9,2.9,0,0,0,.78.06.72.72,0,0,0,.57-.65C64.08,113.16,64,113,63.87,113Z"/><path class="cls-1" d="M62.26,117.77a.67.67,0,0,0-.59-.8.54.54,0,0,0-.65.43c-.06.38.26.88.58.9A.62.62,0,0,0,62.26,117.77Z"/><path class="cls-1" d="M56.73,110.89a.25.25,0,0,0-.17.16c0,.07.09.19.15.2s.23,0,.24-.17S56.8,110.9,56.73,110.89Z"/><path class="cls-1" d="M56.61,106.77a.8.8,0,0,0-.67.72.72.72,0,0,0,.67.71,1,1,0,0,0,.75-.81A.7.7,0,0,0,56.61,106.77Z"/><path class="cls-1" d="M55.15,101.06c-.26.12-.14.49,0,.59s.62-.28.63-.44S55.41,100.93,55.15,101.06Z"/><path class="cls-1" d="M64,117.68c0,.21-.05.47.25.55a.35.35,0,0,0,.44-.21.43.43,0,0,0,0-.35C64.5,117.48,64.33,117.5,64,117.68Z"/><path class="cls-1" d="M54.92,103.12a.54.54,0,0,0-.57.54c0,.39.42.82.73.78a.62.62,0,0,0,.56-.64A.67.67,0,0,0,54.92,103.12Z"/><path class="cls-1" d="M58.49,101.82a.38.38,0,0,0-.35-.39.39.39,0,0,0-.39.36.42.42,0,0,0,.39.42A.38.38,0,0,0,58.49,101.82Z"/><path class="cls-1" d="M58.74,115.24c-.1,0-.37,0-.4.24s.24.26.33.26a.32.32,0,0,0,.27-.18A.23.23,0,0,0,58.74,115.24Z"/><path class="cls-1" d="M57.13,105.48a.34.34,0,0,0-.4.33.31.31,0,0,0,.27.39c.23,0,.54-.13.55-.3S57.32,105.51,57.13,105.48Z"/><path class="cls-1" d="M57.3,103.41c.05.21,0,.47.34.49a.35.35,0,0,0,.4-.28.46.46,0,0,0-.1-.34C57.79,103.12,57.62,103.16,57.3,103.41Z"/><path class="cls-1" d="M71.09,123.3c-.06,0,0,.17,0,.24s.15.15.24.1,0-.22,0-.29A.19.19,0,0,0,71.09,123.3Z"/><path class="cls-1" d="M71.57,121.82c-.14,0-.45.06-.46.25s.22.27.33.31a.25.25,0,0,0,.35-.15C71.84,122.05,71.72,121.8,71.57,121.82Z"/><path class="cls-1" d="M75.59,123.88c-.18-.1-.37-.23-.57,0s-.32.29-.49.43a.3.3,0,0,0-.2.45.39.39,0,0,0,.53.19.94.94,0,0,1,.4-.07.56.56,0,0,0,.59-.24C76,124.46,75.78,124,75.59,123.88Z"/><path class="cls-1" d="M73.11,124.43a.89.89,0,0,0-1.19,0c-.2.23.07.53.29.56s.14,0,.22.26a.38.38,0,0,0,.56.23s.05,0,.07,0,.29-.32.27-.37l-.06-.16A.92.92,0,0,0,73.11,124.43Z"/><path class="cls-1" d="M71,124.39a.24.24,0,0,0-.21.11s0,.25.11.27.18-.15.21-.22S71.07,124.39,71,124.39Z"/><path class="cls-1" d="M74.4,124.05a.73.73,0,0,0,.71-.57c0-.22-.23-.48-.51-.5a.5.5,0,0,0-.57.48C74,123.77,74.16,124,74.4,124.05Z"/><path class="cls-1" d="M71.15,119.08a.6.6,0,0,0,.19-.06c-.28-.27-.54-.56-.81-.84a.59.59,0,0,0-.06.16s0,0,0,.07a.62.62,0,0,0-.39.07.7.7,0,0,0-.27.93,1,1,0,0,0,1.07.25A.62.62,0,0,0,71.15,119.08Z"/><path class="cls-1" d="M67.93,119.33a.38.38,0,0,0-.34-.42c-.18,0-.22.12-.24.25a.25.25,0,0,0,.26.32A1.19,1.19,0,0,0,67.93,119.33Z"/><path class="cls-1" d="M66.34,118.28a.77.77,0,0,0-.38-.67.5.5,0,0,0-.58.45c0,.23.15.44.48.5A.37.37,0,0,0,66.34,118.28Z"/><path class="cls-1" d="M65.66,120.77c-.07,0-.27,0-.28.12s.14.21.21.21.2,0,.21-.13S65.72,120.79,65.66,120.77Z"/><path class="cls-1" d="M67.51,116.4a.36.36,0,0,0-.36-.39h0a.7.7,0,0,0,.07-.37.64.64,0,0,1,.09-.5.6.6,0,0,0,.06-.55L67,114.1a.66.66,0,0,0-.33-.07h-.07a.63.63,0,0,0,.18-.22c-.16-.22-.34-.43-.5-.65-.24,0-.5.14-.53.32a.7.7,0,0,0,.45.69h.11a.56.56,0,0,0-.16.27,1.19,1.19,0,0,0,0,.81.44.44,0,0,1,0,.3.48.48,0,0,0,.43.68.27.27,0,0,0,0,.14c0,.16.18.33.4.36A.44.44,0,0,0,67.51,116.4Z"/><path class="cls-1" d="M65.14,115.89a.38.38,0,0,0-.44.28.43.43,0,0,0,.31.49.37.37,0,0,0,.41-.33A.37.37,0,0,0,65.14,115.89Z"/><path class="cls-1" d="M68.38,123a.89.89,0,0,0-.77.9c0,.31.44.29.61.15s.13-.08.34,0,.56,0,.56-.36A.76.76,0,0,0,68.38,123Z"/><path class="cls-1" d="M69.57,120.75c-.2.07-.41.13-.38.42s0,.43,0,.64a.31.31,0,0,0,.21.46.42.42,0,0,0,.49-.29,1.1,1.1,0,0,1,.2-.35.55.55,0,0,0,.2-.61C70.24,120.84,69.78,120.68,69.57,120.75Z"/><path class="cls-1" d="M67.07,120.52c-.18,0-.22.11-.24.25s.09.34.26.31a1.12,1.12,0,0,0,.31-.15A.36.36,0,0,0,67.07,120.52Z"/><path class="cls-1" d="M124.22,137.55c-.06,0-.23,0-.23.18s.19.13.26.14.15-.12.13-.15A.27.27,0,0,0,124.22,137.55Z"/><path class="cls-1" d="M122.15,137.46c-.13,0-.23.23-.2.44a.21.21,0,0,0,.27.2c.17,0,.31-.11.3-.32A.39.39,0,0,0,122.15,137.46Z"/><path class="cls-1" d="M123.87,135.36a.61.61,0,0,0-.57.7.75.75,0,0,0,.79.64.81.81,0,0,0,.61-.78C124.68,135.56,124.33,135.33,123.87,135.36Z"/><path class="cls-1" d="M122.67,134.54a.17.17,0,0,0-.27,0,.39.39,0,0,0,0,.32.51.51,0,0,0,.1.29c.11.1.25,0,.29-.16A.56.56,0,0,0,122.67,134.54Z"/><path class="cls-1" d="M126.64,132.93c-.38-.05-.75-.12-1.12-.18.14.14.24.35.5.39A.68.68,0,0,0,126.64,132.93Z"/><path class="cls-1" d="M126.87,135.77c-.29,0-.42.28-.35.64a.5.5,0,0,0,.5.37c.23,0,.6-.45.57-.64A.64.64,0,0,0,126.87,135.77Z"/><path class="cls-1" d="M124.3,133.24c-.21.17-.11.59.12.9a.68.68,0,0,0,.87,0,.69.69,0,0,0-.15-.94A.68.68,0,0,0,124.3,133.24Z"/><path class="cls-1" d="M122.12,136.22a.41.41,0,0,0,.18-.32.3.3,0,0,0-.34-.32.33.33,0,0,0-.29.33C121.66,136.06,122,136.3,122.12,136.22Z"/><path class="cls-1" d="M126.86,134.27c0-.24.15-.46-.1-.6a.37.37,0,0,0-.48.09.3.3,0,0,0,0,.4C126.39,134.39,126.61,134.35,126.86,134.27Z"/><path class="cls-1" d="M127.2,133a.67.67,0,0,0,0,.2c0,.32.17.46.4.43s.52-.25.48-.51h0Z"/><path class="cls-1" d="M119.07,137.61a.6.6,0,0,0-.5-.4.39.39,0,0,0-.29.45.37.37,0,0,0,.45.28C119,137.91,119.11,137.77,119.07,137.61Z"/><path class="cls-1" d="M118.77,135.48c.19,0,.37-.41.33-.7a.44.44,0,0,0-.48-.32.51.51,0,0,0-.44.5A.67.67,0,0,0,118.77,135.48Z"/><path class="cls-1" d="M117.34,131.51a.71.71,0,0,0-.47.66.64.64,0,0,0,.6.41.47.47,0,0,0,.39-.42C117.82,131.76,117.59,131.48,117.34,131.51Z"/><path class="cls-1" d="M120.7,135.15a.26.26,0,0,0-.24.34c.05.11.11.24.23.26s.35-.25.31-.43S120.83,135.14,120.7,135.15Z"/><path class="cls-1" d="M120.89,132.07a.38.38,0,0,0-.43-.15.43.43,0,0,0-.32.43c.06.29.31.33.53.39C121,132.43,121,132.26,120.89,132.07Z"/><path class="cls-1" d="M119.69,137.33c-.09,0-.14.17-.13.22s.06.24.15.22a.26.26,0,0,0,.17-.2C119.88,137.51,119.78,137.31,119.69,137.33Z"/><path class="cls-1" d="M119.41,131.92c.27,0,.42-.18.45-.35l-.73-.18a.45.45,0,0,0,0,.2C119.18,131.76,119.23,131.94,119.41,131.92Z"/><path class="cls-1" d="M119.87,133.09a.52.52,0,0,0-.44,0c-.25.15-.09.36,0,.59.28,0,.52,0,.59-.27A.35.35,0,0,0,119.87,133.09Z"/><path class="cls-1" d="M130.54,134.65a.21.21,0,0,0-.2.06c0,.07,0,.18.1.23s.2.05.25,0S130.61,134.69,130.54,134.65Z"/><path class="cls-1" d="M138.53,136.68a.49.49,0,0,0-.69.26c-.13.29-.07.59.16.68a.71.71,0,0,0,.85-.3C139,137.12,138.79,136.79,138.53,136.68Z"/><path class="cls-1" d="M137.83,135.55a.38.38,0,0,0-.13-.51.45.45,0,0,0-.53.13.36.36,0,0,0,.16.5A.35.35,0,0,0,137.83,135.55Z"/><path class="cls-1" d="M136.32,137.83a.27.27,0,0,0-.15-.22.38.38,0,0,0-.48.1.27.27,0,0,0,0,.39c.13.2.3.2.51.15,0,.14,0,.28.09.33s.38-.21.38-.26,0-.38-.15-.48A.16.16,0,0,0,136.32,137.83Z"/><path class="cls-1" d="M137.63,134a.36.36,0,0,0-.06-.45l-.81,0a.65.65,0,0,0,.18.15.39.39,0,0,0,.22.47A.34.34,0,0,0,137.63,134Z"/><path class="cls-1" d="M135.2,134c-.12.05-.42.22-.4.35s.35.22.48.24.27-.2.23-.36S135.37,133.92,135.2,134Z"/><path class="cls-1" d="M139.14,134.6c-.31-.15-.76,0-.81.29a.54.54,0,0,0,.26.59.42.42,0,0,0,.58-.07c.13-.13.47-.33.4-.59S139.26,134.66,139.14,134.6Z"/><path class="cls-1" d="M141.42,135.42a.85.85,0,0,0-.11-.16.48.48,0,0,0-.83.23,2.94,2.94,0,0,0-.06.78.72.72,0,0,0,.63.59c.18,0,.54-.1.48-.44C141.17,136,141.57,135.83,141.42,135.42Z"/><path class="cls-1" d="M142.26,134.09a.52.52,0,1,0-.92-.46.59.59,0,0,0,.15.74A.72.72,0,0,0,142.26,134.09Z"/><path class="cls-1" d="M140,137.94s0-.1,0-.12a.11.11,0,0,0-.15,0,.12.12,0,0,0,.07.14S140,138,140,137.94Z"/><path class="cls-1" d="M139.7,134.2a.35.35,0,0,0,.27.35c.2,0,.41-.41.3-.52S139.72,134,139.7,134.2Z"/><path class="cls-1" d="M128.73,137.17c-.12.05-.41.22-.4.37s.37.19.5.18.25-.13.2-.31S128.9,137.12,128.73,137.17Z"/><path class="cls-1" d="M135.05,133.59h-1.17c0,.08,0,.15-.07.23a.31.31,0,0,0,.05.5.42.42,0,0,0,.56-.11,1,1,0,0,1,.3-.27A.58.58,0,0,0,135.05,133.59Z"/><path class="cls-1" d="M130.09,138.85c-.09,0-.16.2-.15.26s.09.18.18.17.15-.12.15-.19S130.18,138.84,130.09,138.85Z"/><path class="cls-1" d="M128.66,135.61a.41.41,0,0,0-.33.46.34.34,0,0,0,.38.29.37.37,0,0,0,.37-.42A.41.41,0,0,0,128.66,135.61Z"/><path class="cls-1" d="M130.16,133.35l-1.08-.1a.8.8,0,0,0,.43.65C129.8,134,129.94,133.89,130.16,133.35Z"/><path class="cls-1" d="M116.29,133.77a.42.42,0,0,0-.33.47.34.34,0,0,0,.38.28.37.37,0,0,0,.37-.42A.41.41,0,0,0,116.29,133.77Z"/><path class="cls-1" d="M130,136.43a.19.19,0,0,0,.12.07.12.12,0,0,0,.09-.1c0-.05-.06-.11-.12-.1A.13.13,0,0,0,130,136.43Z"/><path class="cls-1" d="M133.13,135.52a.77.77,0,0,0-.48-.86.89.89,0,0,0-1,.6c-.05.3.33.42.54.33s.14,0,.32.11l.06,0a.66.66,0,0,0-.11.45c0,.32.31.47.67.41a.51.51,0,0,0,.46-.63A.54.54,0,0,0,133.13,135.52Z"/><path class="cls-1" d="M134.43,136.87s-.06.24,0,.29.22-.08.27-.14a.15.15,0,0,0-.05-.19A.26.26,0,0,0,134.43,136.87Z"/><path class="cls-1" d="M132.54,133.52l-1.23-.07a.71.71,0,0,0,.68.45A.76.76,0,0,0,132.54,133.52Z"/><path class="cls-1" d="M131.15,134.68a.62.62,0,0,0-.53.56.43.43,0,0,0,.43.38.52.52,0,0,0,.45-.55A.36.36,0,0,0,131.15,134.68Z"/><path class="cls-1" d="M162.93,127.71c.1-.07.25-.25.21-.33a.37.37,0,0,0-.31-.16c-.09,0-.29.22-.27.32S162.88,127.74,162.93,127.71Z"/><path class="cls-1" d="M168.18,123.32a.64.64,0,0,0,.62.52.71.71,0,0,0,.48-.67.55.55,0,0,0-.62-.34C168.3,122.89,168.15,123.05,168.18,123.32Z"/><path class="cls-1" d="M171,120.17c.19,0,.55-.47.53-.63a.39.39,0,0,0-.12-.24l-.76.7A.37.37,0,0,0,171,120.17Z"/><path class="cls-1" d="M127.29,135.35c.1-.07.26-.24.22-.32a.39.39,0,0,0-.3-.18c-.09,0-.3.21-.28.31S127.24,135.38,127.29,135.35Z"/><path class="cls-1" d="M115.08,132.78a.49.49,0,0,0,.57.47c.27,0,.51-.27.47-.47a.74.74,0,0,0-.73-.53A.45.45,0,0,0,115.08,132.78Z"/><path class="cls-1" d="M143.87,134a.31.31,0,0,0,.17.44.42.42,0,0,0,.5-.18.39.39,0,0,0-.2-.49A.36.36,0,0,0,143.87,134Z"/><path class="cls-1" d="M136.29,136.3a.37.37,0,0,0,.18-.17s-.09-.15-.13-.15-.23,0-.24.16S136.26,136.31,136.29,136.3Z"/><path class="cls-1" d="M136,134.59c-.13,0-.44-.09-.51.08s.12.33.21.41a.24.24,0,0,0,.38,0C136.22,134.9,136.2,134.63,136,134.59Z"/><path class="cls-1" d="M151.69,131.15a.25.25,0,0,0,.19.15c.06,0,.15-.12.15-.18a.31.31,0,0,0,0-.08l-.32.1Z"/><path class="cls-1" d="M142.45,139a.38.38,0,0,0-.54.15.4.4,0,0,0,.2.53.38.38,0,0,0,.53-.18A.4.4,0,0,0,142.45,139Z"/><path class="cls-1" d="M176.93,115a.59.59,0,0,0-.67-.26.46.46,0,0,0-.26.48c.11.35.39.57.62.48A.64.64,0,0,0,176.93,115Z"/><path class="cls-1" d="M177,113.69a.37.37,0,0,0,.18-.46.08.08,0,0,0,0,0c-.15.19-.31.38-.47.56A.54.54,0,0,0,177,113.69Z"/><path class="cls-1" d="M166.68,123.34l-.25.19A.33.33,0,0,0,166.68,123.34Z"/><path class="cls-1" d="M177.56,113.1c.25,0,.5-.27.47-.47a.56.56,0,0,0-.17-.34l-.58.71A.44.44,0,0,0,177.56,113.1Z"/><path class="cls-1" d="M115.4,135c-.17,0-.36.35-.29.46a.42.42,0,0,0,.36.13.22.22,0,0,0,.24-.28C115.67,135.18,115.61,135,115.4,135Z"/><path class="cls-1" d="M114.17,130.1c-.09,0-.33.12-.33.24s.25.23.35.25a.27.27,0,0,0,.27-.33A.37.37,0,0,0,114.17,130.1Z"/><path class="cls-1" d="M113.82,132.36a.29.29,0,0,0-.32.34.35.35,0,0,0,.37.36.36.36,0,0,0,.34-.35A.37.37,0,0,0,113.82,132.36Z"/><path class="cls-1" d="M115.67,130.8c0-.26-.26-.4-.6-.35s-.43.19-.41.4.39.58.6.56S115.71,131.14,115.67,130.8Z"/><path class="cls-1" d="M123.75,134.71a.32.32,0,0,0,.19-.23.41.41,0,0,0-.15-.32c-.23-.12-.34.07-.46.23C123.4,134.61,123.51,134.76,123.75,134.71Z"/><path class="cls-1" d="M122.72,133.38a1.21,1.21,0,0,1,.32-.11.54.54,0,0,0,.5-.5c0-.28-.13-.43-.54-.38a5.55,5.55,0,0,0-.68.4.34.34,0,0,0-.07.49A.34.34,0,0,0,122.72,133.38Z"/><path class="cls-1" d="M121.88,132.36a.7.7,0,0,0,.44-.21l-.87-.2a.3.3,0,0,0,0,.13A.34.34,0,0,0,121.88,132.36Z"/><path class="cls-1" d="M151.48,131.64c.1,0,.18.11.3.08s.13-.21,0-.33a.6.6,0,0,0-.39-.17l-.13,0a.18.18,0,0,0-.06.18A.43.43,0,0,0,151.48,131.64Z"/><path class="cls-1" d="M145.54,132.69h0l-.83.16s0,0,.06,0A.62.62,0,0,0,145.54,132.69Z"/><path class="cls-1" d="M171.35,121.34a.41.41,0,0,0-.48-.3.4.4,0,0,0-.27.45.41.41,0,0,0,.45.27A.36.36,0,0,0,171.35,121.34Z"/><path class="cls-1" d="M170.57,122.92a.33.33,0,0,0,.23-.42.43.43,0,0,0-.54-.26,1.18,1.18,0,0,0-.17.39C170.08,122.84,170.35,123,170.57,122.92Z"/><path class="cls-1" d="M172.58,119.48a.55.55,0,0,0-.49.66.67.67,0,1,0,1.33-.2C173.37,119.6,173,119.41,172.58,119.48Z"/><path class="cls-1" d="M173.29,117.48l-.4.39v0c0,.15.15.27.34.24s.31-.14.24-.33A.78.78,0,0,0,173.29,117.48Z"/><path class="cls-1" d="M170.31,120.43l-.06-.05-.4.37.09.15a.14.14,0,0,0,.2.08A.46.46,0,0,0,170.31,120.43Z"/><path class="cls-1" d="M149,132.79c-.07-.07-.27-.12-.33-.07a.6.6,0,0,0-.26.37c0,.28.25.27.48.34C149,133.21,149.15,133,149,132.79Z"/><path class="cls-1" d="M151.86,132.38a.33.33,0,0,0,.11.43c.12.1.5-.05.51-.19a.41.41,0,0,0-.17-.34A.3.3,0,0,0,151.86,132.38Z"/><path class="cls-1" d="M155.06,132a.3.3,0,0,0-.12-.13l.1-.12s0-.18,0-.19a.28.28,0,0,0-.24,0,.21.21,0,0,0,0,.29c-.06,0-.11.1-.1.13s.19.13.27.13S155.07,132,155.06,132Z"/><path class="cls-1" d="M152.2,136.94a.12.12,0,0,0,.06.14s.11,0,.12-.06a.11.11,0,0,0,0-.13A.12.12,0,0,0,152.2,136.94Z"/><path class="cls-1" d="M151.32,136.11a.36.36,0,0,0,.21.48.35.35,0,0,0,.48-.21c.1-.21.07-.4-.08-.47A.61.61,0,0,0,151.32,136.11Z"/><path class="cls-1" d="M151.11,133c-.17-.06-.24,0-.31.16s0,.35.14.38.27.05.35,0S151.28,133.1,151.11,133Z"/><path class="cls-1" d="M153.18,136.76s0,.26,0,.29.22-.08.26-.14,0-.19,0-.19A.27.27,0,0,0,153.18,136.76Z"/><path class="cls-1" d="M154.15,131.17c-.06,0-.08.09-.07.13s.09.07.12.06.09-.05.08-.1A.11.11,0,0,0,154.15,131.17Z"/><path class="cls-1" d="M154.82,130.34a.52.52,0,0,0-.19-.24l-.6.22v.1a.37.37,0,0,0,.46.26C154.73,130.64,154.86,130.5,154.82,130.34Z"/><path class="cls-1" d="M154,131.25a.79.79,0,0,0-.2-.84c-.36.13-.71.27-1.07.39a.59.59,0,0,0,.29.74A.76.76,0,0,0,154,131.25Z"/><path class="cls-1" d="M154,133.16a.39.39,0,0,0-.48.11c-.06.12.07.32.26.42a.2.2,0,0,0,.31-.11C154.16,133.42,154.18,133.26,154,133.16Z"/><path class="cls-1" d="M150.6,138.64a.26.26,0,0,0,.12.27.24.24,0,0,0,.23-.06.24.24,0,0,0,0-.23C150.84,138.59,150.64,138.54,150.6,138.64Z"/><path class="cls-1" d="M152,135.24c0,.09.07.22.11.24s.23.08.26,0a.25.25,0,0,0-.06-.25C152.29,135.19,152.08,135.15,152,135.24Z"/><path class="cls-1" d="M145.81,139.12a.33.33,0,0,0-.46.14.41.41,0,0,0,.14.55.41.41,0,0,0,.5-.18A.45.45,0,0,0,145.81,139.12Z"/><path class="cls-1" d="M146.28,135.66a.72.72,0,0,0-.85.31c-.1.17,0,.45.26.56a.5.5,0,0,0,.71-.21C146.52,136.07,146.46,135.74,146.28,135.66Z"/><path class="cls-1" d="M145.9,133.94a.71.71,0,0,0,.29.76.65.65,0,0,0,.68-.27.47.47,0,0,0-.14-.56C146.38,133.68,146,133.71,145.9,133.94Z"/><path class="cls-1" d="M145.15,137.21a.37.37,0,0,0-.51.12.28.28,0,0,0,.1.45.35.35,0,1,0,.41-.57Z"/><path class="cls-1" d="M149.6,134.31a.43.43,0,0,0-.53.21.5.5,0,0,0,.17.65A.68.68,0,0,0,150,135C150.07,134.8,149.86,134.44,149.6,134.31Z"/><path class="cls-1" d="M144.38,134.93c-.24-.12-.47,0-.63.3a.4.4,0,0,0,.11.56.75.75,0,0,0,.79-.18A.48.48,0,0,0,144.38,134.93Z"/><path class="cls-1" d="M143.26,135.63a.36.36,0,0,0-.3.15c-.05.08-.08.34,0,.41s.32-.08.4-.16A.26.26,0,0,0,143.26,135.63Z"/><path class="cls-1" d="M148,138c.12,0,.23-.11.31-.22a.22.22,0,0,0-.1-.36c-.16-.07-.32-.1-.43.08S147.83,138,148,138Z"/><path class="cls-1" d="M147.7,135.91a.42.42,0,0,0-.51.16.43.43,0,0,0,.2.54.34.34,0,0,0,.45-.16A.37.37,0,0,0,147.7,135.91Z"/><path class="cls-1" d="M165.88,131.08c-.09,0-.15.21-.14.27s.1.18.19.17.15-.14.15-.21S166,131.07,165.88,131.08Z"/><path class="cls-1" d="M164.31,127.91a.42.42,0,0,0-.31.48.33.33,0,0,0,.39.27.37.37,0,0,0,.35-.44A.4.4,0,0,0,164.31,127.91Z"/><path class="cls-1" d="M169,124.3c-.14,0-.17.36-.14.46s.19.15.3.15a.19.19,0,0,0,.18-.27C169.27,124.53,169.11,124.27,169,124.3Z"/><path class="cls-1" d="M164.45,129.47c-.12.05-.4.24-.38.38s.37.17.51.17a.23.23,0,0,0,.18-.33C164.71,129.54,164.61,129.4,164.45,129.47Z"/><path class="cls-1" d="M163.08,132.52c-.11,0-.38.21-.35.31s.29.22.41.24.26-.13.25-.34A.23.23,0,0,0,163.08,132.52Z"/><path class="cls-1" d="M162.92,125.94a.29.29,0,0,0,.25,0c.3,0,.48-.26.44-.5Z"/><path class="cls-1" d="M165.85,128.63a.11.11,0,0,0-.13-.09.12.12,0,0,0-.07.13s.09.07.12.06S165.86,128.68,165.85,128.63Z"/><path class="cls-1" d="M168.15,125.34c0-.38-.35-.7-.65-.67a.91.91,0,0,0-.7.82.72.72,0,0,0,.76.56A.69.69,0,0,0,168.15,125.34Z"/><path class="cls-1" d="M166.76,126.87a.63.63,0,0,0-.51.58.43.43,0,0,0,.45.37.55.55,0,0,0,.43-.57C167.1,127,167,126.86,166.76,126.87Z"/><path class="cls-1" d="M166.32,125.38a.38.38,0,0,0-.13-.48c-.06,0-.17-.08-.22-.05a4.32,4.32,0,0,0-.48.31c-.44-.12-.79,0-.87.23a.76.76,0,0,0,.47.77c.3.1.43,0,.64-.62C166,125.6,166.21,125.69,166.32,125.38Z"/><path class="cls-1" d="M162.21,126.72l.25-.06a1.32,1.32,0,0,0,0-.44l-.63.37h0a.33.33,0,0,0,.09.21s.21,0,.26,0S162.21,126.74,162.21,126.72Z"/><path class="cls-1" d="M157.34,134.59c0,.1,0,.29,0,.34a.34.34,0,0,0,.32-.07c.06-.07.08-.35,0-.4S157.36,134.53,157.34,134.59Z"/><path class="cls-1" d="M157.89,130.05c-.13,0-.22.24-.18.45a.21.21,0,0,0,.27.19c.17,0,.31-.13.29-.33A.38.38,0,0,0,157.89,130.05Z"/><path class="cls-1" d="M159,130.46a.22.22,0,0,0-.36.12c0,.11,0,.43,0,.47s.35-.11.44-.19S159.13,130.57,159,130.46Z"/><path class="cls-1" d="M157.68,132.7a.35.35,0,1,0-.68.11.3.3,0,0,0,.36.3A.36.36,0,0,0,157.68,132.7Z"/><path class="cls-1" d="M155.43,130a.26.26,0,0,0-.13.23c0,.08.08.23.16.2a.23.23,0,0,0,.16-.2C155.62,130.2,155.52,130,155.43,130Z"/><path class="cls-1" d="M159.1,133.9c-.09,0-.25.14-.25.22s.16.21.25.22.33-.15.32-.25S159.16,133.88,159.1,133.9Z"/><path class="cls-1" d="M163.26,128.49a.65.65,0,0,0-.74-.34c-.28.06-.4.3-.32.65a.52.52,0,0,0,.52.36C163,129.11,163.31,128.67,163.26,128.49Z"/><path class="cls-1" d="M155.53,135a.35.35,0,1,0-.31.62.29.29,0,0,0,.45-.12A.36.36,0,0,0,155.53,135Z"/><path class="cls-1" d="M159.52,127.88l-.06,0-.29.14a.63.63,0,0,0-.2.56.75.75,0,0,0,.82.6.78.78,0,0,0,.57-.8C160.33,128,160,127.82,159.52,127.88Z"/><path class="cls-1" d="M160,130c-.06,0-.22,0-.22.19s.19.13.27.13.13-.12.12-.15A.31.31,0,0,0,160,130Z"/><path class="cls-1" d="M190.54,38.34l-.07,0,.35.72a.62.62,0,0,0,.16-.54A.33.33,0,0,0,190.54,38.34Z"/><path class="cls-1" d="M189.52,36.57c.17.31.34.63.5,1a.6.6,0,0,0,.13-.56A.63.63,0,0,0,189.52,36.57Z"/><path class="cls-1" d="M195.63,80a.34.34,0,0,0-.34-.38.36.36,0,0,0-.38.36.45.45,0,0,0,.36.4A.36.36,0,0,0,195.63,80Z"/><path class="cls-1" d="M194.73,83a.75.75,0,0,0-.14.76c.1.19.19.39.48.31s.42-.08.63-.12a.31.31,0,0,0,.41-.28.41.41,0,0,0-.36-.44.91.91,0,0,1-.38-.14A.57.57,0,0,0,194.73,83Z"/><path class="cls-1" d="M189.94,89.92a.49.49,0,0,0,.41-.17.39.39,0,0,0-.67-.41A.38.38,0,0,0,189.94,89.92Z"/><path class="cls-1" d="M196.76,48.1a.78.78,0,0,0-.43.63.5.5,0,0,0,.67.32c.22-.06.32-.33.23-.65A.37.37,0,0,0,196.76,48.1Z"/><path class="cls-1" d="M195.39,43.54a.69.69,0,0,0-.79-.39.74.74,0,0,0-.51.56.52.52,0,0,0-.4-.17.82.82,0,0,0-.76.37c.19.49.37,1,.55,1.48h.07a.36.36,0,0,0,.25-.45.09.09,0,0,0,0-.07.68.68,0,0,0,.48-.55.43.43,0,0,0,0-.05.61.61,0,0,0,.7.12.74.74,0,0,0,.28-.14.32.32,0,0,0,.13.23.5.5,0,0,0,.67-.19.62.62,0,0,0-.06-.68A.49.49,0,0,0,195.39,43.54Z"/><path class="cls-1" d="M197.67,50a.35.35,0,0,0-.38-.3.46.46,0,0,0-.3.19c-.11.19,0,.34.31.58C197.48,50.38,197.73,50.32,197.67,50Z"/><path class="cls-1" d="M195.67,81.32c-.18,0-.41.13-.37.29s.14.42.33.41.23-.27.25-.38A.24.24,0,0,0,195.67,81.32Z"/><path class="cls-1" d="M193.48,42.68a.32.32,0,0,0,.42.23.36.36,0,0,0,.29-.44.4.4,0,0,0-.47-.27A.41.41,0,0,0,193.48,42.68Z"/><path class="cls-1" d="M194.27,40.77c.17-.14.06-.31,0-.46s-.41,0-.46.22a.31.31,0,0,0,.11.27A.49.49,0,0,0,194.27,40.77Z"/><path class="cls-1" d="M198.91,52.32a.63.63,0,0,0-.77-.36.68.68,0,0,0-.45.89.55.55,0,0,0,.68.4A.86.86,0,0,0,198.91,52.32Z"/><path class="cls-1" d="M198.63,55a.7.7,0,0,0-1,0,.5.5,0,0,0,0,.74.64.64,0,0,0,1,.07A.65.65,0,0,0,198.63,55Z"/><path class="cls-1" d="M194.68,77a.73.73,0,0,0,.2-.84.48.48,0,0,0-.33-.26c-.12.45-.26.9-.4,1.35A3.65,3.65,0,0,0,194.68,77Z"/><path class="cls-1" d="M196.29,50.52a.54.54,0,0,0,0-.64.48.48,0,0,0-.55-.21,2.14,2.14,0,0,0-.46.17,2.12,2.12,0,0,0-.2-.12.89.89,0,0,0-.32-.08c.13.5.26,1,.37,1.5l.05-.06a.43.43,0,0,0-.09-.35.69.69,0,0,0,.11-.13l.1-.14a.36.36,0,0,0,.21,0l.2.14A.37.37,0,0,0,196.29,50.52Z"/><path class="cls-1" d="M198.25,58.9c.17-.12.21-.28.06-.4s-.31-.33-.5-.19,0,.41,0,.54S198.1,59,198.25,58.9Z"/><path class="cls-1" d="M199.24,61.26a.75.75,0,0,0,0-.9.66.66,0,0,0-1,0,.55.55,0,0,0-.11.81A.75.75,0,0,0,199.24,61.26Z"/><path class="cls-1" d="M196.87,73.83a.38.38,0,0,0-.38-.36c.13-.09.14-.24,0-.37s-.27-.18-.37,0-.24.4-.15.52.13,0,.23,0a.4.4,0,0,0-.1.26.38.38,0,0,0,.39.4A.41.41,0,0,0,196.87,73.83Z"/><path class="cls-1" d="M196.73,76.84c.16,0,.17-.24.05-.41a.22.22,0,0,0-.37,0c-.08.09-.22.37-.16.44S196.62,76.88,196.73,76.84Z"/><path class="cls-1" d="M195.67,72.38a.38.38,0,0,0,.09-.56.4.4,0,0,0-.26-.12c-.05.24-.09.48-.14.72A.35.35,0,0,0,195.67,72.38Z"/><path class="cls-1" d="M197.25,65.2a.53.53,0,0,0-.7,0,.64.64,0,0,0-.25.32s0,.06,0,.1a.38.38,0,0,0,.08.24.64.64,0,0,0,.79.14A.67.67,0,0,0,197.25,65.2Z"/><path class="cls-1" d="M198.11,63.11a.37.37,0,0,0,.06-.52.39.39,0,0,0-.59.5A.42.42,0,0,0,198.11,63.11Z"/><path class="cls-1" d="M197.3,61.73a1,1,0,0,0,.16-.81.53.53,0,0,0-.78,0c-.2.17-.19.42,0,.7S197.14,61.87,197.3,61.73Z"/><path class="cls-1" d="M191.57,36.79a.31.31,0,0,0,.18-.44.41.41,0,0,0-.48-.22.4.4,0,0,0-.2.49A.38.38,0,0,0,191.57,36.79Z"/><path class="cls-1" d="M200.69,53.33s.09-.26,0-.34-.32,0-.36.09a.29.29,0,0,0,.06.28A.34.34,0,0,0,200.69,53.33Z"/><path class="cls-1" d="M199.29,47.59c0,.06.15.22.23.2s.12-.23.1-.29-.12-.16-.21-.13S199.28,47.52,199.29,47.59Z"/><path class="cls-1" d="M201.1,61.89a.37.37,0,0,0-.11.55.64.64,0,0,0,.82.19.56.56,0,0,0,0-.71A.52.52,0,0,0,201.1,61.89Z"/><path class="cls-1" d="M200.51,54.4c-.27.1-.27.33-.18.62.23,0,.44.15.59-.09a.31.31,0,0,0-.06-.44A.42.42,0,0,0,200.51,54.4Z"/><path class="cls-1" d="M199,52.28a.43.43,0,0,0,.53.09.52.52,0,0,0,.18-.65.59.59,0,0,0-.7-.19C198.85,51.65,198.84,52,199,52.28Z"/><path class="cls-1" d="M197.33,67.64a.7.7,0,0,0-.89-.26.89.89,0,0,0-.21,1.06.72.72,0,0,0,.93.12A.71.71,0,0,0,197.33,67.64Z"/><path class="cls-1" d="M198.76,46.54c.18-.06.27-.23.17-.37a1.13,1.13,0,0,0-.28-.22.37.37,0,0,0-.21.49C198.51,46.6,198.64,46.58,198.76,46.54Z"/><path class="cls-1" d="M195.62,52.59c-.07,0-.11.11-.12.21a2.38,2.38,0,0,1,.05.26.75.75,0,0,0,.09.15c.19.21.51,0,.58-.14S195.78,52.55,195.62,52.59Z"/><path class="cls-1" d="M203.14,60.05a.2.2,0,0,0,0,.31.22.22,0,0,0,.29,0,.19.19,0,0,0,0-.26A.21.21,0,0,0,203.14,60.05Z"/><path class="cls-1" d="M195.64,45.62a.35.35,0,0,0,.23-.42.33.33,0,0,0-.44-.26.39.39,0,0,0-.28.49A.37.37,0,0,0,195.64,45.62Z"/><path class="cls-1" d="M197.85,56.49c.21-.08.13-.32.09-.4a.34.34,0,0,0-.29-.16.23.23,0,0,0-.19.32C197.5,56.35,197.65,56.57,197.85,56.49Z"/><path class="cls-1" d="M196.86,69.66a.62.62,0,0,0-.16.75.42.42,0,0,0,.57.11.55.55,0,0,0,.1-.71A.36.36,0,0,0,196.86,69.66Z"/><path class="cls-1" d="M196.21,57.05a.87.87,0,0,0,0-1,.55.55,0,0,0-.23-.17c.06.42.12.84.16,1.25Z"/><path class="cls-1" d="M195.81,54.6c0,.22.06.43.09.64a.36.36,0,0,0,.34-.33C196.24,54.75,196,54.62,195.81,54.6Z"/><path class="cls-1" d="M196.56,58.23c-.05-.07-.19-.09-.34-.09,0,.31.05.62.07.93l.1,0A.63.63,0,0,0,196.56,58.23Z"/><path class="cls-1" d="M194,45.84a.4.4,0,0,0-.28.37l.16.45a.46.46,0,0,0,.55.09c.29-.1.48-.38.4-.58A.75.75,0,0,0,194,45.84Z"/><path class="cls-1" d="M195.06,48.1a0,0,0,0,0,0,0,.41.41,0,0,0-.5-.23.31.31,0,0,0-.19.2c.11.39.24.78.34,1.18a.47.47,0,0,0,.11-.53.24.24,0,0,0,.27-.17.42.42,0,0,0,.13.07.35.35,0,0,0,.34-.29A.32.32,0,0,0,195.06,48.1Z"/><path class="cls-1" d="M191.45,85a.43.43,0,0,0-.13-.26l-.3.67C191.27,85.33,191.47,85.15,191.45,85Z"/><path class="cls-1" d="M189.68,88l.06,0a.53.53,0,0,1,.3-.07c.39,0,.6-.14.6-.53a.23.23,0,0,0,.14,0,.42.42,0,0,0,.29-.46.44.44,0,0,0-.43-.45.37.37,0,0,0-.32.42h-.07C190.07,87.31,189.87,87.68,189.68,88Z"/><path class="cls-1" d="M193.61,79.53c-.07.08-.15.25-.11.32s.25.11.33.07.21-.29.15-.37S193.66,79.49,193.61,79.53Z"/><path class="cls-1" d="M191.48,40.46c.11.23.21.47.31.7l.05,0a1.29,1.29,0,0,0,.67.14l.08.15a.67.67,0,0,0,.86.14.7.7,0,0,0,0-1,.77.77,0,0,0-.53-.18.3.3,0,0,0,0-.1c-.1-.38-.4-.44-.73-.42,0-.21,0-.46-.29-.5a.34.34,0,0,0-.39.23c-.11.28.12.39.32.51l-.11.38Z"/><path class="cls-1" d="M197.52,53.43a.6.6,0,0,0,.08-.76c-.15-.22-.38-.23-.68,0a.6.6,0,0,0-.2.65A.66.66,0,0,0,197.52,53.43Z"/><path class="cls-1" d="M196.91,71.77s.05-.09,0-.13a.12.12,0,0,0-.16,0,.13.13,0,0,0,0,.16A.17.17,0,0,0,196.91,71.77Z"/><path class="cls-1" d="M198.07,81.6s-.15.06-.14.13a.25.25,0,0,0,.15.19c.06,0,.24-.06.24-.15S198.15,81.61,198.07,81.6Z"/><path class="cls-1" d="M198.15,86.15c-.1,0-.14.17-.14.25s.08.15.15.15.13-.13.15-.2S198.26,86.15,198.15,86.15Z"/><path class="cls-1" d="M198,84.19c0-.22-.05-.55-.45-.49a.76.76,0,0,0-.54.85.89.89,0,0,0,1,.61c.29-.1.21-.49,0-.63S198,84.42,198,84.19Z"/><path class="cls-1" d="M198.16,73.76c-.08.06,0,.26,0,.31a.23.23,0,0,0,.25.05.23.23,0,0,0,0-.25C198.4,73.82,198.23,73.71,198.16,73.76Z"/><path class="cls-1" d="M197.54,66.33c-.11.09,0,.4.1.48s.25,0,.34,0a.18.18,0,0,0,0-.31C197.91,66.4,197.64,66.24,197.54,66.33Z"/><path class="cls-1" d="M198,75.29a.32.32,0,0,0,.17.24.43.43,0,0,0,.34-.06.35.35,0,0,0-.12-.5C198.31,74.91,198,75.05,198,75.29Z"/><path class="cls-1" d="M198.29,79.3c-.13.09-.33.17-.35.36s.22.21.29.19.47-.2.47-.34S198.34,79.27,198.29,79.3Z"/><path class="cls-1" d="M194.67,93.17a.28.28,0,0,0,0,.28.31.31,0,0,0,.28.06.32.32,0,0,0,.11-.32C195,93.09,194.73,93.12,194.67,93.17Z"/><path class="cls-1" d="M194.44,80.81a.36.36,0,0,0-.41-.32.38.38,0,0,0-.38.41.45.45,0,0,0,.47.33A.39.39,0,0,0,194.44,80.81Z"/><path class="cls-1" d="M193.11,86c0,.17.15.19.29.19a.24.24,0,0,0,.26-.31.88.88,0,0,0-.2-.28A.37.37,0,0,0,193.11,86Z"/><path class="cls-1" d="M196.49,89.78a.71.71,0,0,0-.63.75.81.81,0,0,0,.71.68.71.71,0,0,0,.72-.67A1.05,1.05,0,0,0,196.49,89.78Z"/><path class="cls-1" d="M195.33,86.15a.93.93,0,0,0-.2-.29.37.37,0,0,0-.35.4c0,.18.15.19.29.19S195.39,86.31,195.33,86.15Z"/><path class="cls-1" d="M197,78.44a.73.73,0,0,0-.68-.61c-.22,0-.44.31-.41.59a.49.49,0,0,0,.57.48C196.82,78.88,197.05,78.68,197,78.44Z"/><path class="cls-1" d="M195.44,87.43c-.09,0-.16.11-.17.18s.07.26.16.26.18-.19.18-.25S195.53,87.43,195.44,87.43Z"/><path class="cls-1" d="M202,59.15c-.07.06,0,.22,0,.26s.18.16.24.1a.22.22,0,0,0,0-.25C202.25,59.2,202.06,59.08,202,59.15Z"/><path class="cls-1" d="M202,68s-.17.14-.12.26.23.06.25,0a.34.34,0,0,0,.06-.24S202,68,202,68Z"/><path class="cls-1" d="M202.67,69.51a.37.37,0,0,0-.36.33.3.3,0,0,0,.17.36c.26.12.42,0,.6-.23C203,69.74,203,69.49,202.67,69.51Z"/><path class="cls-1" d="M193.26,82.83a.48.48,0,0,0-.54-.23.77.77,0,0,0-.29-.47c-.16.38-.31.76-.47,1.13l.1,0a.75.75,0,0,0,.31-.06.33.33,0,0,0,.06.26.49.49,0,0,0,.7,0A.62.62,0,0,0,193.26,82.83Z"/><path class="cls-1" d="M201.89,57.6c-.09-.08-.31-.13-.38-.07s-.1.25-.13.34c.16.22.32.19.43.1S202,57.72,201.89,57.6Z"/><path class="cls-1" d="M203.61,65.39c-.34,0-.64.4-.54.67a.55.55,0,0,0,.53.37.43.43,0,0,0,.46-.37c0-.18.23-.53,0-.71S203.74,65.37,203.61,65.39Z"/><path class="cls-1" d="M203.59,63.29a.34.34,0,0,0-.1.47.38.38,0,0,0,.49.07.32.32,0,0,0,.1-.46A.38.38,0,0,0,203.59,63.29Z"/><path class="cls-1" d="M200.32,67c-.12-.12-.28-.17-.38,0s-.25.41-.16.51.41,0,.53,0S200.44,67.08,200.32,67Z"/><path class="cls-1" d="M200,63.7a.38.38,0,0,0-.14-.48.37.37,0,0,0-.5,0,.56.56,0,0,0,0,.68A.53.53,0,0,0,200,63.7Z"/><path class="cls-1" d="M198.26,63.87a.45.45,0,0,0-.61,0,1.07,1.07,0,0,0,0,.42c.09.19.39.18.56,0A.34.34,0,0,0,198.26,63.87Z"/><path class="cls-1" d="M198.74,69.46a.62.62,0,0,0,0,.81.58.58,0,0,0,.84-.79A.61.61,0,0,0,198.74,69.46Z"/><path class="cls-1" d="M201,74.07c-.05.05,0,.18,0,.25s.16.13.24.07,0-.23,0-.29A.19.19,0,0,0,201,74.07Z"/><path class="cls-1" d="M200.57,58.15c.19.08.31,0,.41-.16a.34.34,0,0,0,0-.41c-.19-.35-.36-.4-.71-.19s-.52.3-.78.45c-.31-.45-.38-.46-.7-.11.05.29.24.37.52.33.26.63.66.65,1.12.07Z"/><path class="cls-1" d="M201.47,65.28a.4.4,0,0,0-.52-.1.38.38,0,0,0-.07.48.46.46,0,0,0,.53.11A.37.37,0,0,0,201.47,65.28Z"/><path class="cls-1" d="M190.07,35.41a.69.69,0,0,0,.32-.74.63.63,0,0,0-.67-.28.47.47,0,0,0-.29.5C189.55,35.27,189.83,35.5,190.07,35.41Z"/><path class="cls-1" d="M196.77,46.69c.07.16.2.14.32.1a.24.24,0,0,0,.17-.37,1,1,0,0,0-.27-.21A.36.36,0,0,0,196.77,46.69Z"/><path class="cls-1" d="M191.26,95.11a.23.23,0,0,0-.28.25c0,.1.09.36.31.35s.21-.28.2-.37A.33.33,0,0,0,191.26,95.11Z"/><path class="cls-1" d="M190.94,88.59a.38.38,0,0,0-.4.35.39.39,0,0,0,.36.39.42.42,0,0,0,.42-.39A.37.37,0,0,0,190.94,88.59Z"/><path class="cls-1" d="M190.29,91.32c-.16,0-.28.34-.16.6s.49.14.59,0S190.45,91.33,190.29,91.32Z"/><path class="cls-1" d="M192.89,91.46a.68.68,0,0,0-.7.72.54.54,0,0,0,.54.57c.38,0,.82-.41.79-.72A.62.62,0,0,0,192.89,91.46Z"/><path class="cls-1" d="M189.72,93.28c-.15.08-.15.59.06.66a.38.38,0,0,0,.43-.22C190.27,93.5,189.86,93.2,189.72,93.28Z"/><path class="cls-1" d="M193,89.46a.35.35,0,0,0-.28-.4.45.45,0,0,0-.33.1c-.17.15-.12.31.12.64C192.72,89.75,193,89.77,193,89.46Z"/><path class="cls-1" d="M192.69,87.36c-.22,0-.58.3-.59.48a.49.49,0,0,0,.54.5c.24,0,.41-.23.41-.56A.36.36,0,0,0,192.69,87.36Z"/><path class="cls-1" d="M192.35,84a.41.41,0,0,0-.42.39.38.38,0,0,0,.42.32.36.36,0,0,0,.35-.33A.34.34,0,0,0,192.35,84Z"/><path class="cls-1" d="M188.35,90.44c-.15.25-.29.52-.45.77a1.73,1.73,0,0,0,.21.69.46.46,0,0,0,.14.14.47.47,0,0,0,.76-.38,2.91,2.91,0,0,0-.07-.78A.68.68,0,0,0,188.35,90.44Z"/><path class="cls-1" d="M187.21,93a.63.63,0,0,0-.33.29c0,.14.18.34.35.3s.2-.15.25-.19C187.48,93.16,187.35,93,187.21,93Z"/><path class="cls-1" d="M188.79,92.55a.28.28,0,0,0,0,.25c.07.06.2,0,.25-.06s.06-.24,0-.3S188.82,92.5,188.79,92.55Z"/><path class="cls-1" d="M146.46,9.19a.5.5,0,0,0,0-.78.49.49,0,0,0-.76-.12.58.58,0,0,0-.09.83A.62.62,0,0,0,146.46,9.19Z"/><path class="cls-1" d="M162,16.48c.18,0,.21-.13.23-.26s-.11-.34-.28-.3a1.06,1.06,0,0,0-.3.16A.37.37,0,0,0,162,16.48Z"/><path class="cls-1" d="M165.52,23.85a2.15,2.15,0,0,0,1.23-.06.56.56,0,0,0,.16-.13.47.47,0,0,0-.29-.8,2.56,2.56,0,0,0-.78,0,.74.74,0,0,0-.55.67C165.29,23.68,165.35,23.82,165.52,23.85Z"/><path class="cls-1" d="M159.45,16.37c.19-.08.4-.15.36-.44s0-.43,0-.64a.32.32,0,0,0-.23-.45.42.42,0,0,0-.48.31,1,1,0,0,1-.18.36.55.55,0,0,0-.17.62A.77.77,0,0,0,159.45,16.37Z"/><path class="cls-1" d="M157.85,12.8a.26.26,0,0,0,.21-.12c0-.06,0-.25-.13-.26s-.17.15-.2.22S157.77,12.8,157.85,12.8Z"/><path class="cls-1" d="M157.6,18.28c.33.25.68.49,1,.74a.59.59,0,0,0,.07-.2.82.82,0,0,0,0-.32.33.33,0,0,0,.27,0,.48.48,0,0,0,.09-.68.61.61,0,0,0-.64-.22.51.51,0,0,0-.3.51A.83.83,0,0,0,157.6,18.28Z"/><path class="cls-1" d="M162.49,13.29s.16-.06.16-.13-.1-.15-.17-.18-.21,0-.22.14S162.42,13.28,162.49,13.29Z"/><path class="cls-1" d="M164.11,21a.39.39,0,0,0,.43-.3.43.43,0,0,0-.34-.47.36.36,0,0,0-.39.34A.37.37,0,0,0,164.11,21Z"/><path class="cls-1" d="M163.36,16.16c.06,0,.26,0,.27-.13s-.15-.2-.22-.21a.22.22,0,0,0-.21.15C163.19,16.06,163.3,16.14,163.36,16.16Z"/><path class="cls-1" d="M165.2,19.16c0-.21,0-.46-.28-.53a.35.35,0,0,0-.43.23.48.48,0,0,0,.06.35C164.67,19.39,164.84,19.36,165.2,19.16Z"/><path class="cls-1" d="M161.72,20.62a.36.36,0,0,0,.37.37h0a.69.69,0,0,0,0,.36.71.71,0,0,1-.07.48c.56.5,1.1,1,1.63,1.51a.69.69,0,0,0-.47-.57H163a.58.58,0,0,0,.15-.28,1.22,1.22,0,0,0-.09-.8.52.52,0,0,1,0-.3.47.47,0,0,0-.45-.66.37.37,0,0,0,0-.14c0-.16-.2-.32-.42-.34A.44.44,0,0,0,161.72,20.62Z"/><path class="cls-1" d="M163.2,19.33a.49.49,0,0,0,.56-.48c0-.23-.17-.43-.5-.47a.36.36,0,0,0-.46.3A.78.78,0,0,0,163.2,19.33Z"/><path class="cls-1" d="M157.41,15.39c.13,0,.43-.08.44-.27s-.23-.26-.35-.3a.24.24,0,0,0-.33.18C157.12,15.17,157.25,15.42,157.41,15.39Z"/><path class="cls-1" d="M161.52,18.1c.17,0,.21-.12.22-.25s-.1-.34-.27-.31a1.14,1.14,0,0,0-.31.17A.36.36,0,0,0,161.52,18.1Z"/><path class="cls-1" d="M149.56,12.19c.12-.08,0-.41-.07-.53a.21.21,0,0,0-.36,0c-.12.12-.2.26-.08.38S149.44,12.27,149.56,12.19Z"/><path class="cls-1" d="M147.67,12.47l.66.3a.33.33,0,0,0,0-.37.37.37,0,0,0-.54-.13A.34.34,0,0,0,147.67,12.47Z"/><path class="cls-1" d="M156.5,17a.45.45,0,0,0,.39-.43.4.4,0,0,0-.38-.37.37.37,0,0,0-.37.37A.38.38,0,0,0,156.5,17Z"/><path class="cls-1" d="M150.21,10a.2.2,0,0,0,.07-.24.2.2,0,0,0-.24-.05c-.06,0-.18.2-.13.28S150.16,10.08,150.21,10Z"/><path class="cls-1" d="M146.31,5.59a.28.28,0,0,0,.37-.14c.13-.25,0-.43-.19-.61-.23.07-.48.08-.49.37A.37.37,0,0,0,146.31,5.59Z"/><path class="cls-1" d="M147.82,11.26s0-.11,0-.14-.09-.06-.13,0a.1.1,0,1,0,.12.17Z"/><path class="cls-1" d="M149.46,13.27s0,0,0,.06l.59.28a.33.33,0,0,0,.2-.29.41.41,0,0,0-.38-.42A.38.38,0,0,0,149.46,13.27Z"/><path class="cls-1" d="M155.45,15.07s-.06,0-.06.1a.36.36,0,0,0,.31.41.44.44,0,0,0,.44-.31.35.35,0,0,0-.33-.4s-.05,0-.07,0,0-.06,0-.08-.27-.24-.36-.18-.09.31,0,.36A.41.41,0,0,0,155.45,15.07Z"/><path class="cls-1" d="M154.32,14.37a.48.48,0,0,0,.54-.5c0-.31-.15-.57-.39-.57a.71.71,0,0,0-.68.6C153.76,14.12,154,14.37,154.32,14.37Z"/><path class="cls-1" d="M150.68,7.22s.14-.16.09-.25-.23,0-.29,0a.16.16,0,0,0,0,.2C150.47,7.25,150.61,7.24,150.68,7.22Z"/><path class="cls-1" d="M155.79,12.54c.18,0,.24-.19.23-.27s-.14-.48-.28-.5-.28.33-.26.38S155.61,12.5,155.79,12.54Z"/><path class="cls-1" d="M151.46,11.91a.27.27,0,0,0,.26-.14.4.4,0,0,0,0-.34.35.35,0,0,0-.51.06C151.12,11.6,151.22,11.88,151.46,11.91Z"/><path class="cls-1" d="M152.83,12.15c.08-.06.07-.36,0-.48s-.23-.18-.41-.08a.22.22,0,0,0-.06.37C152.48,12.05,152.75,12.21,152.83,12.15Z"/><path class="cls-1" d="M160.53,14.07a.88.88,0,0,0,.73-.94c-.06-.3-.46-.27-.62-.11s-.12.08-.34,0-.56,0-.54.39A.76.76,0,0,0,160.53,14.07Z"/><path class="cls-1" d="M166.79,25.25a.26.26,0,0,0,.29.31.51.51,0,0,0,.32-.19c0-.09-.08-.42-.25-.44A.35.35,0,0,0,166.79,25.25Z"/><path class="cls-1" d="M160.08,18.7a.36.36,0,0,0-.29-.39.34.34,0,0,0-.42.3.4.4,0,0,0,.34.46A.37.37,0,0,0,160.08,18.7Z"/><path class="cls-1" d="M160.64,20.22c0-.3-.15-.59-.37-.59a.66.66,0,0,0-.51.32l.76.61A.62.62,0,0,0,160.64,20.22Z"/><path class="cls-1" d="M165,21.73a.53.53,0,0,0-.12-.43.41.41,0,0,0-.39,0,.44.44,0,0,0-.1.66A.39.39,0,0,0,165,21.73Z"/><path class="cls-1" d="M169.15,28.18a.67.67,0,0,0-.51-.64c-.21,0-.49.27-.53.55,0,0,0,.05,0,.07l.37.46C168.8,28.65,169.14,28.42,169.15,28.18Z"/><path class="cls-1" d="M167.13,21.2c-.09-.12-.66.19-.69.35s.3.32.58.23S167.21,21.31,167.13,21.2Z"/><path class="cls-1" d="M130.1,6.93s-.1,0-.1,0-.08.1-.05.14.08,0,.14,0S130.12,7,130.1,6.93Z"/><path class="cls-1" d="M121.93,6a.49.49,0,0,0-.38-.21.38.38,0,0,0-.31.24.43.43,0,0,0,.4.53A.38.38,0,0,0,121.93,6Z"/><path class="cls-1" d="M167.4,22.91c-.07.07,0,.24.08.27a.23.23,0,0,0,.25,0c.07-.06,0-.2,0-.26S167.47,22.83,167.4,22.91Z"/><path class="cls-1" d="M152.73,13.74a.13.13,0,0,0-.11-.11s-.09.07-.09.1a.12.12,0,0,0,.07.11C152.65,13.84,152.73,13.81,152.73,13.74Z"/><path class="cls-1" d="M112.56,8.76a.44.44,0,0,0,0-.57.4.4,0,0,0-.54,0,.37.37,0,0,0,0,.52.4.4,0,0,0,.39.13h0A.32.32,0,0,0,112.56,8.76Z"/><path class="cls-1" d="M142.94,10c.05,0,0-.24,0-.33a.18.18,0,0,0-.32,0c-.08.09-.25.34-.17.45S142.85,10.09,142.94,10Z"/><path class="cls-1" d="M166.33,15.92a.79.79,0,0,0,.76-.62.71.71,0,0,0-.57-.79,1,1,0,0,0-.86.7A.71.71,0,0,0,166.33,15.92Z"/><path class="cls-1" d="M146.46,11.23a.44.44,0,0,0,.15-.56.54.54,0,0,0-.7-.15.37.37,0,0,0-.19.49A.61.61,0,0,0,146.46,11.23Z"/><path class="cls-1" d="M170.17,25.58c.08,0,.24,0,.25-.16a.23.23,0,0,0-.19-.24c-.07,0-.29,0-.33.15S170.09,25.57,170.17,25.58Z"/><path class="cls-1" d="M169,22.37a.36.36,0,0,0-.17-.45c-.21-.08-.56.28-.5.44S168.88,22.57,169,22.37Z"/><path class="cls-1" d="M170,28.29s.09-.05.11-.08,0-.1-.06-.09-.12,0-.13.07S169.93,28.25,170,28.29Z"/><path class="cls-1" d="M169.08,17.49a.27.27,0,0,0,.09-.27c0-.06-.2-.19-.3-.15s-.1.3-.06.36S169,17.52,169.08,17.49Z"/><path class="cls-1" d="M167.77,24.82a.65.65,0,0,0,.25.35c.13.07.36-.13.34-.31a.77.77,0,0,0-.16-.27C167.93,24.56,167.74,24.67,167.77,24.82Z"/><path class="cls-1" d="M167.52,19.77a.54.54,0,0,0,.63-.47c0-.38-.3-.86-.62-.87a.63.63,0,0,0-.64.56A.69.69,0,0,0,167.52,19.77Z"/><path class="cls-1" d="M172.75,25.6a.25.25,0,0,0,.16-.17c0-.07-.1-.18-.16-.18a.21.21,0,0,0-.24.18C172.51,25.58,172.68,25.6,172.75,25.6Z"/><path class="cls-1" d="M167.43,27.38c.24-.3.29-.71-.06-.92a.65.65,0,0,0-.76,0C166.89,26.75,167.16,27.07,167.43,27.38Z"/><path class="cls-1" d="M170.61,28.28a.44.44,0,0,0-.31.1c.07.16,0,.49.22.54s.34-.24.49-.34l0-.12A.34.34,0,0,0,170.61,28.28Z"/><path class="cls-1" d="M170.37,24.6c.14.1.55,0,.59-.19s0-.46-.36-.44S170.24,24.5,170.37,24.6Z"/><path class="cls-1" d="M170.53,21.35c.1,0,.37,0,.38-.26s-.24-.24-.33-.24a.35.35,0,0,0-.27.2A.23.23,0,0,0,170.53,21.35Z"/><path class="cls-1" d="M120.27,6.07a.37.37,0,1,0,.6-.43.43.43,0,0,0-.57-.09A.37.37,0,0,0,120.27,6.07Z"/><path class="cls-1" d="M144.73,6c.12,0,.08-.22.05-.24a.32.32,0,0,0-.23-.08s-.09.15-.07.18S144.61,6,144.73,6Z"/><path class="cls-1" d="M117.78,8.07c-.2-.21-.51-.28-.66-.13a.39.39,0,0,0-.12.23Z"/><path class="cls-1" d="M124.7,5.27a.24.24,0,0,0,.17-.19c0-.08-.13-.15-.21-.15s-.22.1-.21.2S124.64,5.28,124.7,5.27Z"/><path class="cls-1" d="M123.41,7.06a.29.29,0,0,0,.39.08,2.11,2.11,0,0,0,.82-.93.5.5,0,0,0,0-.2.47.47,0,0,0-.78-.35,3.18,3.18,0,0,0-.56.54A.75.75,0,0,0,123.41,7.06Z"/><path class="cls-1" d="M110.52,8.31a.37.37,0,0,0,.51.07.44.44,0,0,0,.08-.54.36.36,0,0,0-.51,0A.34.34,0,0,0,110.52,8.31Z"/><path class="cls-1" d="M115.84,7.37a.33.33,0,0,0-.08.5.39.39,0,0,0,.56.08.36.36,0,0,0,0-.52A.35.35,0,0,0,115.84,7.37Z"/><path class="cls-1" d="M114.48,8.43s0,.06-.06.08l.85-.12-.09-.08a.37.37,0,0,0,.17-.21c.07-.24-.17-.51-.43-.55a.62.62,0,0,0-.6.31A.5.5,0,0,0,114.48,8.43Z"/><path class="cls-1" d="M116.9,6c.12-.13.06-.23,0-.34a.25.25,0,0,0-.41,0,1.09,1.09,0,0,0-.09.33A.37.37,0,0,0,116.9,6Z"/><path class="cls-1" d="M118.84,7.59a.36.36,0,0,0,.52,0h0a.87.87,0,0,0,.23.29l0,0,1.52-.1a1.21,1.21,0,0,0-.59-.43.57.57,0,0,1-.24-.19.48.48,0,0,0-.79-.14.19.19,0,0,0-.07-.12.41.41,0,0,0-.53.06A.43.43,0,0,0,118.84,7.59Z"/><path class="cls-1" d="M138.82,6.36c.28-.19.41-.6.26-.8a.57.57,0,0,0-.72,0,.5.5,0,0,0-.07.69C138.44,6.44,138.63,6.49,138.82,6.36Z"/><path class="cls-1" d="M138.77,9.19a.38.38,0,0,0-.12.16l.69.18a.36.36,0,0,0-.57-.34Z"/><path class="cls-1" d="M136.58,8.87l.79.16a.75.75,0,0,0,.15-1,.75.75,0,0,0-.9-.12.66.66,0,0,0-.05,1Z"/><path class="cls-1" d="M140.17,8.11a.54.54,0,0,0-.16-.66.37.37,0,0,0-.49.11.36.36,0,0,0,0,.49A.57.57,0,0,0,140.17,8.11Z"/><path class="cls-1" d="M143.42,10.77l1.26.47a.72.72,0,0,0,0-.61.69.69,0,0,0-.9-.23A.81.81,0,0,0,143.42,10.77Z"/><path class="cls-1" d="M143.72,7.94c.11-.09,0-.41,0-.54s-.3-.15-.43,0-.18.26-.05.38S143.62,8,143.72,7.94Z"/><path class="cls-1" d="M142,6.71a.46.46,0,0,0,.15-.52.36.36,0,0,0-.48-.1.41.41,0,0,0-.15.52A.4.4,0,0,0,142,6.71Z"/><path class="cls-1" d="M140.05,9.19a.44.44,0,0,0-.07.5l.38.11.11,0a.36.36,0,0,0,.06-.55A.33.33,0,0,0,140.05,9.19Z"/><path class="cls-1" d="M128.05,6.81a.59.59,0,0,0-.25.68c.1.21.45.24.75.07a.43.43,0,0,0,.13-.52A.52.52,0,0,0,128.05,6.81Z"/><path class="cls-1" d="M128.52,7.79l1,.06a.42.42,0,0,0-.08-.28.65.65,0,0,0-.81-.09A.38.38,0,0,0,128.52,7.79Z"/><path class="cls-1" d="M126.5,6.27c.14,0,.15-.35,0-.45a.65.65,0,0,0-.31-.08c-.21.17-.27.38-.13.46A.57.57,0,0,0,126.5,6.27Z"/><path class="cls-1" d="M130.93,7.1c.17-.11.06-.41.09-.58l-.1-.07a.36.36,0,0,0-.39.14.48.48,0,0,0-.14.29C130.55,7,130.76,7.21,130.93,7.1Z"/><path class="cls-1" d="M131.68,8.06h0Z"/><path class="cls-1" d="M133.89,7.08l0,0,.22.45c-.48.29-.49.35-.16.7.29,0,.38-.21.36-.5.65-.21.7-.61.15-1.11,0,0,0-.09,0-.13s0-.31-.13-.43A.36.36,0,0,0,134,6c-.26.12-.36.24-.34.43a.26.26,0,0,0-.2.07c-.18.15-.26.49-.14.61S133.74,7.2,133.89,7.08Z"/><path class="cls-1" d="M131.37,6.47c.07-.22.19-.43,0-.6a.32.32,0,0,0-.45,0,.44.44,0,0,0-.11.34C130.85,6.52,131.08,6.54,131.37,6.47Z"/><path class="cls-1" d="M134.43,5.21c-.08-.13-.24-.23-.36-.1a.42.42,0,0,0-.11.37c.06.1.25.12.34.16C134.53,5.49,134.51,5.33,134.43,5.21Z"/><path class="cls-1" d="M125.7,7.21a.26.26,0,0,0,.42,0,.5.5,0,0,0,.09-.36c0-.09-.36-.23-.49-.12A.33.33,0,0,0,125.7,7.21Z"/><path class="cls-1" d="M57,62.89a2.35,2.35,0,0,0-2.9,1.23,15.92,15.92,0,0,0-1.48,6.31,2,2,0,0,0,2.14,2A2.12,2.12,0,0,0,56.9,70.6a13.41,13.41,0,0,1,1.25-5.34A1.8,1.8,0,0,0,57,62.89Z"/><path class="cls-1" d="M54,77.6a1.73,1.73,0,1,0,2.08,1.7A1.92,1.92,0,0,0,54,77.6Z"/><path class="cls-1" d="M103.41,124.76a21.07,21.07,0,0,1-5.8-2.62,2.72,2.72,0,0,0-3.11.16c-.8.72-.6,1.94.53,2.64a24.75,24.75,0,0,0,6.87,3.1c1.32.41,2.69-.11,3-1A1.86,1.86,0,0,0,103.41,124.76Z"/><path class="cls-1" d="M113.25,128.11a2.2,2.2,0,0,0-2.62,1.1,1.66,1.66,0,0,0,1.34,2.14,2.19,2.19,0,0,0,2.61-1.09A1.66,1.66,0,0,0,113.25,128.11Z"/><path class="cls-1" d="M180.6,102a2.68,2.68,0,0,0-3.06.47,18.73,18.73,0,0,1-4.84,3.72,1.71,1.71,0,0,0-.77,2.47,2.54,2.54,0,0,0,3.23.4,21.85,21.85,0,0,0,5.72-4.4A1.62,1.62,0,0,0,180.6,102Z"/><path class="cls-1" d="M187.37,95.46a2.39,2.39,0,0,0-2.9.38,1.52,1.52,0,0,0,.46,2.38,2.39,2.39,0,0,0,2.9-.38A1.51,1.51,0,0,0,187.37,95.46Z"/><path class="cls-1" d="M185,50.16c-.75-1.6-3.26-2.48-3.91.38a50,50,0,0,1-2.73,9.86c-2.77,6.48-9.49,4.55-8.77-4.63a2.44,2.44,0,0,0,0-.28c1.55-14.35-10.23-30.15-26.93-36.31s-26-5.82-27.92-5.72c-2.08.11-3.85,1.82-.71,3.17a79.21,79.21,0,0,1,10.69,5.05c6.39,3.89,4.34,8.18-3.6,6.57-16-4.49-37-1.08-47.43,8.93s-14.82,18.54-15.29,20,.91,3.56,3.46,1.54A69.85,69.85,0,0,1,71.07,52c6-3.49,11,1.23,6.41,6.49a30.72,30.72,0,0,0-2.33,2.07l-.2.15a.39.39,0,0,0-.19.23c-10.83,10.91-13.69,28.17-4.93,40.37s16.92,17.37,18.51,18.2c1.76.92,4.42.4,2.86-2.22a55,55,0,0,1-5-9.24C84,102.19,89.8,99.49,95,105c8.49,12.21,28.44,19.6,44.79,16.39s25.48-7.58,26.95-8.56c1.62-1.07,1.86-3.31-1.66-2.92a86.84,86.84,0,0,1-12.28,1c-7.56-.13-7.62-5.46.41-7.68.87-.16,1.73-.34,2.59-.55l.32,0a.82.82,0,0,0,.3-.11c15.47-4,29-16.4,30.2-28.73S185.71,51.6,185,50.16ZM159.52,71.77l0,0,9.62.73Z"/><path class="cls-1" d="M179.09,43.56a2.38,2.38,0,0,0,2.63,1.36,1.78,1.78,0,0,0,1.46-2.39,17.64,17.64,0,0,0-3.33-5.82,2.53,2.53,0,0,0-3.18-.6,1.68,1.68,0,0,0-.4,2.53A15,15,0,0,1,179.09,43.56Z"/><path class="cls-1" d="M173.62,31.57a1.52,1.52,0,0,0,.46-2.38,2.39,2.39,0,0,0-2.9-.38,1.51,1.51,0,0,0-.46,2.38A2.39,2.39,0,0,0,173.62,31.57Z"/><path class="cls-1" d="M98.71,16.39a23.75,23.75,0,0,1,6.58-.67,2.25,2.25,0,0,0,2.39-1.63c.13-1-.9-1.86-2.32-1.88a27.79,27.79,0,0,0-7.78.8c-1.36.31-2.1,1.38-1.68,2.29A2.48,2.48,0,0,0,98.71,16.39Z"/><path class="cls-1" d="M88.35,18.42a1.66,1.66,0,0,0,1.33-2.15,2.21,2.21,0,0,0-2.62-1.09,1.66,1.66,0,0,0-1.33,2.14A2.2,2.2,0,0,0,88.35,18.42Z"/><path class="cls-2" d="M127.18,44l8.18-1.47c8.8-1.58,17.32,3.49,18.21,10.85l.82,6.82a10.82,10.82,0,0,0,2,5l4.23,5.92c4.56,6.37,1.31,14.58-7,17.54L146,91.41a15.11,15.11,0,0,0-5.22,3.11l-5.56,5.12c-6,5.53-16.52,5.53-22.51,0l-5.56-5.12a15,15,0,0,0-5.22-3.11l-7.67-2.75c-8.26-3-11.51-11.17-7-17.54l4.23-5.92a10.94,10.94,0,0,0,2-5l.81-6.82c.89-7.36,9.41-12.43,18.22-10.85L120.73,44A17.93,17.93,0,0,0,127.18,44Z"/><path class="cls-2" d="M141.48,98.29c.09-.06.07-.31.08-.48a.14.14,0,0,0-.13-.18A.44.44,0,0,0,141,98,.33.33,0,0,0,141.48,98.29Z"/><path class="cls-2" d="M141.18,99.49a.73.73,0,0,0,.71-.56c0-.2-.18-.42-.42-.45a.5.5,0,0,0-.62.42C140.82,99.17,141,99.46,141.18,99.49Z"/><path class="cls-2" d="M136.31,98.63l-.31.28A.7.7,0,0,0,136.31,98.63Z"/><path class="cls-2" d="M123.66,103.77l-.47,0A.69.69,0,0,0,123.66,103.77Z"/><path class="cls-2" d="M134.27,100.56a.23.23,0,0,0,0-.13,2.31,2.31,0,0,1-.24.2l.05,0A.31.31,0,0,0,134.27,100.56Z"/><path class="cls-2" d="M134.18,102.39a.33.33,0,0,0,.3.38.39.39,0,0,0,.43-.31c0-.2-.09-.3-.28-.34A.38.38,0,0,0,134.18,102.39Z"/><path class="cls-2" d="M162.65,56.92a.42.42,0,0,0,.44-.31.44.44,0,0,0-.36-.45.34.34,0,0,0-.38.29A.37.37,0,0,0,162.65,56.92Z"/><path class="cls-2" d="M165.37,57.72a.74.74,0,0,0-.88.18c-.19.26-.12.42.38.82-.13.2-.29.4,0,.61a.38.38,0,0,0,.49,0,.27.27,0,0,0,.12-.2,4.45,4.45,0,0,0-.14-.55C165.56,58.24,165.6,57.87,165.37,57.72Z"/><path class="cls-2" d="M121.75,103.76l0,0a.72.72,0,0,0,1-.06c-.39,0-.78-.07-1.17-.12A.38.38,0,0,0,121.75,103.76Z"/><path class="cls-2" d="M162.81,59.49a.36.36,0,0,0,.47-.23.61.61,0,0,0-.39-.66.43.43,0,0,0-.49.3A.54.54,0,0,0,162.81,59.49Z"/><path class="cls-2" d="M163.29,61.54c.16.05.36-.26.3-.54s-.43-.26-.56-.19S163.14,61.49,163.29,61.54Z"/><path class="cls-2" d="M163.13,57.35a.33.33,0,0,0,.16.28.23.23,0,0,0,.33-.17c0-.11,0-.38-.21-.42S163.14,57.26,163.13,57.35Z"/><path class="cls-2" d="M145.87,98.22a.5.5,0,0,0,.87-.35,3.42,3.42,0,0,0-.17-.77.76.76,0,0,0-.79-.36c-.17.05-.48.26-.32.57C145.94,97.64,145.6,97.88,145.87,98.22Z"/><path class="cls-2" d="M162.91,54.33a.52.52,0,0,0-.5.37c0,.24.27.72.46.73s.51-.27.55-.59S163.28,54.37,162.91,54.33Z"/><path class="cls-2" d="M163.1,77.42c.09-.35-.08-.6-.46-.72a9.61,9.61,0,0,1,0,1.2A.72.72,0,0,0,163.1,77.42Z"/><path class="cls-2" d="M88,53.66c-.1-.13-.54-.06-.57.14a.33.33,0,0,0,.25.36C87.87,54.19,88.1,53.78,88,53.66Z"/><path class="cls-2" d="M119.26,103.71a.33.33,0,0,0,.19.26.48.48,0,0,0,.44-.1.5.5,0,0,0,.32.11c.21,0,.29-.16.37-.32l.1-.18c-.3,0-.6-.12-.89-.19,0,0,0,0,0,0a.38.38,0,0,0-.52.21.09.09,0,0,0,0,0,.25.25,0,0,0-.2-.17c-.18,0-.35.06-.34.23a1,1,0,0,0,.13.33A.37.37,0,0,0,119.26,103.71Z"/><path class="cls-2" d="M90.15,89.75a1.26,1.26,0,0,0,.29.27c.16.07.28,0,.32-.2s0-.3-.14-.36A.41.41,0,0,0,90.15,89.75Z"/><path class="cls-2" d="M88.41,90.68a.73.73,0,0,0,.94-.21.41.41,0,0,0,.17.2.32.32,0,0,0,.45-.15.37.37,0,0,0-.17-.46.31.31,0,0,0-.39.07.81.81,0,0,0-.43-.67.66.66,0,0,0-.83.29A.63.63,0,0,0,88.41,90.68Z"/><path class="cls-2" d="M89.79,86.23a.18.18,0,0,0-.13.2.27.27,0,0,0,.23.18c.09,0,.13-.15.12-.24h0l-.14-.11S89.82,86.22,89.79,86.23Z"/><path class="cls-2" d="M85.21,76.58a.5.5,0,0,0,0,.17s0,0,.06.08c0-.14,0-.28,0-.42a.54.54,0,0,0,0,.11Z"/><path class="cls-2" d="M88.31,87.48a.82.82,0,0,0,.71-.41c0-.26-.1-.47-.41-.56s-.46,0-.55.38S88.08,87.43,88.31,87.48Z"/><path class="cls-2" d="M84.83,78.72a1.18,1.18,0,0,0,.41.4l.15,0a12.36,12.36,0,0,1-.14-1.35h0l0,0c0-.15,0-.31,0-.46a.4.4,0,0,0-.15-.14A15.24,15.24,0,0,0,84.83,78.72Z"/><path class="cls-2" d="M92.14,88.24a.22.22,0,0,0,.14.24c0,.13,0,.24.12.37s.36.41.59.21.11-.38.05-.44-.08-.26,0-.21.17,0,.25-.14c-.29-.13-.58-.25-.86-.39a.48.48,0,0,0-.06.21A.2.2,0,0,0,92.14,88.24Z"/><path class="cls-2" d="M89,85.71a.29.29,0,0,0,.15,0c-.21-.2-.41-.41-.61-.61a.05.05,0,0,0,0,0A.65.65,0,0,0,89,85.71Z"/><path class="cls-2" d="M90.66,87.89a.14.14,0,0,0-.09-.21c-.1,0-.16,0-.2.09a.13.13,0,0,0,.08.2C90.56,88,90.62,88,90.66,87.89Z"/><path class="cls-2" d="M96.64,96.57a.52.52,0,0,0,.62-.26.6.6,0,0,0-.29-.67c-.21-.08-.49.14-.59.46A.42.42,0,0,0,96.64,96.57Z"/><path class="cls-2" d="M95.41,94c0-.07-.1-.16-.16-.19s-.21,0-.23.11.14.18.21.2S95.4,94.05,95.41,94Z"/><path class="cls-2" d="M97.54,100.14c0-.21.06-.47-.24-.55a.33.33,0,0,0-.44.2.43.43,0,0,0,0,.35C97,100.32,97.17,100.31,97.54,100.14Z"/><path class="cls-2" d="M93,89.65s.18,0,.19-.07a.3.3,0,0,0-.06-.23.21.21,0,0,0-.29.05C92.79,89.53,93,89.61,93,89.65Z"/><path class="cls-2" d="M94.56,90.05c.15-.11.13-.23-.1-.54a.32.32,0,0,0-.33.45A.33.33,0,0,0,94.56,90.05Z"/><path class="cls-2" d="M92.67,92.23a.48.48,0,0,0,.19-.34c0-.27-.28-.33-.54-.32-.14.17-.27.35-.12.56A.32.32,0,0,0,92.67,92.23Z"/><path class="cls-2" d="M93.37,93.49a.59.59,0,1,0,.27-1.13.46.46,0,0,0-.54.37C93,93,93.16,93.43,93.37,93.49Z"/><path class="cls-2" d="M165.29,65.2a.52.52,0,0,0-.33.58.36.36,0,0,0,.42.26.35.35,0,0,0,.36-.33C165.77,65.41,165.41,65.2,165.29,65.2Z"/><path class="cls-2" d="M159.23,67.72a.35.35,0,0,0,.25.46.41.41,0,0,0,.5-.28.37.37,0,0,0-.33-.41A.36.36,0,0,0,159.23,67.72Z"/><path class="cls-2" d="M161.9,57.84s.13,0,.13-.09-.06-.11-.1-.12-.09.07-.1.1A.12.12,0,0,0,161.9,57.84Z"/><path class="cls-2" d="M160.73,63.12c.19-.11.19-.28,0-.66-.21,0-.46-.08-.57.21a.36.36,0,0,0,.18.46A.47.47,0,0,0,160.73,63.12Z"/><path class="cls-2" d="M161.25,56.46c.16,0,.32,0,.31-.22s-.09-.45-.24-.48-.28.3-.32.43S161.06,56.46,161.25,56.46Z"/><path class="cls-2" d="M160.81,60.76h.11a.48.48,0,0,0,.46.45.6.6,0,0,0,.64-.54.56.56,0,0,0-.35-.54.53.53,0,0,0-.38-.59.85.85,0,0,0-.95.51A.62.62,0,0,0,160.81,60.76Z"/><path class="cls-2" d="M160,64.78a.75.75,0,0,0,.69-.31.47.47,0,0,0-.19-.52s.1,0,.1-.07,0-.23-.08-.27-.21.11-.21.14a.33.33,0,0,0,0,.13l-.06,0c-.23-.07-.45.12-.54.44A.36.36,0,0,0,160,64.78Z"/><path class="cls-2" d="M147,44.37a14.18,14.18,0,0,1,1.45.91c.09-.07.17-.13.22-.12s.3.6.75.64a.68.68,0,0,0,.45-.12,21.94,21.94,0,0,0-1.83-2h0a.36.36,0,0,0-.14,0,.22.22,0,0,0-.18,0A1.2,1.2,0,0,0,147,44.37Z"/><path class="cls-2" d="M150.33,46.32h.08l-.42-.55A.44.44,0,0,0,150.33,46.32Z"/><path class="cls-2" d="M145.84,43.72v0q.32.14.63.3s0,0,0,0a.42.42,0,0,0,0-.63,1.23,1.23,0,0,1,.41.1.43.43,0,0,0,.35-.09,2.82,2.82,0,0,1,.36-.24l-.67-.59-.07.06-.25-.14a.33.33,0,0,0-.21-.05.23.23,0,0,0,.19-.15l-.43-.35a.63.63,0,0,0-.12.23c0,.17.09.27.26.27h.06a.4.4,0,0,0-.2.09.54.54,0,0,0-.12.56.33.33,0,0,0,.19.26A.51.51,0,0,0,145.84,43.72Z"/><path class="cls-2" d="M145,41.65a.31.31,0,0,0,.44-.18s0,0,0,0l-.54-.38a.37.37,0,0,0-.1.16A.32.32,0,0,0,145,41.65Z"/><path class="cls-2" d="M152.08,49.11l0,0c-.17-.33-.35-.67-.55-1l-.22,0A13.06,13.06,0,0,1,152.08,49.11Z"/><path class="cls-2" d="M165.4,53.77a.67.67,0,0,0,.51.24l-.21-1.07h0A.68.68,0,0,0,165.4,53.77Z"/><path class="cls-2" d="M165.26,56.14a.47.47,0,0,0,.36.6.83.83,0,0,0,.57-.47c0-.21-.1-.35-.39-.4S165.3,55.91,165.26,56.14Z"/><path class="cls-2" d="M164,59.23c-.1.19.17.53.33.54a.76.76,0,0,0-.49.51.7.7,0,0,0,1.33.39.9.9,0,0,0-.56-.92.74.74,0,0,0-.21,0c.15-.09.25-.52.08-.63A.39.39,0,0,0,164,59.23Z"/><path class="cls-2" d="M165.48,52.39h.1c0-.17-.07-.34-.11-.51a.27.27,0,0,0-.16.25A.31.31,0,0,0,165.48,52.39Z"/><path class="cls-2" d="M165.22,50.83a.18.18,0,0,0,.05.23C165.25,51,165.24,50.91,165.22,50.83Z"/><path class="cls-2" d="M164,55.07c-.11,0-.3.24-.29.3s.15.32.25.3a.36.36,0,0,0,.25-.24C164.23,55.34,164.1,55.08,164,55.07Z"/><path class="cls-2" d="M161.7,63.59a.4.4,0,0,0,.76.2.44.44,0,0,0,0-.23l.08,0a.26.26,0,0,0,.26-.1.45.45,0,0,0,.61.13.39.39,0,0,0-.11-.63.57.57,0,0,0-.44.06.44.44,0,0,0-.06.12c0-.14-.1-.28-.19-.29s-.3.27-.36.39a.16.16,0,0,0,0,.07h0A.44.44,0,0,0,161.7,63.59Z"/><path class="cls-2" d="M87.33,59.76a.32.32,0,0,0-.3,0c-.15.12,0,.3.06.34s.46.2.57.11,0,0,0-.09l.07,0a.33.33,0,0,0-.07-.5.3.3,0,0,0-.29,0A.35.35,0,0,0,87.33,59.76Z"/><path class="cls-2" d="M166.5,62.36c.06-.36-.05-.56-.32-.61a.66.66,0,0,0-.58.23,1.21,1.21,0,0,0,0-.46.5.5,0,0,0-.1-.17.47.47,0,0,0-.84.18,3.15,3.15,0,0,0-.09.42.46.46,0,0,0-.14.2.19.19,0,0,0,.14.25.77.77,0,0,0,.57.53c.17,0,.32,0,.37-.18l.09-.33a.67.67,0,0,0,.43.41C166.19,62.87,166.46,62.63,166.5,62.36Z"/><path class="cls-2" d="M166.46,58c0-.21,0-.42-.06-.63-.09,0-.16.12-.17.31A.32.32,0,0,0,166.46,58Z"/><path class="cls-2" d="M165.47,55.32a.38.38,0,0,0,.05-.49.3.3,0,0,0-.37-.15c-.27.09-.29.31-.29.58C165.09,55.36,165.27,55.53,165.47,55.32Z"/><path class="cls-2" d="M162.14,51.75s.07.17.1.17a.32.32,0,0,0,.22-.12.22.22,0,0,0-.11-.27C162.2,51.49,162.16,51.68,162.14,51.75Z"/><path class="cls-2" d="M163.12,46s.13,0,.13-.09-.06-.11-.1-.12a.17.17,0,0,0-.1.1S163.07,46,163.12,46Z"/><path class="cls-2" d="M162.7,50.1a.38.38,0,0,0,.41-.25c0-.14-.15-.29-.36-.32s-.26,0-.27.2S162.5,50.06,162.7,50.1Z"/><path class="cls-2" d="M162.16,46.54a.32.32,0,0,0,.22-.12c0-.05,0-.25-.11-.26s-.19.14-.21.21S162.13,46.54,162.16,46.54Z"/><path class="cls-2" d="M163.64,47.63c.06,0,.28,0,.28-.11a.25.25,0,0,0-.18-.19c-.08,0-.24,0-.24.08A.24.24,0,0,0,163.64,47.63Z"/><path class="cls-2" d="M163.82,46.84a.39.39,0,0,0,.2-.05c-.07-.23-.15-.45-.22-.67a.38.38,0,0,0-.2.3C163.57,46.66,163.66,46.83,163.82,46.84Z"/><path class="cls-2" d="M163.88,52.72c.36.08.68-.19.77-.64a.61.61,0,0,0-.51-.75.78.78,0,0,0-.84.58A.82.82,0,0,0,163.88,52.72Z"/><path class="cls-2" d="M164.57,50.42a.3.3,0,0,0,.4-.24.32.32,0,0,0-.23-.37c-.15-.05-.47.2-.43.34A.41.41,0,0,0,164.57,50.42Z"/><path class="cls-2" d="M95.18,95.23c.08-.26-.06-.45-.4-.55s-.58.07-.63.25a.65.65,0,0,0,.38.71A.6.6,0,0,0,95.18,95.23Z"/><path class="cls-2" d="M96.56,92.49a.5.5,0,0,0-.18-.57,4.23,4.23,0,0,0-.42-.25,2,2,0,0,0,0-.24.75.75,0,0,0-.58-.59.86.86,0,0,0-.75.37.45.45,0,0,0-.07.32.69.69,0,0,0,.78.56l.25,0a3.14,3.14,0,0,0,0,.45c.05.27.16.36.43.35A.55.55,0,0,0,96.56,92.49Z"/><path class="cls-2" d="M95.76,96.81c0,.09.09.19.15.2s.26,0,.28-.1-.14-.22-.21-.23S95.78,96.72,95.76,96.81Z"/><path class="cls-2" d="M126.88,104.32a.75.75,0,0,0,.66-.29.35.35,0,0,0,.41.15c.17-.08.17-.21,0-.55a.27.27,0,0,0-.25,0,.63.63,0,0,0,0-.27c-.43.09-.87.17-1.31.22A.84.84,0,0,0,126.88,104.32Z"/><path class="cls-2" d="M133.18,101.54a.32.32,0,0,0,.42-.22.41.41,0,0,0-.09-.36l-.57.38A.33.33,0,0,0,133.18,101.54Z"/><path class="cls-2" d="M136.24,100.6a.37.37,0,0,0-.35-.39.4.4,0,0,0-.19,0,.85.85,0,0,0-.59-.52c-.26.24-.53.46-.81.68a.8.8,0,0,0,.52.68.78.78,0,0,0,.7-.26.25.25,0,0,0,.2.16A.62.62,0,0,0,136.24,100.6Z"/><path class="cls-2" d="M129.66,102.86l-.37.11A.5.5,0,0,0,129.66,102.86Z"/><path class="cls-2" d="M135,104c0-.13-.16-.29-.37-.32a.21.21,0,0,0-.27.2.81.81,0,0,0,0,.16.31.31,0,0,0-.28.23.31.31,0,0,0,.23.41.36.36,0,0,0,.47-.23.28.28,0,0,0,0-.22A.4.4,0,0,0,135,104Z"/><path class="cls-2" d="M129.65,103.56c-.07.21,0,.34.19.35s.33,0,.37-.14-.1-.31-.2-.4S129.69,103.4,129.65,103.56Z"/><path class="cls-2" d="M143.65,43a16.35,16.35,0,0,1,1.58.55c.72-.17.71-.74.51-1.22a.77.77,0,0,0-.33-.38.8.8,0,0,0-.68,0c-.25.08-.5,0-.7.13A1.18,1.18,0,0,0,143.65,43Z"/><path class="cls-2" d="M85.76,61.52c.07-.06,0-.23-.05-.29a.15.15,0,0,0-.2,0,.23.23,0,0,0,0,.24S85.69,61.59,85.76,61.52Z"/><path class="cls-2" d="M86.53,82.51a.34.34,0,0,0,.19.44.65.65,0,0,0,.22.08c-.14-.22-.29-.44-.41-.66A.65.65,0,0,1,86.53,82.51Z"/><path class="cls-2" d="M86.55,57.49a.49.49,0,0,0,0,.74c.23.22.54.25.69.06a.68.68,0,0,0,.1-.69.14.14,0,0,0,.1-.05s0-.1,0-.13a.12.12,0,0,0-.15,0h0a.56.56,0,0,1,0-.08A.53.53,0,0,0,86.55,57.49Z"/><path class="cls-2" d="M87.69,87.12a.42.42,0,0,0,.1-.79.57.57,0,0,0-.6.33A.54.54,0,0,0,87.69,87.12Z"/><path class="cls-2" d="M87,85.76c.15,0,.38-.24.4-.43a.26.26,0,0,0,0-.12.37.37,0,0,0,.38-.22.42.42,0,0,0-.26-.51.41.41,0,0,0-.47.24.41.41,0,0,0,.08.33c-.3,0-.5.1-.51.25a.31.31,0,0,0,0,.08.54.54,0,0,0-.26-.2c-.09.06-.27.12-.35.25s0,.43.25.5a.34.34,0,0,0,.42-.24.34.34,0,0,0,0-.22A.63.63,0,0,0,87,85.76Z"/><path class="cls-2" d="M91.73,92c.12-.28-.19-.54-.18-.87,0-.78-.57-.89-1.09-.81a.84.84,0,0,0-.44.25.8.8,0,0,0-.18.65c0,.27-.15.48,0,.72a1.12,1.12,0,0,0,1.21.58A.92.92,0,0,0,91.73,92Z"/><path class="cls-2" d="M90.53,93.13a.17.17,0,0,0,.11.16.24.24,0,0,0,.21-.11c0-.05,0-.25-.1-.27S90.56,93.05,90.53,93.13Z"/><path class="cls-2" d="M85.81,84.28c-.26,0-.3.24-.28.46a.42.42,0,0,0,.65,0C86.14,84.47,86.08,84.24,85.81,84.28Z"/><path class="cls-2" d="M94.48,96.67a1.12,1.12,0,0,0-.31.15.36.36,0,0,0,.32.42c.18,0,.22-.11.24-.24A.25.25,0,0,0,94.48,96.67Z"/><path class="cls-2" d="M166.33,58.4a.57.57,0,0,0,.21.51c0-.24,0-.47-.06-.71A.29.29,0,0,0,166.33,58.4Z"/><path class="cls-2" d="M163.78,71.73a.32.32,0,0,0,.22-.12s0-.22-.11-.26-.18.14-.21.21S163.75,71.73,163.78,71.73Z"/><path class="cls-2" d="M163.36,70.83a.28.28,0,0,0-.27.17,1.11,1.11,0,0,0-.79-.28.77.77,0,0,0-.48.16.78.78,0,0,0-.29.62c0,.26-.24.44-.15.69a1.53,1.53,0,0,0,.14.29l0,.08v0a3.13,3.13,0,0,1,.15.32.86.86,0,0,0,.36,0,1,1,0,0,0,.47.09.86.86,0,0,0,.77-.38c.18-.26-.08-.57,0-.89a1.22,1.22,0,0,0,0-.17.33.33,0,0,0,.36,0c.15-.1.23-.26.12-.41S163.49,70.83,163.36,70.83Z"/><path class="cls-2" d="M89.37,58.87a.41.41,0,0,0,.17.54.37.37,0,0,0,.53-.16.39.39,0,0,0-.15-.5A.38.38,0,0,0,89.37,58.87Z"/><path class="cls-2" d="M89.07,55.11a.5.5,0,0,0-.1-.17.47.47,0,0,0-.84.19,3.41,3.41,0,0,0-.11.78.74.74,0,0,0,.61.61c.17,0,.54-.06.5-.41C88.8,55.63,89.2,55.53,89.07,55.11Z"/><path class="cls-2" d="M164.57,65.65c.23,0,.43-.14.51-.47a.55.55,0,0,0-.28-.61.7.7,0,0,0-.72.39.41.41,0,0,0,0,.11.66.66,0,0,0-.26-.18,1.19,1.19,0,0,0-.81,0,.51.51,0,0,1-.3,0,.48.48,0,0,0-.71.37.19.19,0,0,0-.13-.06c-.17,0-.35.15-.39.37a.43.43,0,0,0,.29.54.35.35,0,0,0,.42-.32h0a.66.66,0,0,0,.36.09A.72.72,0,0,1,163,66a.77.77,0,0,0,.75,0,.66.66,0,0,0,.41-.61v-.07A.57.57,0,0,0,164.57,65.65Z"/><path class="cls-2" d="M148.33,99.6c-.15.18-.2.36,0,.52s.25.07.29,0a.47.47,0,0,0,.16-.35C148.72,99.57,148.51,99.59,148.33,99.6Z"/><path class="cls-2" d="M135.81,101.65c0-.09-.12-.19-.17-.19s-.24,0-.25.09a.25.25,0,0,0,.14.21C135.59,101.78,135.81,101.74,135.81,101.65Z"/><path class="cls-2" d="M164.81,68.32a.51.51,0,0,0,.52-.4h0a.68.68,0,0,0,.62-.37c0-.2-.23-.54-.48-.61a.32.32,0,0,0-.41.24,1.49,1.49,0,0,0,0,.21h0a.48.48,0,0,0-.12,0,.41.41,0,0,0,0-.08.38.38,0,0,0-.29-.44.4.4,0,0,0-.47.31.43.43,0,0,0,.19.43.37.37,0,0,0-.08.18C164.29,68,164.54,68.29,164.81,68.32Z"/><path class="cls-2" d="M166.64,60.62c0-.26,0-.5,0-.76l0,0a1.43,1.43,0,0,0,0,.29h0C166.48,60.4,166.53,60.57,166.64,60.62Z"/><path class="cls-2" d="M139,100.66c.22,0,.48-.18.55-.5a.27.27,0,0,0-.23-.36.52.52,0,0,0-.62.25A.6.6,0,0,0,139,100.66Z"/><path class="cls-2" d="M147.52,98.6c-.19.05-.26.52-.12.59s.53-.13.49-.33A.36.36,0,0,0,147.52,98.6Z"/><path class="cls-2" d="M140.18,99.37a.43.43,0,0,0-.36-.45.35.35,0,0,0-.38.29.38.38,0,0,0,.31.47A.4.4,0,0,0,140.18,99.37Z"/><path class="cls-2" d="M135.19,103.86a.41.41,0,0,0,.64,0c0-.23-.09-.46-.37-.42S135.16,103.64,135.19,103.86Z"/><path class="cls-2" d="M136.34,100.77a.48.48,0,0,0,.39.62.59.59,0,0,0,.77-.48.63.63,0,0,0-.39-.75C136.82,100.07,136.43,100.38,136.34,100.77Z"/><path class="cls-2" d="M137.85,101.27c0,.19.29.48.58.52a.43.43,0,0,0,.44-.37.51.51,0,0,0-.36-.56A.66.66,0,0,0,137.85,101.27Z"/><path class="cls-2" d="M90.13,87.83a.52.52,0,0,0-.33-.63.35.35,0,0,0-.52.18.74.74,0,0,0,0,.65.41.41,0,0,0-.22,0,.61.61,0,0,0-.36.67A.52.52,0,0,0,89,89a.71.71,0,0,0,.94-.34,2.6,2.6,0,0,0-.19-.42.27.27,0,0,0-.08-.07A.67.67,0,0,0,90.13,87.83Z"/><path class="cls-2" d="M92.19,57.19a.29.29,0,0,0,.07.46.36.36,0,0,0,.52-.08.36.36,0,0,0-.08-.48A.37.37,0,0,0,92.19,57.19Z"/><path class="cls-2" d="M135.56,41.64c-.28,0-.49.15-.48.36a1,1,0,0,0,.31.5c.21,0,.41,0,.62-.08a.62.62,0,0,0,.11-.37C136.12,41.79,135.92,41.64,135.56,41.64Z"/><path class="cls-2" d="M135.06,41.06a.35.35,0,0,0-.46.24.33.33,0,0,0,.19.44c.23.07.56,0,.61-.19S135.24,41.13,135.06,41.06Z"/><path class="cls-2" d="M133.85,41.36a.43.43,0,0,0-.35.41.38.38,0,0,0,.37.37.42.42,0,0,0,.37-.43A.41.41,0,0,0,133.85,41.36Z"/><path class="cls-2" d="M134.63,39.28a.4.4,0,0,0-.45.22.45.45,0,0,0,.27.58.47.47,0,0,0,.48-.48A.3.3,0,0,0,134.63,39.28Z"/><path class="cls-2" d="M140.21,41.75c-.35-.13-.69,0-.77.19v0a.36.36,0,0,0-.36.26c.44,0,.88,0,1.31.08l0-.06A.47.47,0,0,0,140.21,41.75Z"/><path class="cls-2" d="M90.59,56c.09.07.33-.07.41-.14a.26.26,0,0,0-.1-.4.36.36,0,0,0-.31.13C90.54,55.62,90.49,55.88,90.59,56Z"/><path class="cls-2" d="M88.05,56.67a.13.13,0,0,0,.16,0,.17.17,0,0,0,0-.14s-.1,0-.13,0A.1.1,0,0,0,88.05,56.67Z"/><path class="cls-2" d="M90,54.47A.38.38,0,0,0,90,55a.4.4,0,0,0,.56,0,.37.37,0,0,0,0-.56A.39.39,0,0,0,90,54.47Z"/><path class="cls-2" d="M90.26,56.86a.31.31,0,0,0-.05.29c.05.09.18.21.27.2.25,0,.32-.3.28-.43A.34.34,0,0,0,90.26,56.86Z"/><path class="cls-2" d="M94.1,51.42a.34.34,0,0,0,0,.34c0,.07.3.18.38.12s0-.33,0-.37S94.17,51.38,94.1,51.42Z"/><path class="cls-2" d="M93,55.87a.46.46,0,0,0,.24.57.5.5,0,0,0,.71-.16l.06-.47a.36.36,0,0,0-.14-.21A.75.75,0,0,0,93,55.87Z"/><path class="cls-2" d="M92.05,54.78c-.23-.14-.47,0-.64.26a.4.4,0,0,0,.08.57.79.79,0,0,0,.8-.14A.48.48,0,0,0,92.05,54.78Z"/><path class="cls-2" d="M92.33,52a.56.56,0,0,0,.22.73.57.57,0,0,0,.64-.95A.83.83,0,0,0,92.33,52Z"/><path class="cls-2" d="M91.64,51.29a.44.44,0,0,0-.48,0,.38.38,0,0,0-.47.13.57.57,0,0,0,.19.69.33.33,0,0,0,.46-.12s0-.05,0-.07a.32.32,0,0,0,.28-.1A.41.41,0,0,0,91.64,51.29Z"/><path class="cls-2" d="M130.52,36.24a.51.51,0,0,0-.65-.25.76.76,0,0,0-.25.91.53.53,0,0,0,.63.13.68.68,0,1,0,1,.74.9.9,0,0,0-.69-.83.53.53,0,0,0-.24.06A.53.53,0,0,0,130.52,36.24Z"/><path class="cls-2" d="M130.17,39.2c-.09,0,0,.22,0,.29a.19.19,0,0,0,.2.07c.06,0,.06-.17,0-.25S130.27,39.15,130.17,39.2Z"/><path class="cls-2" d="M117.05,35.82c.06,0,.22-.14.17-.24s-.21-.07-.25,0-.16.1-.11.21A.13.13,0,0,0,117.05,35.82Z"/><path class="cls-2" d="M114.5,35.47a.33.33,0,0,0,0-.57.34.34,0,0,0-.38.22A.32.32,0,0,0,114.5,35.47Z"/><path class="cls-2" d="M94.56,52a.39.39,0,0,0,0,.24c0-.1,0-.21.07-.31Z"/><path class="cls-2" d="M123.92,37.86c.24-.14.29-.37.12-.67s-.37-.28-.67-.11a.4.4,0,0,0-.21.48A.81.81,0,0,0,123.92,37.86Z"/><path class="cls-2" d="M131.06,40.32c.08,0,.08-.24,0-.3a.2.2,0,0,0-.23-.09c-.08,0-.09.17-.07.24S131,40.36,131.06,40.32Z"/><path class="cls-2" d="M159.84,70a.57.57,0,0,0,.15-.12.52.52,0,0,0,.26.36.72.72,0,0,0,1-.08.83.83,0,0,0,0-.74.34.34,0,0,0,.37-.25.4.4,0,0,0-.3-.44.37.37,0,0,0-.45.26s0,0,0,.07a.68.68,0,0,0-.69.22l0,0a.62.62,0,0,0-.54-.46.89.89,0,0,0-.32,0,.29.29,0,0,0,0-.26.47.47,0,0,0-.61-.2Z"/><path class="cls-2" d="M159.25,66c0-.17-.1-.22-.23-.25s-.35.06-.33.23a1.19,1.19,0,0,0,.12.32A.37.37,0,0,0,159.25,66Z"/><path class="cls-2" d="M161.09,66.1a.54.54,0,0,0-.64.08.43.43,0,0,0-.1.58c.08.13.16.4.33.5a.28.28,0,0,0-.08.15.75.75,0,0,0,.54.72.43.43,0,0,0,.52-.38.47.47,0,0,0-.42-.63h-.17a.41.41,0,0,1,.07-.15A.6.6,0,0,0,161.09,66.1Z"/><path class="cls-2" d="M132.12,36.76a.4.4,0,1,0,.26.75c.16-.09.21-.4.06-.7A.54.54,0,0,0,132.12,36.76Z"/><path class="cls-2" d="M132.86,39.23c0-.37-.14-.55-.41-.56a.65.65,0,0,0-.61.53.69.69,0,0,0,.58.58C132.63,39.78,132.86,39.5,132.86,39.23Z"/><path class="cls-2" d="M112.7,99.64l-.15-.14-.07,0c.14.22.31.48.52.76a1,1,0,0,1,.37-.12C113.14,100,112.91,99.84,112.7,99.64Z"/><path class="cls-2" d="M113.53,101l.33.37A.61.61,0,0,0,113.53,101Z"/><path class="cls-2" d="M116.25,102.05h0c-.44-.22-.87-.45-1.29-.71-.19.12-.48.28-.53.6h0c.28.27.59.54.92.82A1.34,1.34,0,0,0,116.25,102.05Z"/><path class="cls-2" d="M118.71,103.16a.37.37,0,0,0,0-.18l-.62-.19-.37.07a.33.33,0,0,0-.18-.11.36.36,0,0,0-.18,0c-.14-.11-.21-.06-.46.15,0,.16.23.35,0,.47a2.91,2.91,0,0,0-.37-.33.49.49,0,0,0-.53,0l-.07.06c.27.21.56.41.87.61l0,0v.06a16.78,16.78,0,0,0,1.75,1l.15-.1c.27-.26.25-.5-.05-.88A2.55,2.55,0,0,0,118.71,103.16Z"/><path class="cls-2" d="M133.27,103.3c-.29-.06-.59.08-.63.3a.8.8,0,0,0,.58.79c.22,0,.46-.18.51-.48S133.65,103.37,133.27,103.3Z"/><path class="cls-2" d="M121.65,105a.51.51,0,0,0-.38-.24.66.66,0,0,0-.28,0c0-.06,0-.12-.08-.15-.2-.13-.41-.05-.54.23,0,0,0,.07,0,.1s-.19.18-.31,0a1.53,1.53,0,0,0-.11-.16.64.64,0,0,0-.72-.13.55.55,0,0,0-.29.21c.54.24,1.11.46,1.72.67a1.09,1.09,0,0,0,.08-.15.8.8,0,0,0,.31.27c.34.11.7.21,1.07.3a1.1,1.1,0,0,0,.1-.45C122.21,105.34,121.91,105.08,121.65,105Z"/><path class="cls-2" d="M133.43,105.92a.38.38,0,0,0-.09-.44.51.51,0,0,0-.58,0,.36.36,0,0,0-.24.21.5.5,0,0,0-.37-.32.31.31,0,0,0-.37.26.57.57,0,0,0,.12.43.4.4,0,0,0,.61-.12,1.2,1.2,0,0,1,0,.42.32.32,0,0,0,0,.16l1-.13-.18-.16Z"/><path class="cls-2" d="M136,105.47a.38.38,0,0,0-.21,0,.49.49,0,0,0-.25-.16.75.75,0,0,0-.75.25.85.85,0,0,0-.51.15.16.16,0,0,0-.08,0c-.14,0-.18.14-.21.21s0,.1.07.13,0,0,0,0a.62.62,0,0,0,0,.19c.78-.13,1.58-.28,2.41-.45A.57.57,0,0,0,136,105.47Z"/><path class="cls-2" d="M132,103.27c.17.07.44,0,.59-.35l0,0a.38.38,0,0,0,.41-.26.37.37,0,0,0-.31-.43.24.24,0,0,0-.17,0,.4.4,0,0,0-.43-.2c-.3.09-.32.29-.43.24s-.12-.1-.21-.15a3.88,3.88,0,0,1-.36.15,1.23,1.23,0,0,0,0,.62c0,.09.27.28.12.43a3.39,3.39,0,0,1-.34.23.37.37,0,0,0-.27.16.49.49,0,0,0,.08.33.65.65,0,0,0,.15.65c.28.21.41-.07.61-.12a.48.48,0,0,0,.39-.5c0-.27-.19-.52-.15-.65S131.76,103.19,132,103.27Z"/><path class="cls-2" d="M125.83,105.43a.45.45,0,0,0,.17-.2c0-.19-.23-.53-.48-.6a.31.31,0,0,0-.41.23.63.63,0,0,0,.17.69.3.3,0,0,0,0,.29.32.32,0,0,0,.45.18.46.46,0,0,0,.24-.31A.38.38,0,0,0,125.83,105.43Z"/><path class="cls-2" d="M130.06,105.34a.35.35,0,0,0,.41.16.32.32,0,0,0,0-.56C130.17,104.84,130,105.18,130.06,105.34Z"/><path class="cls-2" d="M124.82,104.6a.71.71,0,0,0-.69-.82h-.41a.77.77,0,0,0-.33.15.8.8,0,0,0-.28.61c0,.27-.23.45-.14.7a1.24,1.24,0,0,0,.34.51l-.07,0c-.21.09-.38.2-.62,0s-.34,0-.43.21c0,0,0,0,0,0,.62.15,1.27.28,2,.38a1,1,0,0,0-.06-.44.9.9,0,0,0,.73-.39.5.5,0,0,0,0-.4A.36.36,0,0,0,125,105,.39.39,0,0,0,124.82,104.6Z"/><path class="cls-2" d="M129.85,105.92a.36.36,0,0,0-.46,0l-.24.14-.09-.06a1,1,0,0,0,0-.24.65.65,0,0,0,0-.2.71.71,0,0,0,.7-.52.71.71,0,0,0-1.37-.32.79.79,0,0,0,0,.34.85.85,0,0,0-.56.23.55.55,0,0,0-.43-.48c-.45-.1-.85.09-.91.43a.58.58,0,0,0,0,.29.36.36,0,0,0-.32,0,.38.38,0,0,0-.23.44c0,.23.22.27.42.31a.56.56,0,0,0-.31.28s0,0,0,.08l1,0a.74.74,0,0,0-.36-.4.35.35,0,0,0-.11,0,.87.87,0,0,0,.18-.38.63.63,0,0,0,.26.15.79.79,0,0,0,.71-.3.67.67,0,0,0,.66.56l.24,0a.86.86,0,0,1,0,.16.43.43,0,0,0-.05.21v0c.44,0,.9,0,1.37,0v0a1.36,1.36,0,0,1,0-.24C130,106.19,130,106,129.85,105.92Z"/><path class="cls-2" d="M96.7,102.18a.43.43,0,0,0-.14.65.38.38,0,0,0,.61-.14.54.54,0,0,0-.08-.44A.42.42,0,0,0,96.7,102.18Z"/><path class="cls-2" d="M93.16,100.26l-.5-.19.77.91s0,0,0,0C93.61,100.57,93.54,100.4,93.16,100.26Z"/><path class="cls-2" d="M94.18,98.59c0-.18-.08-.35-.25-.32a1.06,1.06,0,0,0-.32.14.36.36,0,0,0,.33.42C94.11,98.84,94.15,98.72,94.18,98.59Z"/><path class="cls-2" d="M93.23,94.74a.89.89,0,0,0,.79-.89c0-.3-.44-.3-.61-.15s-.13.07-.34,0a.45.45,0,0,0-.5.11.35.35,0,0,0-.14-.06.59.59,0,0,0-.5.11.35.35,0,0,0-.33-.19c-.25,0-.32.22-.41.44.16.17.31.39.57.25l.06,0a.91.91,0,0,0,.53.42.36.36,0,0,0,.37-.21A.89.89,0,0,0,93.23,94.74Z"/><path class="cls-2" d="M92.39,96.54c0-.21,0-.42,0-.64a.32.32,0,0,0-.2-.46.41.41,0,0,0-.5.28s0,.07,0,.1a.64.64,0,0,0-.44-.31.65.65,0,0,0-.89.53.73.73,0,0,0,.58.84.62.62,0,0,0,.44-.14A.82.82,0,0,0,92,97C92.19,96.89,92.41,96.84,92.39,96.54Z"/><path class="cls-2" d="M90.48,95.61c0-.19-.21-.28-.32-.33h0a.77.77,0,0,0,.34-.45.81.81,0,0,0-.51-.85.68.68,0,0,0-.83.42,1.1,1.1,0,0,0,.57,1,1,1,0,0,0,.17,0,.43.43,0,0,0,0,.07c-.06.18,0,.43.21.42S90.46,95.79,90.48,95.61Z"/><path class="cls-2" d="M142.74,40.49a.69.69,0,0,0-.21.81c.11.24.55.26.9.12a.67.67,0,0,0,.26-.83A.69.69,0,0,0,142.74,40.49Z"/><path class="cls-2" d="M91.17,98.12l.36.49a.5.5,0,0,0-.07-.27A.66.66,0,0,0,91.17,98.12Z"/><path class="cls-2" d="M93.83,101.31s-.07,0-.1,0l.27.31C94,101.52,93.91,101.33,93.83,101.31Z"/><path class="cls-2" d="M92.77,97.19a.64.64,0,1,0,1.24.29c.07-.31-.23-.65-.64-.73A.5.5,0,0,0,92.77,97.19Z"/><path class="cls-2" d="M89.12,92.37a.66.66,0,0,0-.75-.43.69.69,0,0,0-.3.9.67.67,0,0,0,.74.38C89.08,93.17,89.19,92.75,89.12,92.37Z"/><path class="cls-2" d="M99.09,106a.32.32,0,0,0-.35.2l.43.36a.26.26,0,0,0,.14-.11C99.37,106.39,99.26,106.05,99.09,106Z"/><path class="cls-2" d="M96.77,101.63a.43.43,0,0,0-.3-.49.36.36,0,0,0-.41.32.37.37,0,0,0,.26.45A.39.39,0,0,0,96.77,101.63Z"/><path class="cls-2" d="M95.66,99.22h-.13a.3.3,0,0,0,.27-.3.45.45,0,0,0-.15-.33c-.25-.15-.43,0-.6.24.1.19.16.4.38.41a.31.31,0,0,0-.25.27.74.74,0,0,0,.36.67.5.5,0,0,0,.59-.44C96.18,99.5,96,99.29,95.66,99.22Z"/><path class="cls-2" d="M95.24,102.21a.48.48,0,0,0-.4-.69.21.21,0,0,0,0-.13c0-.17-.18-.34-.4-.37a.43.43,0,0,0-.52.33.37.37,0,0,0,.34.4h0a1,1,0,0,0,0,.18c.35.38.71.76,1.07,1.13a1.46,1.46,0,0,0-.09-.54A.66.66,0,0,1,95.24,102.21Z"/><path class="cls-2" d="M98.93,104.74a.46.46,0,0,0-.23-.82,2.91,2.91,0,0,0-.78-.07.72.72,0,0,0-.58.63.29.29,0,0,0,.2.35,2.06,2.06,0,0,0,1.23,0A.55.55,0,0,0,98.93,104.74Z"/><path class="cls-2" d="M136.84,104.19a.35.35,0,0,0-.21-.25c-.15,0-.46.2-.42.35a.6.6,0,0,0,.06.11,0,0,0,0,0,0,0,.63.63,0,0,0,.44.47c.14,0,.38-.24.39-.43S137,104.22,136.84,104.19Z"/><path class="cls-2" d="M162,80.89l.15-.23-.06,0C162.09,80.71,162.07,80.8,162,80.89Z"/><path class="cls-2" d="M162.64,78.5h0c0,.26-.09.52-.14.79.32,0,.52,0,.57-.18A.63.63,0,0,0,162.64,78.5Z"/><path class="cls-2" d="M162.39,79.7h0a.52.52,0,0,0,0-.27A2.8,2.8,0,0,1,162.39,79.7Z"/><path class="cls-2" d="M163,78.09a.35.35,0,0,0,.22.44.33.33,0,0,0,.14,0c.09-.18.18-.37.26-.56a.27.27,0,0,0-.13-.1A.39.39,0,0,0,163,78.09Z"/><path class="cls-2" d="M156.47,95.31s-.21,0-.23.11.15.18.22.2a.19.19,0,0,0,.17-.12C156.64,95.43,156.54,95.34,156.47,95.31Z"/><path class="cls-2" d="M164,73.79a.31.31,0,0,0-.26-.26.44.44,0,0,0-.46.28.34.34,0,0,0,.12.31c-.15.24-.23.55-.33.57s-.43-.25-.78-.25a10.12,10.12,0,0,1,.37,1.66.45.45,0,0,0,.23,0A.31.31,0,0,0,163,76s-.06.06-.07.09a.61.61,0,0,0,.35.64h0a.74.74,0,0,0,.45.84c.18-.42.36-.86.53-1.31a1,1,0,0,0-.46,0,.45.45,0,0,0-.22-.49.61.61,0,0,0-.53.14c.11-.16.15-.37.21-.39s.54.34,1,.21a.61.61,0,0,0,.31-.24c.1-.28.19-.56.28-.85a0,0,0,0,0,0,0,1.07,1.07,0,0,0-.38-.68A1,1,0,0,0,164,73.79Z"/><path class="cls-2" d="M153.41,97a.42.42,0,0,0-.5.28,1.1,1.1,0,0,1-.2.35.54.54,0,0,0-.22.6c0,.1.19.19.36.25l.76-.52v-.5A.31.31,0,0,0,153.41,97Z"/><path class="cls-2" d="M154.64,95.22c-.17.14-.13.07-.35,0s-.56,0-.57.36a.76.76,0,0,0,.73.69.88.88,0,0,0,.79-.89C155.2,95.07,154.8,95.07,154.64,95.22Z"/><path class="cls-2" d="M165.06,70.61a.2.2,0,0,0-.21-.24.23.23,0,0,0-.2.2.19.19,0,0,0,.15.23A.2.2,0,0,0,165.06,70.61Z"/><path class="cls-2" d="M166.31,65.77a.72.72,0,0,0,.17.59c0-.13,0-.26,0-.39l0-.5A.5.5,0,0,0,166.31,65.77Z"/><path class="cls-2" d="M165.93,68.32a.33.33,0,0,0,.28.27c0-.25.08-.5.11-.75a.34.34,0,0,0-.16,0A.38.38,0,0,0,165.93,68.32Z"/><path class="cls-2" d="M165.82,70.88c0-.11,0-.22.07-.33a.29.29,0,0,0-.09.15A.36.36,0,0,0,165.82,70.88Z"/><path class="cls-2" d="M166.29,63.63a.41.41,0,0,0,0,.19l-.05,0c-.19-.07-.41.13-.43.36a.34.34,0,0,0,.32.36.44.44,0,0,0,.4-.32l.06,0h0c0-.33,0-.66,0-1A.46.46,0,0,0,166.29,63.63Z"/><path class="cls-2" d="M165,72.8a.51.51,0,0,0-.69.35c-.07.27,0,.57.25.62a.71.71,0,0,0,.65-.26c0-.13.08-.27.11-.4A.52.52,0,0,0,165,72.8Z"/><path class="cls-2" d="M165.05,74.05c0-.13.07-.25.1-.38a.84.84,0,0,0-.16.24A1.14,1.14,0,0,0,165.05,74.05Z"/><path class="cls-2" d="M165.37,69.22c-.25-.07-.56.06-.6.26a.28.28,0,0,0,0,.09.74.74,0,0,0-.52-.38.65.65,0,0,0-.24,0,1,1,0,0,0,.06-.92.71.71,0,0,0-.85-.19c-.21.1-.38.21-.62,0a.2.2,0,0,0-.22,0l-.05,0a.39.39,0,0,0-.42.27.32.32,0,0,0,.24.41.46.46,0,0,0,.32-.13.31.31,0,0,0,.18,0,3.18,3.18,0,0,0,.38.59.81.81,0,0,0,.68.15.74.74,0,0,0-.19.44c-.07.52.06.71.48.81a.7.7,0,0,0,.84-.63s0-.06,0-.1a.72.72,0,0,0,.44.4c.2.06.45-.14.52-.4S165.72,69.32,165.37,69.22Z"/><path class="cls-2" d="M164.7,71.4a.35.35,0,0,0-.22-.43.34.34,0,0,0-.45.17c-.08.22,0,.56.16.61s.27,0,.4-.16l0,0a.56.56,0,0,0,.42.7,2,2,0,0,0,.51,0c.09-.35.17-.69.25-1.05a.67.67,0,0,0-.33-.24A.89.89,0,0,0,164.7,71.4Z"/><path class="cls-2" d="M151.38,96.8A.25.25,0,0,0,151,97c-.05.17.06.42.22.41s.44-.06.46-.24S151.49,96.85,151.38,96.8Z"/><path class="cls-2" d="M143.26,100.28a.38.38,0,0,0,.34.4.37.37,0,0,0,.38-.36.32.32,0,0,0-.3-.37A.42.42,0,0,0,143.26,100.28Z"/><path class="cls-2" d="M141.49,102.71c-.18,0-.37,0-.4.17s.08.52.28.55a.4.4,0,0,0,.48-.35A.34.34,0,0,0,141.49,102.71Z"/><path class="cls-2" d="M141.55,100.37a.62.62,0,0,0-.48.29.52.52,0,0,0-.35-.38.36.36,0,0,0-.41.32.42.42,0,0,0,.25.47.64.64,0,0,0,.44-.15.47.47,0,0,0,.29.41c.4.07.73-.07.77-.32A.7.7,0,0,0,141.55,100.37Z"/><path class="cls-2" d="M141.68,102.23a.82.82,0,0,0-.38-.72c-.27-.06-.46.09-.53.43s.1.45.43.51A.37.37,0,0,0,141.68,102.23Z"/><path class="cls-2" d="M142.05,100a.26.26,0,0,0-.33.19.3.3,0,0,0,.16.4.34.34,0,0,0,.42-.23A.3.3,0,0,0,142.05,100Z"/><path class="cls-2" d="M138,102.32a.63.63,0,0,0-.6.23.44.44,0,0,0,.09.36h-.09c-.12,0-.26,0-.31.15s.14.4.33.42.21-.11.23-.25a.26.26,0,0,0,0-.15h0a.28.28,0,0,0,.38-.18C138.12,102.61,138.11,102.39,138,102.32Z"/><path class="cls-2" d="M140.54,103.49a.68.68,0,0,0-.54-.5.35.35,0,0,0-.15,0,.62.62,0,0,0,.12-.42c-.07-.28-.32-.19-.56-.19-.1.27-.15.5.09.65a.31.31,0,0,0,.17,0,.65.65,0,0,0-.21.42.51.51,0,0,0,.34.52.45.45,0,0,0,.22,0c.18.28.32.36.52.29a.35.35,0,0,0,.25-.37A.41.41,0,0,0,140.54,103.49Z"/><path class="cls-2" d="M143.21,99.6c.26,0,.45-.14.5-.48a.41.41,0,0,0-.27-.51c-.22,0-.67.22-.7.42S142.87,99.54,143.21,99.6Z"/><path class="cls-2" d="M138.88,104c-.37-.07-.65,0-.69.28a.66.66,0,0,0,.48.61.65.65,0,0,0,.52-.45A.41.41,0,0,0,138.88,104Z"/><path class="cls-2" d="M140,101.85s0-.13-.1-.14-.27-.19-.39-.34a.39.39,0,0,0-.35,0,.45.45,0,0,0-.18.31c0,.08.11.2.2.24a2.49,2.49,0,0,0,.55.16C139.93,102.11,140,102,140,101.85Z"/><path class="cls-2" d="M144,102.87a.12.12,0,0,0-.16.11c0,.08,0,.23.12.27s.19-.14.18-.18S144.14,102.89,144,102.87Z"/><path class="cls-2" d="M148.2,100.47a.7.7,0,0,0-.41.38l-.1,0c-.38-.08-.57.15-.71.46-.21-.07-.4-.24-.58,0a.35.35,0,0,0,0,.45c.2.24.4.08.6,0l.13.13c.63-.33,1.25-.68,1.86-1A.68.68,0,0,0,148.2,100.47Z"/><path class="cls-2" d="M137.46,104.91a.41.41,0,0,0-.31,0c-.12.07-.07.24.07.32a.6.6,0,0,0,.45.05.18.18,0,0,0,.09-.26A.36.36,0,0,0,137.46,104.91Z"/><path class="cls-2" d="M150,97.16a.36.36,0,0,0-.3-.43.35.35,0,0,0-.44.27.37.37,0,0,0,.28.44A.44.44,0,0,0,150,97.16Z"/><path class="cls-2" d="M145.25,101.67a.33.33,0,0,0-.39.28.54.54,0,0,0,0,.31c-.19,0-.38.13-.39.28s.22.29.43.38l.36-.18a.75.75,0,0,0,0-.2.39.39,0,0,0,.41-.29A.57.57,0,0,0,145.25,101.67Z"/><path class="cls-2" d="M146.12,99.25a.7.7,0,0,0-.64.5.52.52,0,1,0,1,.15A.58.58,0,0,0,146.12,99.25Z"/><path class="cls-2" d="M143.46,101.66a.61.61,0,0,0-.67.43.62.62,0,0,0,.41.69.85.85,0,0,0,.73-.52A.57.57,0,0,0,143.46,101.66Z"/><path class="cls-2" d="M150.3,98.06a.4.4,0,0,0-.06.79.43.43,0,0,0,.41-.39A.4.4,0,0,0,150.3,98.06Z"/><path class="cls-2" d="M144.15,98c-.11,0-.28.18-.33.27s.09.37.24.34a.35.35,0,0,0,.24-.23C144.32,98.26,144.27,98,144.15,98Z"/><path class="cls-2" d="M92.2,98.92a.35.35,0,0,0-.36.11c.17.23.36.46.54.68a.77.77,0,0,0,0-.21.48.48,0,0,0,.07-.18A.34.34,0,0,0,92.2,98.92Z"/><path class="cls-2" d="M126.76,34.21a.44.44,0,0,0,.21-.08l-.47-.08A.2.2,0,0,0,126.76,34.21Z"/><path class="cls-2" d="M126.13,37.72a.28.28,0,0,0,.41.12c.24-.12.39-.42.3-.6a.59.59,0,0,0-.63-.25C126,37.09,126,37.44,126.13,37.72Z"/><path class="cls-2" d="M125.9,35.05a.63.63,0,0,0,.3-.56.53.53,0,0,0-.54-.23.27.27,0,0,0-.17.38C125.59,34.93,125.75,35.09,125.9,35.05Z"/><path class="cls-2" d="M88.25,91.5c.06-.27-.19-.29-.27-.4a.59.59,0,0,0-.85-.14h0c.18.42.38.86.6,1.29a.59.59,0,0,0,0-.08.43.43,0,0,0,0-.4C88,91.75,88.2,91.7,88.25,91.5Z"/><path class="cls-2" d="M128.41,34.37l-.5-.09a.36.36,0,0,0,.3.17A.32.32,0,0,0,128.41,34.37Z"/><path class="cls-2" d="M127.63,38.89a.59.59,0,0,0,.54-.63.61.61,0,0,0-.62-.52.58.58,0,0,0,.08,1.15Z"/><path class="cls-2" d="M128.76,37c.25,0,.42-.1.44-.3a.61.61,0,0,0-.49-.59.44.44,0,0,0-.44.38A.53.53,0,0,0,128.76,37Z"/><path class="cls-2" d="M128,36.11c.27-.12.36-.6.18-1a.49.49,0,0,0-.71-.21.59.59,0,0,0-.26.87A.63.63,0,0,0,128,36.11Z"/><path class="cls-2" d="M122.79,33.75a.15.15,0,0,0,0-.09l-.36,0a.37.37,0,0,0,.08.14C122.59,33.82,122.74,33.83,122.79,33.75Z"/><path class="cls-2" d="M121,35.71c.2.06.39.21.55.13a.36.36,0,0,0,.21-.25.57.57,0,0,0,.07-.34.78.78,0,0,0-.4-.55.58.58,0,0,0-.61.09.47.47,0,0,0-.15.47A.6.6,0,0,0,121,35.71Z"/><path class="cls-2" d="M129.79,35.12a.62.62,0,0,0,.33-.38l-1.38-.3a.79.79,0,0,0,0,.46C128.91,35.24,129.35,35.33,129.79,35.12Z"/><path class="cls-2" d="M122.75,37.11c0,.1.17.14.25.15s.15-.07.15-.14S123,37,123,37,122.76,37,122.75,37.11Z"/><path class="cls-2" d="M125.17,38.41a.38.38,0,0,0,.1-.52.41.41,0,0,0-.5-.18.52.52,0,0,0-.21.55A.54.54,0,0,0,125.17,38.41Z"/><path class="cls-2" d="M123.93,35.88c.25-.15.28-.4.09-.72a.52.52,0,0,0-.6-.16.87.87,0,0,0-.3.81A.64.64,0,0,0,123.93,35.88Z"/><path class="cls-2" d="M124.81,36.82a.77.77,0,0,1,.52,0c.08,0,.23-.12.27-.22a.43.43,0,0,0-.07-.36c0-.06-.21-.07-.3,0a2.71,2.71,0,0,0-.52.24c-.15.07-.16.19-.06.34S124.77,36.84,124.81,36.82Z"/><path class="cls-2" d="M124.14,34.43c.3-.18.43-.43.34-.62l-.85-.08a.69.69,0,0,0,0,.58A.42.42,0,0,0,124.14,34.43Z"/><path class="cls-2" d="M130.69,35.88c-.1.22-.23.45.05.61a.38.38,0,0,0,.5-.05s.11-.15.09-.21-.15-.34-.23-.52a.89.89,0,0,0,.08-.71l-.64-.16a.77.77,0,0,0-.36.3C130,35.42,130.13,35.57,130.69,35.88Z"/><path class="cls-2" d="M138.51,41.28c.21,0,.35-.19.4-.31s-.06-.26-.21-.31-.37,0-.37.2S138.31,41.26,138.51,41.28Z"/><path class="cls-2" d="M137.6,37.36c0-.09-.11-.19-.18-.22a.19.19,0,0,0-.19.08c0,.07.06.17.12.22S137.56,37.46,137.6,37.36Z"/><path class="cls-2" d="M137.92,37.27l-.28-.12a.33.33,0,0,0,.13.11A.4.4,0,0,0,137.92,37.27Z"/><path class="cls-2" d="M139.26,38.51a.75.75,0,0,1,.57,0,.42.42,0,0,0,.51-.17c-.61-.3-1.25-.59-1.92-.88a.79.79,0,0,0,0,.13c.17.25.4.58.64.89A.26.26,0,0,0,139.26,38.51Z"/><path class="cls-2" d="M137.83,41.7a.71.71,0,0,0,.1.26c.25.07.45,0,.45-.19a.41.41,0,0,0-.16-.31C138.09,41.37,137.83,41.53,137.83,41.7Z"/><path class="cls-2" d="M139.92,39.63s.05-.05.05-.08a.76.76,0,0,0-.42-.85.48.48,0,0,0-.43.15.32.32,0,0,0-.17-.06.55.55,0,0,0-.33.45.4.4,0,0,0,.42.38h0a.49.49,0,0,0,.26.18.47.47,0,0,0,.16,0,.51.51,0,0,0-.09.25.7.7,0,0,0,.46.52.68.68,0,0,0,.59-.55C140.44,39.81,140.23,39.67,139.92,39.63Z"/><path class="cls-2" d="M143.09,40a1,1,0,0,1,.24,0s0,0,.06,0c-.32-.2-.66-.4-1-.59a.32.32,0,0,1,.12.15A.48.48,0,0,0,143.09,40Z"/><path class="cls-2" d="M141.62,41.88a.47.47,0,0,0-.17,0,1.12,1.12,0,0,0-.73.51c.45.06.89.12,1.33.2a.29.29,0,0,1,0-.09.42.42,0,0,0,.18-.21.33.33,0,0,0-.18-.45A.38.38,0,0,0,141.62,41.88Z"/><path class="cls-2" d="M140.94,41a.8.8,0,0,0,1-.39.77.77,0,0,0-.13-.67.56.56,0,0,0,.21-.17c.06-.09.1-.19.19-.36-.21-.13-.42-.25-.65-.37a.57.57,0,0,0-.13,0c-.39.08-.5.34-.32.63a.91.91,0,0,0-.5.52A.62.62,0,0,0,140.94,41Z"/><path class="cls-2" d="M132.44,41.09a.34.34,0,0,0,.37.31.45.45,0,0,0,.36-.49,1.25,1.25,0,0,0-.36-.24C132.6,40.63,132.43,40.86,132.44,41.09Z"/><path class="cls-2" d="M132.6,35.91l.15,0a.23.23,0,0,0,.16-.06s0,0,0,0a.61.61,0,0,0,.15-.24l-1-.28s0,.05,0,.08A.63.63,0,0,0,132.6,35.91Z"/><path class="cls-2" d="M132,36.11c.08-.09.28-.28.15-.44s-.39-.08-.51,0-.12.24-.05.37S131.87,36.23,132,36.11Z"/><path class="cls-2" d="M132.54,36.77c0,.19,0,.41.25.45.09,0,.24-.09.3-.18a.28.28,0,0,0,0-.29C132.91,36.57,132.73,36.62,132.54,36.77Z"/><path class="cls-2" d="M130.92,39.07c-.07,0-.17.17-.19.27s.07.27.23.23.41-.14.4-.28S131,39.06,130.92,39.07Z"/><path class="cls-2" d="M118.78,34.08c.09,0,.22.14.12.18s-.16.14-.08.39a.38.38,0,0,0,.47.32.56.56,0,0,0,.43-.67c-.06-.31-.24-.32-.26-.53a.27.27,0,0,0-.23-.24h-.59a.22.22,0,0,0-.12.19C118.49,34,118.68,34.08,118.78,34.08Z"/><path class="cls-2" d="M136.72,36.78l-.4-.14a.41.41,0,0,0,.35.15Z"/><path class="cls-2" d="M136.32,38.82l-.14,0c-.34-.06-.5.07-.52.41s0,.56.42.69a1.36,1.36,0,0,1-.37.17.36.36,0,0,0-.34.35.5.5,0,0,0,.22.55c.67.39.89.35,1.36-.25l.05,0h0a.86.86,0,0,0-.12.27.24.24,0,0,0,.22.32.29.29,0,0,0,.35-.26.75.75,0,0,0-.15-.34.33.33,0,0,0,.12,0,.47.47,0,0,1,.1,0c.06,0,.21-.08.26-.18a.44.44,0,0,0-.15-.6.47.47,0,0,0-.45.09h-.07c-.25.07-.36-.07-.53-.19C136.9,39.31,136.79,39,136.32,38.82Z"/><path class="cls-2" d="M134.08,37.16a.9.9,0,0,0,.13,1,.76.76,0,0,0,.5.17.4.4,0,0,0,.32,0l.07-.06a1,1,0,0,0,.47-.38.37.37,0,0,1,.37-.19.44.44,0,0,0,.35-.33.1.1,0,0,0,.07,0,.23.23,0,0,0,.24-.08.22.22,0,0,0-.11-.23.4.4,0,0,0-.22,0c-.06-.15-.19-.18-.35-.16a.86.86,0,0,1-.42,0,9.2,9.2,0,0,1-.86-.39,2.42,2.42,0,0,0,0-.49l-.88-.28a.49.49,0,0,0-.27.71A4.61,4.61,0,0,0,134.08,37.16Z"/><path class="cls-2" d="M124.94,35.24c.06,0,.25-.06.26-.15s-.18-.19-.24-.19a.22.22,0,0,0-.2.16C124.76,35.15,124.87,35.23,124.94,35.24Z"/><path class="cls-2" d="M82.18,64.48a.2.2,0,0,0,0,.21s.19,0,.25,0,.11-.18,0-.25S82.24,64.43,82.18,64.48Z"/><path class="cls-2" d="M80.81,58.91a.53.53,0,0,0,.12,0,.64.64,0,0,0,.57-.35.47.47,0,0,0-.07-.43Z"/><path class="cls-2" d="M82.93,60.66a1,1,0,0,1-.16-.38.55.55,0,0,0-.37-.52c-.18-.06-.59.21-.65.42s-.15.41.1.56a6.28,6.28,0,0,1,.52.38.31.31,0,0,0,.49.1A.41.41,0,0,0,82.93,60.66Z"/><path class="cls-2" d="M82.83,62.47a.9.9,0,0,0,.25,1.17c.27.14.5-.19.48-.41s0-.15.21-.27a.38.38,0,0,0,0-.67A.76.76,0,0,0,82.83,62.47Z"/><path class="cls-2" d="M80.06,62.05c-.11.13,0,.24.06.33a.24.24,0,0,0,.4,0,1.21,1.21,0,0,0,.07-.34A.37.37,0,0,0,80.06,62.05Z"/><path class="cls-2" d="M77.7,65.77a.81.81,0,0,0,0,1,.73.73,0,0,0,1,.06,1,1,0,0,0,0-1.1A.71.71,0,0,0,77.7,65.77Z"/><path class="cls-2" d="M79.41,63.33s-.13.23-.07.29.26,0,.3,0,.09-.18,0-.25S79.47,63.29,79.41,63.33Z"/><path class="cls-2" d="M83.78,58.05a.21.21,0,0,0,0-.06.54.54,0,0,0,.31-.24c0-.16,0-.38-.11-.49s-.3.08-.32.15,0,.06,0,.09a.35.35,0,0,0-.5,0,.46.46,0,0,0,.07.57A.4.4,0,0,0,83.78,58.05Z"/><path class="cls-2" d="M79.55,61a1.21,1.21,0,0,0,.07-.34.41.41,0,0,0-.11-.07l-.33.45C79.31,61.13,79.48,61.13,79.55,61Z"/><path class="cls-2" d="M75.19,67s0,0,0,0h0Z"/><path class="cls-2" d="M87.24,88.91c.06-.54-.08-.63-.58-.8a.53.53,0,0,0-.57.22l.34,1,.12.06,0,0a.33.33,0,0,0,.24,0A.52.52,0,0,0,87.24,88.91Z"/><path class="cls-2" d="M86.07,83.68a.47.47,0,0,0-.26-.62.31.31,0,0,0-.41.16.39.39,0,0,0,0,.5A.43.43,0,0,0,86.07,83.68Z"/><path class="cls-2" d="M86.42,87a.76.76,0,0,0-.5-.81.8.8,0,0,0-.46,0c.11.43.23.86.37,1.3A.74.74,0,0,0,86.42,87Z"/><path class="cls-2" d="M87.24,90.27a.43.43,0,0,0-.48-.16c.11.28.23.56.36.85a1.45,1.45,0,0,0,.09-.22C87.25,90.59,87.35,90.45,87.24,90.27Z"/><path class="cls-2" d="M117.12,34.35a.3.3,0,1,0-.43-.34C116.64,34.19,116.74,34.27,117.12,34.35Z"/><path class="cls-2" d="M85.22,58.33a.35.35,0,0,0,0-.51.37.37,0,0,0-.53,0,.44.44,0,0,0,0,.54A.36.36,0,0,0,85.22,58.33Z"/><path class="cls-2" d="M85,55.48c.07-.19-.26-.52-.41-.45s-.2.51,0,.6A.36.36,0,0,0,85,55.48Z"/><path class="cls-2" d="M83.79,59.23c-.06.11-.21.39-.07.51s.35,0,.45-.08a.24.24,0,0,0,.08-.37C84.15,59.15,83.88,59.09,83.79,59.23Z"/><path class="cls-2" d="M85.16,82a.61.61,0,0,0,.27,0q0,.17.27.27a.56.56,0,0,0,.73-.07,10.57,10.57,0,0,1-.57-1.34,1.08,1.08,0,0,0-.44-.23.58.58,0,0,0-.7.31c0,.22,0,.45,0,.68A.74.74,0,0,0,85.16,82Z"/><path class="cls-2" d="M85,83h-.13c0,.22.05.43.08.65a.35.35,0,0,0,.32-.3A.28.28,0,0,0,85,83Z"/><path class="cls-2" d="M94.12,50.32c-.11.16,0,.51.25.62a.33.33,0,0,0,.44-.18c.16-.3.17-.52,0-.63A.62.62,0,0,0,94.12,50.32Z"/><path class="cls-2" d="M95.22,47c.32,0,.35.28.46.49a.38.38,0,0,0,.61.13l.07-.05a.25.25,0,0,0,.12.13.7.7,0,0,0,.3.09c.12-.14.23-.3.35-.44a1.66,1.66,0,0,0-.23-.23.38.38,0,0,0-.38-.05.47.47,0,0,0-.24-.3c-.15-.1-.33-.15-.32-.44.1,0,.25-.09.28-.17l0-.06-1.19.66a.4.4,0,0,0,.07.19S95.19,47,95.22,47Z"/><path class="cls-2" d="M95.25,49.42a.53.53,0,0,1,.36,0,8.33,8.33,0,0,1,.51-.8h0a.87.87,0,0,1-.74,0A.29.29,0,0,0,95,49C94.89,49.17,95.05,49.45,95.25,49.42Z"/><path class="cls-2" d="M93.88,54.64a.46.46,0,0,0,.31,0l.1-.88c-.28-.12-.56-.09-.66.1A.68.68,0,0,0,93.88,54.64Z"/><path class="cls-2" d="M94.64,49.66a.38.38,0,0,0,0-.48.38.38,0,0,0-.53,0,.29.29,0,0,0,0,.46A.36.36,0,0,0,94.64,49.66Z"/><path class="cls-2" d="M85,55.14a.35.35,0,0,0,.51-.09.36.36,0,0,0-.11-.51.43.43,0,0,0-.53.1A.36.36,0,0,0,85,55.14Z"/><path class="cls-2" d="M103.24,43.27l-.07,0h0Z"/><path class="cls-2" d="M114.57,33.71l.17.16a.75.75,0,0,0,.83.06.78.78,0,0,0,.26-.34c-.7,0-1.39.07-2.08.12a.63.63,0,0,0,.33.09A3,3,0,0,0,114.57,33.71Z"/><path class="cls-2" d="M100.19,44.77s0-.05,0-.08a1,1,0,0,0,0-.3.36.36,0,0,0,.19-.07.3.3,0,0,0,.1.14l.08,0,.75-.4a.94.94,0,0,0-.07-.22c-.73.25-1.47.53-2.25.86a2.83,2.83,0,0,1-.06.42.82.82,0,0,0,0,.44A12.76,12.76,0,0,1,100.19,44.77Z"/><path class="cls-2" d="M97.61,45.77l-.06.06c-.06.11-.14.24-.08.34s.41.14.53,0,0-.24,0-.34a.25.25,0,0,0-.22-.1.41.41,0,0,0,.12-.09.38.38,0,0,0,0-.36l-.88.43a.28.28,0,0,0,.1.09A.85.85,0,0,0,97.61,45.77Z"/><path class="cls-2" d="M86,55.27a3.07,3.07,0,0,0,.72.31.76.76,0,0,0,.75-.43c.06-.16.07-.54-.27-.59-.55.2-.55-.22-1-.2a.61.61,0,0,0-.19.06A.47.47,0,0,0,86,55.27Z"/><path class="cls-2" d="M87,53c.06.07.3.17.4.1s0-.21,0-.32a.28.28,0,0,0,0-.32.33.33,0,0,0-.26-.13.5.5,0,0,0-.28.27.23.23,0,0,0,0,.18A.38.38,0,0,0,87,53Z"/><path class="cls-2" d="M87.38,52.08a.53.53,0,0,0,.32.1.74.74,0,0,0,.52-.21l.08.06a.56.56,0,0,0,.77-.12.28.28,0,0,0,.23.1.26.26,0,0,0,.37,0,.35.35,0,0,0,.15-.43.3.3,0,0,0-.26-.21h0a.34.34,0,0,0-.38-.07l-.11-.24.45-.23a1.9,1.9,0,0,0,0-.41.18.18,0,0,0,0-.09c-.79.59-1.56,1.22-2.31,1.87a.3.3,0,0,0,.15-.07S87.36,52.1,87.38,52.08Z"/><path class="cls-2" d="M85.54,57.13a.73.73,0,0,0,.87-.26c.12-.19,0-.53-.28-.66a.5.5,0,0,0-.71.23A.49.49,0,0,0,85.54,57.13Z"/><path class="cls-2" d="M90.89,50.36a1.28,1.28,0,0,0,1-1c0-.26-.21-.41-.33-.51q-.7.48-1.41,1A.79.79,0,0,0,90.89,50.36Z"/><path class="cls-2" d="M91.59,53.83a.3.3,0,0,0,.15.44.4.4,0,0,0,.51-.15.39.39,0,0,0-.18-.5A.37.37,0,0,0,91.59,53.83Z"/><path class="cls-2" d="M92.53,50.73a.67.67,0,0,0,.69-1.16s0,0-.07,0a.63.63,0,0,0-.1-.3.87.87,0,0,0,.68-.44.76.76,0,0,0-.27-1.06s0,0-.06,0l-1,.65a.67.67,0,0,0,.12.65l-.06,0c-.13.12,0,.41.07.54l0,0a1.08,1.08,0,0,0-.18.23A.57.57,0,0,0,92.53,50.73Z"/><path class="cls-2" d="M89.09,53.31a.58.58,0,0,0,.11.75.7.7,0,0,0,.78-.23.52.52,0,1,0-.89-.52Z"/><ellipse class="cls-3" cx="124.56" cy="71.65" rx="23.77" ry="22.91"/><circle class="cls-4" cx="32.54" cy="34.28" r="1.93"/><circle class="cls-4" cx="223.42" cy="67.02" r="1.93"/><path class="cls-5" d="M145,86.21c.35-.52,33.13,20.58,33.66,20.93a1.14,1.14,0,0,1-1.26,1.9C176.84,108.69,144.62,86.74,145,86.21Z"/><path class="cls-5" d="M140.63,50.56c-.49-.39,23.57-31.07,24-31.56a1.14,1.14,0,1,1,1.77,1.43C166,20.92,141.12,51,140.63,50.56Z"/><path class="cls-5" d="M87.44,93.64c.21.59-36.2,14.52-36.79,14.74a1.14,1.14,0,0,1-.79-2.14C50.45,106,87.22,93.05,87.44,93.64Z"/><path class="cls-5" d="M100.59,92.3c.31.55-33.15,20.56-33.69,20.88a1.14,1.14,0,0,1-1.15-2C66.3,110.89,100.27,91.76,100.59,92.3Z"/><path class="cls-6" d="M204.47,18.65c-5.1,0-7.1,2-7.1,7.1,0-5.1-2-7.1-7.09-7.1,5.09,0,7.09-2,7.09-7.1C197.37,16.65,199.37,18.65,204.47,18.65Z"/><path class="cls-6" d="M68.84,18.65c-3.93,0-5.48,1.55-5.48,5.48,0-3.93-1.54-5.48-5.48-5.48,3.94,0,5.48-1.55,5.48-5.48C63.36,17.1,64.91,18.65,68.84,18.65Z"/><path class="cls-6" d="M184.17,79.21c-4.61,0-6.43,1.81-6.43,6.42,0-4.61-1.81-6.42-6.42-6.42,4.61,0,6.42-1.81,6.42-6.43C177.74,77.4,179.56,79.21,184.17,79.21Z"/><path class="cls-6" d="M55.68,124.7c-5.66,0-7.89,2.22-7.89,7.89,0-5.67-2.22-7.89-7.89-7.89,5.67,0,7.89-2.23,7.89-7.89C47.79,122.47,50,124.7,55.68,124.7Z"/><rect class="cls-7" x="90.25" y="33.05" width="3.26" height="3.26" transform="translate(-2.21 62.83) rotate(-37.34)"/><rect class="cls-4" x="121.32" y="112.16" width="3.45" height="3.45" transform="translate(-31.7 49.35) rotate(-20.15)"/><rect class="cls-4" x="182.53" y="5.79" width="3.45" height="3.45" transform="translate(8.69 63.92) rotate(-20.15)"/><polygon class="cls-8" points="157.62 75.65 156.7 74.28 155.06 74.38 154.32 75.86 155.24 77.23 156.88 77.13 157.62 75.65"/><polygon class="cls-7" points="190.14 106.28 194.69 112.2 199.53 108.06 190.14 106.28"/><polygon class="cls-7" points="35.22 67.85 35.44 73.39 44.44 71.26 35.22 67.85"/><polygon class="cls-9" points="70.39 84.46 71.86 88.71 76.11 85.87 70.39 84.46"/><polygon class="cls-9" points="146.29 27.82 141.84 27.18 142.41 32.26 146.29 27.82"/><rect class="cls-9" x="103.66" y="49.81" width="3.16" height="3.16" transform="translate(-11.58 42.97) rotate(-21.9)"/><rect class="cls-9" x="126.85" y="95.84" width="2.46" height="2.46" transform="translate(-32.63 96.96) rotate(-37.12)"/><circle class="cls-8" cx="126.66" cy="56.78" r="1.21"/><circle class="cls-8" cx="109.51" cy="82.54" r="0.73"/><circle class="cls-8" cx="141.21" cy="61.97" r="0.48"/><circle class="cls-8" cx="127.33" cy="88.64" r="0.48"/><circle class="cls-9" cx="121.37" cy="71.16" r="0.48"/><circle class="cls-9" cx="129.94" cy="75.81" r="1.21"/><circle class="cls-9" cx="110.91" cy="63.5" r="1.21"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx b/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
index 11fbc7931e620..6fad3335c5efc 100644
--- a/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
+++ b/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
@@ -8,6 +8,7 @@ import React from 'react';
 import { wait } from '@testing-library/react';
 import { of } from 'rxjs';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import { httpServiceMock, uiSettingsServiceMock } from '../../../../../src/core/public/mocks';
 import {
   GlobalSearchBatchedResults,
   GlobalSearchPluginStart,
@@ -47,6 +48,10 @@ const getSearchProps: any = (component: any) => component.find('EuiFieldSearch')
 describe('SearchBar', () => {
   let searchService: GlobalSearchPluginStart;
   let findSpy: jest.SpyInstance;
+  const http = httpServiceMock.createSetupContract({ basePath: '/test' });
+  const basePathUrl = http.basePath.prepend('/plugins/globalSearchBar/assets/');
+  const uiSettings = uiSettingsServiceMock.createStartContract();
+  const darkMode = uiSettings.get('theme:darkMode');
 
   beforeEach(() => {
     searchService = globalSearchPluginMock.createStartContract();
@@ -66,7 +71,12 @@ describe('SearchBar', () => {
       .mockReturnValueOnce(of(createBatch('Discover', { id: 'My Dashboard', type: 'test' })));
 
     const component = mountWithIntl(
-      <SearchBar globalSearch={searchService.find} navigateToUrl={navigate} />
+      <SearchBar
+        globalSearch={searchService.find}
+        navigateToUrl={navigate}
+        basePathUrl={basePathUrl}
+        darkMode={darkMode}
+      />
     );
 
     expect(findSpy).toHaveBeenCalledTimes(0);
@@ -85,7 +95,14 @@ describe('SearchBar', () => {
   });
 
   it('supports keyboard shortcuts', () => {
-    mountWithIntl(<SearchBar globalSearch={searchService.find} navigateToUrl={jest.fn()} />);
+    mountWithIntl(
+      <SearchBar
+        globalSearch={searchService.find}
+        navigateToUrl={jest.fn()}
+        basePathUrl={basePathUrl}
+        darkMode={darkMode}
+      />
+    );
 
     const searchEvent = new KeyboardEvent('keydown', {
       key: '/',
diff --git a/x-pack/plugins/global_search_bar/public/components/search_bar.tsx b/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
index 0dde28db0436d..4ca0f8cf81b7b 100644
--- a/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
+++ b/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
@@ -12,6 +12,7 @@ import {
   EuiSelectableTemplateSitewideOption,
   EuiText,
   EuiIcon,
+  EuiImage,
   EuiHeaderSectionItemButton,
   EuiSelectableMessage,
 } from '@elastic/eui';
@@ -27,6 +28,8 @@ import { GlobalSearchPluginStart, GlobalSearchResult } from '../../../global_sea
 interface Props {
   globalSearch: GlobalSearchPluginStart['find'];
   navigateToUrl: ApplicationStart['navigateToUrl'];
+  basePathUrl: string;
+  darkMode: boolean;
 }
 
 const clearField = (field: HTMLInputElement) => {
@@ -42,7 +45,7 @@ const clearField = (field: HTMLInputElement) => {
 const cleanMeta = (str: string) => (str.charAt(0).toUpperCase() + str.slice(1)).replace(/-/g, ' ');
 const blurEvent = new FocusEvent('blur');
 
-export function SearchBar({ globalSearch, navigateToUrl }: Props) {
+export function SearchBar({ globalSearch, navigateToUrl, basePathUrl, darkMode }: Props) {
   const isMounted = useMountedState();
   const [searchValue, setSearchValue] = useState<string>('');
   const [searchRef, setSearchRef] = useState<HTMLInputElement | null>(null);
@@ -134,6 +137,34 @@ export function SearchBar({ globalSearch, navigateToUrl }: Props) {
     }
   };
 
+  const emptyMessage = (
+    <EuiSelectableMessage style={{ minHeight: 300 }}>
+      <EuiImage
+        alt={i18n.translate('xpack.globalSearchBar.searchBar.noResultsImageAlt', {
+          defaultMessage: 'Illustration of black hole',
+        })}
+        size="fullWidth"
+        url={`${basePathUrl}illustration_product_no_search_results_${
+          darkMode ? 'dark' : 'light'
+        }.svg`}
+      />
+      <EuiText size="m">
+        <p>
+          <FormattedMessage
+            id="xpack.globalSearchBar.searchBar.noResultsHeading"
+            defaultMessage="No results found"
+          />
+        </p>
+      </EuiText>
+      <p>
+        <FormattedMessage
+          id="xpack.globalSearchBar.searchBar.noResults"
+          defaultMessage="Try searching for applications, dashboards, visualizations, and more."
+        />
+      </p>
+    </EuiSelectableMessage>
+  );
+
   useEvent('keydown', onKeyDown);
 
   return (
@@ -164,22 +195,8 @@ export function SearchBar({ globalSearch, navigateToUrl }: Props) {
       popoverProps={{
         repositionOnScroll: true,
       }}
-      emptyMessage={
-        <EuiSelectableMessage style={{ minHeight: 300 }}>
-          <p>
-            <FormattedMessage
-              id="xpack.globalSearchBar.searchBar.noResultsHeading"
-              defaultMessage="No results found"
-            />
-          </p>
-          <p>
-            <FormattedMessage
-              id="xpack.globalSearchBar.searchBar.noResults"
-              defaultMessage="Try searching for applications and saved objects by name."
-            />
-          </p>
-        </EuiSelectableMessage>
-      }
+      emptyMessage={emptyMessage}
+      noMatchesMessage={emptyMessage}
       popoverFooter={
         <EuiText color="subdued" size="xs">
           <EuiFlexGroup
diff --git a/x-pack/plugins/global_search_bar/public/plugin.tsx b/x-pack/plugins/global_search_bar/public/plugin.tsx
index 0c8cc2e64726a..9bc6b824b8716 100644
--- a/x-pack/plugins/global_search_bar/public/plugin.tsx
+++ b/x-pack/plugins/global_search_bar/public/plugin.tsx
@@ -24,7 +24,14 @@ export class GlobalSearchBarPlugin implements Plugin<{}, {}> {
   public start(core: CoreStart, { globalSearch }: GlobalSearchBarPluginStartDeps) {
     core.chrome.navControls.registerCenter({
       order: 1000,
-      mount: (target) => this.mount(target, globalSearch, core.application.navigateToUrl),
+      mount: (target) =>
+        this.mount(
+          target,
+          globalSearch,
+          core.application.navigateToUrl,
+          core.http.basePath.prepend('/plugins/globalSearchBar/assets/'),
+          core.uiSettings.get('theme:darkMode')
+        ),
     });
     return {};
   }
@@ -32,11 +39,18 @@ export class GlobalSearchBarPlugin implements Plugin<{}, {}> {
   private mount(
     targetDomElement: HTMLElement,
     globalSearch: GlobalSearchPluginStart,
-    navigateToUrl: ApplicationStart['navigateToUrl']
+    navigateToUrl: ApplicationStart['navigateToUrl'],
+    basePathUrl: string,
+    darkMode: boolean
   ) {
     ReactDOM.render(
       <I18nProvider>
-        <SearchBar globalSearch={globalSearch.find} navigateToUrl={navigateToUrl} />
+        <SearchBar
+          globalSearch={globalSearch.find}
+          navigateToUrl={navigateToUrl}
+          basePathUrl={basePathUrl}
+          darkMode={darkMode}
+        />
       </I18nProvider>,
       targetDomElement
     );
diff --git a/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts b/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts
index a9f2671de8259..e36f38add641a 100644
--- a/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts
+++ b/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts
@@ -33,11 +33,11 @@ export interface ModuleDescriptor<JobType extends string> {
     partitionField?: string
   ) => Promise<SetupMlModuleResponsePayload>;
   cleanUpModule: (spaceId: string, sourceId: string) => Promise<DeleteJobsResponsePayload>;
-  validateSetupIndices: (
+  validateSetupIndices?: (
     indices: string[],
     timestampField: string
   ) => Promise<ValidationIndicesResponsePayload>;
-  validateSetupDatasets: (
+  validateSetupDatasets?: (
     indices: string[],
     timestampField: string,
     startTime: number,
diff --git a/x-pack/plugins/infra/public/containers/ml/infra_ml_setup_state.ts b/x-pack/plugins/infra/public/containers/ml/infra_ml_setup_state.ts
deleted file mode 100644
index 0dfe3b301f240..0000000000000
--- a/x-pack/plugins/infra/public/containers/ml/infra_ml_setup_state.ts
+++ /dev/null
@@ -1,289 +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;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { isEqual } from 'lodash';
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { usePrevious } from 'react-use';
-import {
-  combineDatasetFilters,
-  DatasetFilter,
-  filterDatasetFilter,
-  isExampleDataIndex,
-} from '../../../common/infra_ml';
-import {
-  AvailableIndex,
-  ValidationIndicesError,
-  ValidationUIError,
-} from '../../components/logging/log_analysis_setup/initial_configuration_step';
-import { useTrackedPromise } from '../../utils/use_tracked_promise';
-import { ModuleDescriptor, ModuleSourceConfiguration } from './infra_ml_module_types';
-
-type SetupHandler = (
-  indices: string[],
-  startTime: number | undefined,
-  endTime: number | undefined,
-  datasetFilter: DatasetFilter
-) => void;
-
-interface AnalysisSetupStateArguments<JobType extends string> {
-  cleanUpAndSetUpModule: SetupHandler;
-  moduleDescriptor: ModuleDescriptor<JobType>;
-  setUpModule: SetupHandler;
-  sourceConfiguration: ModuleSourceConfiguration;
-}
-
-const fourWeeksInMs = 86400000 * 7 * 4;
-
-export const useAnalysisSetupState = <JobType extends string>({
-  cleanUpAndSetUpModule,
-  moduleDescriptor: { validateSetupDatasets, validateSetupIndices },
-  setUpModule,
-  sourceConfiguration,
-}: AnalysisSetupStateArguments<JobType>) => {
-  const [startTime, setStartTime] = useState<number | undefined>(Date.now() - fourWeeksInMs);
-  const [endTime, setEndTime] = useState<number | undefined>(undefined);
-
-  const isTimeRangeValid = useMemo(
-    () => (startTime != null && endTime != null ? startTime < endTime : true),
-    [endTime, startTime]
-  );
-
-  const [validatedIndices, setValidatedIndices] = useState<AvailableIndex[]>(
-    sourceConfiguration.indices.map((indexName) => ({
-      name: indexName,
-      validity: 'unknown' as const,
-    }))
-  );
-
-  const updateIndicesWithValidationErrors = useCallback(
-    (validationErrors: ValidationIndicesError[]) =>
-      setValidatedIndices((availableIndices) =>
-        availableIndices.map((previousAvailableIndex) => {
-          const indexValiationErrors = validationErrors.filter(
-            ({ index }) => index === previousAvailableIndex.name
-          );
-
-          if (indexValiationErrors.length > 0) {
-            return {
-              validity: 'invalid',
-              name: previousAvailableIndex.name,
-              errors: indexValiationErrors,
-            };
-          } else if (previousAvailableIndex.validity === 'valid') {
-            return {
-              ...previousAvailableIndex,
-              validity: 'valid',
-              errors: [],
-            };
-          } else {
-            return {
-              validity: 'valid',
-              name: previousAvailableIndex.name,
-              isSelected: !isExampleDataIndex(previousAvailableIndex.name),
-              availableDatasets: [],
-              datasetFilter: {
-                type: 'includeAll' as const,
-              },
-            };
-          }
-        })
-      ),
-    []
-  );
-
-  const updateIndicesWithAvailableDatasets = useCallback(
-    (availableDatasets: Array<{ indexName: string; datasets: string[] }>) =>
-      setValidatedIndices((availableIndices) =>
-        availableIndices.map((previousAvailableIndex) => {
-          if (previousAvailableIndex.validity !== 'valid') {
-            return previousAvailableIndex;
-          }
-
-          const availableDatasetsForIndex = availableDatasets.filter(
-            ({ indexName }) => indexName === previousAvailableIndex.name
-          );
-          const newAvailableDatasets = availableDatasetsForIndex.flatMap(
-            ({ datasets }) => datasets
-          );
-
-          // filter out datasets that have disappeared if this index' datasets were updated
-          const newDatasetFilter: DatasetFilter =
-            availableDatasetsForIndex.length > 0
-              ? filterDatasetFilter(previousAvailableIndex.datasetFilter, (dataset) =>
-                  newAvailableDatasets.includes(dataset)
-                )
-              : previousAvailableIndex.datasetFilter;
-
-          return {
-            ...previousAvailableIndex,
-            availableDatasets: newAvailableDatasets,
-            datasetFilter: newDatasetFilter,
-          };
-        })
-      ),
-    []
-  );
-
-  const validIndexNames = useMemo(
-    () => validatedIndices.filter((index) => index.validity === 'valid').map((index) => index.name),
-    [validatedIndices]
-  );
-
-  const selectedIndexNames = useMemo(
-    () =>
-      validatedIndices
-        .filter((index) => index.validity === 'valid' && index.isSelected)
-        .map((i) => i.name),
-    [validatedIndices]
-  );
-
-  const datasetFilter = useMemo(
-    () =>
-      validatedIndices
-        .flatMap((validatedIndex) =>
-          validatedIndex.validity === 'valid'
-            ? validatedIndex.datasetFilter
-            : { type: 'includeAll' as const }
-        )
-        .reduce(combineDatasetFilters, { type: 'includeAll' as const }),
-    [validatedIndices]
-  );
-
-  const [validateIndicesRequest, validateIndices] = useTrackedPromise(
-    {
-      cancelPreviousOn: 'resolution',
-      createPromise: async () => {
-        return await validateSetupIndices(
-          sourceConfiguration.indices,
-          sourceConfiguration.timestampField
-        );
-      },
-      onResolve: ({ data: { errors } }) => {
-        updateIndicesWithValidationErrors(errors);
-      },
-      onReject: () => {
-        setValidatedIndices([]);
-      },
-    },
-    [sourceConfiguration.indices, sourceConfiguration.timestampField]
-  );
-
-  const [validateDatasetsRequest, validateDatasets] = useTrackedPromise(
-    {
-      cancelPreviousOn: 'resolution',
-      createPromise: async () => {
-        if (validIndexNames.length === 0) {
-          return { data: { datasets: [] } };
-        }
-
-        return await validateSetupDatasets(
-          validIndexNames,
-          sourceConfiguration.timestampField,
-          startTime ?? 0,
-          endTime ?? Date.now()
-        );
-      },
-      onResolve: ({ data: { datasets } }) => {
-        updateIndicesWithAvailableDatasets(datasets);
-      },
-    },
-    [validIndexNames, sourceConfiguration.timestampField, startTime, endTime]
-  );
-
-  const setUp = useCallback(() => {
-    return setUpModule(selectedIndexNames, startTime, endTime, datasetFilter);
-  }, [setUpModule, selectedIndexNames, startTime, endTime, datasetFilter]);
-
-  const cleanUpAndSetUp = useCallback(() => {
-    return cleanUpAndSetUpModule(selectedIndexNames, startTime, endTime, datasetFilter);
-  }, [cleanUpAndSetUpModule, selectedIndexNames, startTime, endTime, datasetFilter]);
-
-  const isValidating = useMemo(
-    () => validateIndicesRequest.state === 'pending' || validateDatasetsRequest.state === 'pending',
-    [validateDatasetsRequest.state, validateIndicesRequest.state]
-  );
-
-  const validationErrors = useMemo<ValidationUIError[]>(() => {
-    if (isValidating) {
-      return [];
-    }
-
-    return [
-      // validate request status
-      ...(validateIndicesRequest.state === 'rejected' ||
-      validateDatasetsRequest.state === 'rejected'
-        ? [{ error: 'NETWORK_ERROR' as const }]
-        : []),
-      // validation request results
-      ...validatedIndices.reduce<ValidationUIError[]>((errors, index) => {
-        return index.validity === 'invalid' && selectedIndexNames.includes(index.name)
-          ? [...errors, ...index.errors]
-          : errors;
-      }, []),
-      // index count
-      ...(selectedIndexNames.length === 0 ? [{ error: 'TOO_FEW_SELECTED_INDICES' as const }] : []),
-      // time range
-      ...(!isTimeRangeValid ? [{ error: 'INVALID_TIME_RANGE' as const }] : []),
-    ];
-  }, [
-    isValidating,
-    validateIndicesRequest.state,
-    validateDatasetsRequest.state,
-    validatedIndices,
-    selectedIndexNames,
-    isTimeRangeValid,
-  ]);
-
-  const prevStartTime = usePrevious(startTime);
-  const prevEndTime = usePrevious(endTime);
-  const prevValidIndexNames = usePrevious(validIndexNames);
-
-  useEffect(() => {
-    if (!isTimeRangeValid) {
-      return;
-    }
-
-    validateIndices();
-  }, [isTimeRangeValid, validateIndices]);
-
-  useEffect(() => {
-    if (!isTimeRangeValid) {
-      return;
-    }
-
-    if (
-      startTime !== prevStartTime ||
-      endTime !== prevEndTime ||
-      !isEqual(validIndexNames, prevValidIndexNames)
-    ) {
-      validateDatasets();
-    }
-  }, [
-    endTime,
-    isTimeRangeValid,
-    prevEndTime,
-    prevStartTime,
-    prevValidIndexNames,
-    startTime,
-    validIndexNames,
-    validateDatasets,
-  ]);
-
-  return {
-    cleanUpAndSetUp,
-    datasetFilter,
-    endTime,
-    isValidating,
-    selectedIndexNames,
-    setEndTime,
-    setStartTime,
-    setUp,
-    startTime,
-    validatedIndices,
-    setValidatedIndices,
-    validationErrors,
-  };
-};
diff --git a/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts b/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts
index cec87fb1144e3..7ea87c3d21322 100644
--- a/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts
+++ b/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts
@@ -10,17 +10,27 @@ import { cleanUpJobsAndDatafeeds } from '../../infra_ml_cleanup';
 import { callJobsSummaryAPI } from '../../api/ml_get_jobs_summary_api';
 import { callGetMlModuleAPI } from '../../api/ml_get_module';
 import { callSetupMlModuleAPI } from '../../api/ml_setup_module_api';
-import { callValidateIndicesAPI } from '../../../logs/log_analysis/api/validate_indices';
-import { callValidateDatasetsAPI } from '../../../logs/log_analysis/api/validate_datasets';
 import {
   metricsHostsJobTypes,
   getJobId,
   MetricsHostsJobType,
   DatasetFilter,
   bucketSpan,
-  partitionField,
 } from '../../../../../common/infra_ml';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import MemoryJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_memory_usage.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import MemoryDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_memory_usage.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkInJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_network_in.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkInDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_network_in.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkOutJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_network_out.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkOutDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_network_out.json';
 
+type JobType = 'hosts_memory_usage' | 'hosts_network_in' | 'hosts_network_out';
 const moduleId = 'metrics_ui_hosts';
 const moduleName = i18n.translate('xpack.infra.ml.metricsModuleName', {
   defaultMessage: 'Metrics anomanly detection',
@@ -54,23 +64,68 @@ const setUpModule = async (
   end: number | undefined,
   datasetFilter: DatasetFilter,
   { spaceId, sourceId, indices, timestampField }: ModuleSourceConfiguration,
-  pField?: string
+  partitionField?: string
 ) => {
   const indexNamePattern = indices.join(',');
-  const jobIds = ['hosts_memory_usage', 'hosts_network_in', 'hosts_network_out'];
-  const jobOverrides = jobIds.map((id) => ({
-    job_id: id,
-    data_description: {
-      time_field: timestampField,
-    },
-    custom_settings: {
-      metrics_source_config: {
-        indexPattern: indexNamePattern,
-        timestampField,
-        bucketSpan,
+  const jobIds: JobType[] = ['hosts_memory_usage', 'hosts_network_in', 'hosts_network_out'];
+
+  const jobOverrides = jobIds.map((id) => {
+    const { job: defaultJobConfig } = getDefaultJobConfigs(id);
+
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    const analysis_config: any = {
+      ...defaultJobConfig.analysis_config,
+    };
+
+    if (partitionField) {
+      analysis_config.detectors[0].partition_field_name = partitionField;
+      if (analysis_config.influencers.indexOf(partitionField) === -1) {
+        analysis_config.influencers.push(partitionField);
+      }
+    }
+
+    return {
+      job_id: id,
+      data_description: {
+        time_field: timestampField,
+      },
+      analysis_config,
+      custom_settings: {
+        metrics_source_config: {
+          indexPattern: indexNamePattern,
+          timestampField,
+          bucketSpan,
+        },
+      },
+    };
+  });
+
+  const datafeedOverrides = jobIds.map((id) => {
+    const { datafeed: defaultDatafeedConfig } = getDefaultJobConfigs(id);
+
+    if (!partitionField || id === 'hosts_memory_usage') {
+      // Since the host memory usage doesn't have custom aggs, we don't need to do anything to add a partition field
+      return defaultDatafeedConfig;
+    }
+
+    // If we have a partition field, we need to change the aggregation to do a terms agg at the top level
+    const aggregations = {
+      [partitionField]: {
+        terms: {
+          field: partitionField,
+        },
+        aggregations: {
+          ...defaultDatafeedConfig.aggregations,
+        },
       },
-    },
-  }));
+    };
+
+    return {
+      ...defaultDatafeedConfig,
+      job_id: id,
+      aggregations,
+    };
+  });
 
   return callSetupMlModuleAPI(
     moduleId,
@@ -80,34 +135,32 @@ const setUpModule = async (
     sourceId,
     indexNamePattern,
     jobOverrides,
-    []
+    datafeedOverrides
   );
 };
 
-const cleanUpModule = async (spaceId: string, sourceId: string) => {
-  return await cleanUpJobsAndDatafeeds(spaceId, sourceId, metricsHostsJobTypes);
-};
-
-const validateSetupIndices = async (indices: string[], timestampField: string) => {
-  return await callValidateIndicesAPI(indices, [
-    {
-      name: timestampField,
-      validTypes: ['date'],
-    },
-    {
-      name: partitionField,
-      validTypes: ['keyword'],
-    },
-  ]);
+const getDefaultJobConfigs = (jobId: JobType): { datafeed: any; job: any } => {
+  switch (jobId) {
+    case 'hosts_memory_usage':
+      return {
+        datafeed: MemoryDatafeed,
+        job: MemoryJob,
+      };
+    case 'hosts_network_in':
+      return {
+        datafeed: NetworkInDatafeed,
+        job: NetworkInJob,
+      };
+    case 'hosts_network_out':
+      return {
+        datafeed: NetworkOutDatafeed,
+        job: NetworkOutJob,
+      };
+  }
 };
 
-const validateSetupDatasets = async (
-  indices: string[],
-  timestampField: string,
-  startTime: number,
-  endTime: number
-) => {
-  return await callValidateDatasetsAPI(indices, timestampField, startTime, endTime);
+const cleanUpModule = async (spaceId: string, sourceId: string) => {
+  return await cleanUpJobsAndDatafeeds(spaceId, sourceId, metricsHostsJobTypes);
 };
 
 export const metricHostsModule: ModuleDescriptor<MetricsHostsJobType> = {
@@ -121,6 +174,4 @@ export const metricHostsModule: ModuleDescriptor<MetricsHostsJobType> = {
   getModuleDefinition,
   setUpModule,
   cleanUpModule,
-  validateSetupDatasets,
-  validateSetupIndices,
 };
diff --git a/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts b/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts
index cbcff1c307af6..eaf7489c84eb4 100644
--- a/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts
+++ b/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts
@@ -10,17 +10,28 @@ import { cleanUpJobsAndDatafeeds } from '../../infra_ml_cleanup';
 import { callJobsSummaryAPI } from '../../api/ml_get_jobs_summary_api';
 import { callGetMlModuleAPI } from '../../api/ml_get_module';
 import { callSetupMlModuleAPI } from '../../api/ml_setup_module_api';
-import { callValidateIndicesAPI } from '../../../logs/log_analysis/api/validate_indices';
-import { callValidateDatasetsAPI } from '../../../logs/log_analysis/api/validate_datasets';
 import {
   metricsK8SJobTypes,
   getJobId,
   MetricK8sJobType,
   DatasetFilter,
   bucketSpan,
-  partitionField,
 } from '../../../../../common/infra_ml';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import MemoryJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_memory_usage.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import MemoryDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_memory_usage.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkInJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_network_in.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkInDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_network_in.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkOutJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_network_out.json';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import NetworkOutDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_network_out.json';
 
+type JobType = 'k8s_memory_usage' | 'k8s_network_in' | 'k8s_network_out';
+export const DEFAULT_K8S_PARTITION_FIELD = 'kubernetes.namespace';
 const moduleId = 'metrics_ui_k8s';
 const moduleName = i18n.translate('xpack.infra.ml.metricsModuleName', {
   defaultMessage: 'Metrics anomanly detection',
@@ -54,26 +65,72 @@ const setUpModule = async (
   end: number | undefined,
   datasetFilter: DatasetFilter,
   { spaceId, sourceId, indices, timestampField }: ModuleSourceConfiguration,
-  pField?: string
+  partitionField?: string
 ) => {
   const indexNamePattern = indices.join(',');
-  const jobIds = ['k8s_memory_usage', 'k8s_network_in', 'k8s_network_out'];
-  const jobOverrides = jobIds.map((id) => ({
-    job_id: id,
-    analysis_config: {
-      bucket_span: `${bucketSpan}ms`,
-    },
-    data_description: {
-      time_field: timestampField,
-    },
-    custom_settings: {
-      metrics_source_config: {
-        indexPattern: indexNamePattern,
-        timestampField,
-        bucketSpan,
+  const jobIds: JobType[] = ['k8s_memory_usage', 'k8s_network_in', 'k8s_network_out'];
+  const jobOverrides = jobIds.map((id) => {
+    const { job: defaultJobConfig } = getDefaultJobConfigs(id);
+
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    const analysis_config: any = {
+      ...defaultJobConfig.analysis_config,
+    };
+
+    if (partitionField) {
+      analysis_config.detectors[0].partition_field_name = partitionField;
+      if (analysis_config.influencers.indexOf(partitionField) === -1) {
+        analysis_config.influencers.push(partitionField);
+      }
+    }
+
+    return {
+      job_id: id,
+      data_description: {
+        time_field: timestampField,
+      },
+      analysis_config,
+      custom_settings: {
+        metrics_source_config: {
+          indexPattern: indexNamePattern,
+          timestampField,
+          bucketSpan,
+        },
+      },
+    };
+  });
+
+  const datafeedOverrides = jobIds.map((id) => {
+    const { datafeed: defaultDatafeedConfig } = getDefaultJobConfigs(id);
+
+    if (!partitionField || id === 'k8s_memory_usage') {
+      // Since the host memory usage doesn't have custom aggs, we don't need to do anything to add a partition field
+      return defaultDatafeedConfig;
+    }
+
+    // Because the ML K8s jobs ship with a default partition field of {kubernetes.namespace}, ignore that agg and wrap it in our own agg.
+    const innerAggregation =
+      defaultDatafeedConfig.aggregations[DEFAULT_K8S_PARTITION_FIELD].aggregations;
+
+    // If we have a partition field, we need to change the aggregation to do a terms agg to partition the data at the top level
+    const aggregations = {
+      [partitionField]: {
+        terms: {
+          field: partitionField,
+          size: 25, // 25 is arbitratry and only used to keep the number of buckets to a managable level in the event that the user choose a high cardinality partition field.
+        },
+        aggregations: {
+          ...innerAggregation,
+        },
       },
-    },
-  }));
+    };
+
+    return {
+      ...defaultDatafeedConfig,
+      job_id: id,
+      aggregations,
+    };
+  });
 
   return callSetupMlModuleAPI(
     moduleId,
@@ -83,34 +140,32 @@ const setUpModule = async (
     sourceId,
     indexNamePattern,
     jobOverrides,
-    []
+    datafeedOverrides
   );
 };
 
-const cleanUpModule = async (spaceId: string, sourceId: string) => {
-  return await cleanUpJobsAndDatafeeds(spaceId, sourceId, metricsK8SJobTypes);
-};
-
-const validateSetupIndices = async (indices: string[], timestampField: string) => {
-  return await callValidateIndicesAPI(indices, [
-    {
-      name: timestampField,
-      validTypes: ['date'],
-    },
-    {
-      name: partitionField,
-      validTypes: ['keyword'],
-    },
-  ]);
+const getDefaultJobConfigs = (jobId: JobType): { datafeed: any; job: any } => {
+  switch (jobId) {
+    case 'k8s_memory_usage':
+      return {
+        datafeed: MemoryDatafeed,
+        job: MemoryJob,
+      };
+    case 'k8s_network_in':
+      return {
+        datafeed: NetworkInDatafeed,
+        job: NetworkInJob,
+      };
+    case 'k8s_network_out':
+      return {
+        datafeed: NetworkOutDatafeed,
+        job: NetworkOutJob,
+      };
+  }
 };
 
-const validateSetupDatasets = async (
-  indices: string[],
-  timestampField: string,
-  startTime: number,
-  endTime: number
-) => {
-  return await callValidateDatasetsAPI(indices, timestampField, startTime, endTime);
+const cleanUpModule = async (spaceId: string, sourceId: string) => {
+  return await cleanUpJobsAndDatafeeds(spaceId, sourceId, metricsK8SJobTypes);
 };
 
 export const metricHostsModule: ModuleDescriptor<MetricK8sJobType> = {
@@ -124,6 +179,4 @@ export const metricHostsModule: ModuleDescriptor<MetricK8sJobType> = {
   getModuleDefinition,
   setUpModule,
   cleanUpModule,
-  validateSetupDatasets,
-  validateSetupIndices,
 };
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomoly_detection_flyout.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomoly_detection_flyout.tsx
index b063713fa2c97..b5d224910e819 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomoly_detection_flyout.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomoly_detection_flyout.tsx
@@ -50,10 +50,10 @@ export const AnomalyDetectionFlyout = () => {
 
   return (
     <>
-      <EuiButtonEmpty iconSide={'right'} onClick={openFlyout}>
+      <EuiButtonEmpty iconSide={'left'} iconType={'inspect'} onClick={openFlyout}>
         <FormattedMessage
           id="xpack.infra.ml.anomalyDetectionButton"
-          defaultMessage="Anomaly Detection"
+          defaultMessage="Anomaly detection"
         />
       </EuiButtonEmpty>
       {showFlyout && (
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx
index 801dff9c4a17a..5b520084ebb74 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx
@@ -5,7 +5,7 @@
  */
 
 import React, { useState, useCallback, useEffect } from 'react';
-import { EuiFlyoutHeader, EuiTitle, EuiFlyoutBody, EuiTabs, EuiTab, EuiSpacer } from '@elastic/eui';
+import { EuiFlyoutHeader, EuiTitle, EuiFlyoutBody, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiText, EuiFlexGroup, EuiFlexItem, EuiCard, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
@@ -30,7 +30,7 @@ interface Props {
 }
 
 export const FlyoutHome = (props: Props) => {
-  const [tab, setTab] = useState<'jobs' | 'anomalies'>('jobs');
+  const [tab] = useState<'jobs' | 'anomalies'>('jobs');
   const { goToSetup } = props;
   const {
     fetchJobStatus: fetchHostJobStatus,
@@ -56,18 +56,10 @@ export const FlyoutHome = (props: Props) => {
     goToSetup('kubernetes');
   }, [goToSetup]);
 
-  const goToJobs = useCallback(() => {
-    setTab('jobs');
-  }, []);
-
   const jobIds = [
     ...(k8sJobSummaries || []).map((k) => k.id),
     ...(hostJobSummaries || []).map((h) => h.id),
   ];
-  const anomaliesUrl = useLinkProps({
-    app: 'ml',
-    pathname: `/explorer?_g=${createResultsUrl(jobIds)}`,
-  });
 
   useEffect(() => {
     if (hasInfraMLReadCapabilities) {
@@ -105,30 +97,24 @@ export const FlyoutHome = (props: Props) => {
         </EuiFlyoutHeader>
 
         <EuiFlyoutBody>
-          <EuiTabs>
-            <EuiTab isSelected={tab === 'jobs'} onClick={goToJobs}>
-              <FormattedMessage
-                defaultMessage="Jobs"
-                id="xpack.infra.ml.anomalyFlyout.jobsTabLabel"
-              />
-            </EuiTab>
-            <EuiTab
-              disabled={jobIds.length === 0}
-              isSelected={tab === 'anomalies'}
-              {...anomaliesUrl}
-            >
-              <FormattedMessage
-                defaultMessage="Anomalies"
-                id="xpack.infra.ml.anomalyFlyout.anomaliesTabLabel"
-              />
-            </EuiTab>
-          </EuiTabs>
+          <div>
+            <EuiText>
+              <p>
+                <FormattedMessage
+                  defaultMessage="Anomaly detection is powered by machine learning. Machine learning jobs are available for the following resource types. Enable these jobs to begin detecting anomalies in your infrastructure metrics."
+                  id="xpack.infra.ml.anomalyFlyout.create.description"
+                />
+              </p>
+            </EuiText>
+          </div>
+
           <EuiSpacer size="l" />
           {hostJobSummaries.length > 0 && (
             <>
               <JobsEnabledCallout
                 hasHostJobs={hostJobSummaries.length > 0}
                 hasK8sJobs={k8sJobSummaries.length > 0}
+                jobIds={jobIds}
               />
               <EuiSpacer size="l" />
             </>
@@ -151,6 +137,7 @@ export const FlyoutHome = (props: Props) => {
 interface CalloutProps {
   hasHostJobs: boolean;
   hasK8sJobs: boolean;
+  jobIds: string[];
 }
 const JobsEnabledCallout = (props: CalloutProps) => {
   let target = '';
@@ -175,8 +162,34 @@ const JobsEnabledCallout = (props: CalloutProps) => {
     pathname: '/jobs',
   });
 
+  const anomaliesUrl = useLinkProps({
+    app: 'ml',
+    pathname: `/explorer?_g=${createResultsUrl(props.jobIds)}`,
+  });
+
   return (
     <>
+      <EuiFlexGroup gutterSize={'s'}>
+        <EuiFlexItem grow={false}>
+          <EuiButton {...manageJobsLinkProps} style={{ marginRight: 5 }}>
+            <FormattedMessage
+              defaultMessage="Manage jobs"
+              id="xpack.infra.ml.anomalyFlyout.manageJobs"
+            />
+          </EuiButton>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiButton {...anomaliesUrl}>
+            <FormattedMessage
+              defaultMessage="View anomalies"
+              id="xpack.infra.ml.anomalyFlyout.anomaliesTabLabel"
+            />
+          </EuiButton>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+
+      <EuiSpacer size="l" />
+
       <EuiCallOut
         size="m"
         color="success"
@@ -189,13 +202,6 @@ const JobsEnabledCallout = (props: CalloutProps) => {
         }
         iconType="check"
       />
-      <EuiSpacer size="l" />
-      <EuiButton {...manageJobsLinkProps}>
-        <FormattedMessage
-          defaultMessage="Manage Jobs"
-          id="xpack.infra.ml.anomalyFlyout.manageJobs"
-        />
-      </EuiButton>
     </>
   );
 };
@@ -211,30 +217,11 @@ interface CreateJobTab {
 const CreateJobTab = (props: CreateJobTab) => {
   return (
     <>
-      <div>
-        <EuiText>
-          <h3>
-            <FormattedMessage
-              defaultMessage="Create ML Jobs"
-              id="xpack.infra.ml.anomalyFlyout.create.jobsTitle"
-            />
-          </h3>
-        </EuiText>
-        <EuiText>
-          <p>
-            <FormattedMessage
-              defaultMessage="Machine Learning jobs are available for the following resource types. Enable these jobs to begin detecting anomalies in your infrastructure metrics"
-              id="xpack.infra.ml.anomalyFlyout.create.description"
-            />
-          </p>
-        </EuiText>
-      </div>
-
-      <EuiSpacer size="l" />
+      {/* <EuiSpacer size="l" /> */}
       <EuiFlexGroup gutterSize={'m'}>
         <EuiFlexItem>
           <EuiCard
-            // isDisabled={props.hasSetupCapabilities}
+            isDisabled={!props.hasSetupCapabilities}
             icon={<EuiIcon type={'storage'} />}
             // title="Hosts"
             title={
@@ -245,7 +232,7 @@ const CreateJobTab = (props: CreateJobTab) => {
             }
             description={
               <FormattedMessage
-                defaultMessage="Detect anomalies for CPU usage, memory usage, network traffic, and load."
+                defaultMessage="Detect anomalies for memory usage and network traffic."
                 id="xpack.infra.ml.anomalyFlyout.create.hostDescription"
               />
             }
@@ -254,7 +241,7 @@ const CreateJobTab = (props: CreateJobTab) => {
                 {props.hasHostJobs && (
                   <EuiButtonEmpty onClick={props.createHosts}>
                     <FormattedMessage
-                      defaultMessage="Recreate Jobs"
+                      defaultMessage="Recreate jobs"
                       id="xpack.infra.ml.anomalyFlyout.create.recreateButton"
                     />
                   </EuiButtonEmpty>
@@ -262,7 +249,7 @@ const CreateJobTab = (props: CreateJobTab) => {
                 {!props.hasHostJobs && (
                   <EuiButton onClick={props.createHosts}>
                     <FormattedMessage
-                      defaultMessage="Create Jobs"
+                      defaultMessage="Enable"
                       id="xpack.infra.ml.anomalyFlyout.create.createButton"
                     />
                   </EuiButton>
@@ -273,7 +260,7 @@ const CreateJobTab = (props: CreateJobTab) => {
         </EuiFlexItem>
         <EuiFlexItem>
           <EuiCard
-            // isDisabled={props.hasSetupCapabilities}
+            isDisabled={!props.hasSetupCapabilities}
             icon={<EuiIcon type={'logoKubernetes'} />}
             title={
               <FormattedMessage
@@ -283,7 +270,7 @@ const CreateJobTab = (props: CreateJobTab) => {
             }
             description={
               <FormattedMessage
-                defaultMessage="Detect anomalies for CPU usage, memory usage, network traffic, and load."
+                defaultMessage="Detect anomalies for memory usage and network traffic."
                 id="xpack.infra.ml.anomalyFlyout.create.k8sDescription"
               />
             }
@@ -292,7 +279,7 @@ const CreateJobTab = (props: CreateJobTab) => {
                 {props.hasK8sJobs && (
                   <EuiButtonEmpty onClick={props.createK8s}>
                     <FormattedMessage
-                      defaultMessage="Recreate Jobs"
+                      defaultMessage="Recreate jobs"
                       id="xpack.infra.ml.anomalyFlyout.create.recreateButton"
                     />
                   </EuiButtonEmpty>
@@ -300,7 +287,7 @@ const CreateJobTab = (props: CreateJobTab) => {
                 {!props.hasK8sJobs && (
                   <EuiButton onClick={props.createK8s}>
                     <FormattedMessage
-                      defaultMessage="Create Jobs"
+                      defaultMessage="Enable"
                       id="xpack.infra.ml.anomalyFlyout.create.createButton"
                     />
                   </EuiButton>
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx
index 428c002da6383..c327d187f6bc2 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx
@@ -20,6 +20,7 @@ import { useSourceViaHttp } from '../../../../../../containers/source/use_source
 import { useMetricK8sModuleContext } from '../../../../../../containers/ml/modules/metrics_k8s/module';
 import { useMetricHostsModuleContext } from '../../../../../../containers/ml/modules/metrics_hosts/module';
 import { FixedDatePicker } from '../../../../../../components/fixed_datepicker';
+import { DEFAULT_K8S_PARTITION_FIELD } from '../../../../../../containers/ml/modules/metrics_k8s/module_descriptor';
 
 interface Props {
   jobType: 'hosts' | 'kubernetes';
@@ -107,7 +108,7 @@ export const JobSetupScreen = (props: Props) => {
 
   useEffect(() => {
     if (props.jobType === 'kubernetes') {
-      setPartitionField(['kubernetes.namespace']);
+      setPartitionField([DEFAULT_K8S_PARTITION_FIELD]);
     }
   }, [props.jobType]);
 
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
index 2a5798ac6a70c..3993b4ffc02b0 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
@@ -208,27 +208,22 @@ export function InnerWorkspacePanel({
       >
         <h2>
           <strong>
-            {expression === null ? (
-              <FormattedMessage
-                id="xpack.lens.editorFrame.emptyWorkspace"
-                defaultMessage="Drop some fields here to start"
-              />
-            ) : (
-              <FormattedMessage
-                id="xpack.lens.editorFrame.emptyWorkspaceSimple"
-                defaultMessage="Drop field here"
-              />
-            )}
+            {expression === null
+              ? i18n.translate('xpack.lens.editorFrame.emptyWorkspace', {
+                  defaultMessage: 'Drop some fields here to start',
+                })
+              : i18n.translate('xpack.lens.editorFrame.emptyWorkspaceSimple', {
+                  defaultMessage: 'Drop field here',
+                })}
           </strong>
         </h2>
         <DropIllustration aria-hidden={true} className="lnsWorkspacePanel__dropIllustration" />
         {expression === null && (
           <>
             <p>
-              <FormattedMessage
-                id="xpack.lens.editorFrame.emptyWorkspaceHeading"
-                defaultMessage="Lens is a new tool for creating visualizations"
-              />
+              {i18n.translate('xpack.lens.editorFrame.emptyWorkspaceHeading', {
+                defaultMessage: 'Lens is a new tool for creating visualization',
+              })}
             </p>
             <p>
               <small>
@@ -237,10 +232,9 @@ export function InnerWorkspacePanel({
                   target="_blank"
                   external
                 >
-                  <FormattedMessage
-                    id="xpack.lens.editorFrame.goToForums"
-                    defaultMessage="Make requests and give feedback"
-                  />
+                  {i18n.translate('xpack.lens.editorFrame.goToForums', {
+                    defaultMessage: 'Make requests and give feedback',
+                  })}
                 </EuiLink>
               </small>
             </p>
diff --git a/x-pack/plugins/lens/public/xy_visualization/expression.test.tsx b/x-pack/plugins/lens/public/xy_visualization/expression.test.tsx
index 3bd6cc73d6320..5fc89d831a961 100644
--- a/x-pack/plugins/lens/public/xy_visualization/expression.test.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/expression.test.tsx
@@ -896,7 +896,12 @@ describe('xy_expression', () => {
 
     test('it applies histogram mode to the series for single series', () => {
       const { data, args } = sampleArgs();
-      const firstLayer: LayerArgs = { ...args.layers[0], seriesType: 'bar', isHistogram: true };
+      const firstLayer: LayerArgs = {
+        ...args.layers[0],
+        accessors: ['b'],
+        seriesType: 'bar',
+        isHistogram: true,
+      };
       delete firstLayer.splitAccessor;
       const component = shallow(
         <XYChart
@@ -911,7 +916,48 @@ describe('xy_expression', () => {
         />
       );
       expect(component.find(BarSeries).at(0).prop('enableHistogramMode')).toEqual(true);
-      expect(component.find(BarSeries).at(1).prop('enableHistogramMode')).toEqual(true);
+    });
+
+    test('it does not apply histogram mode to more than one bar series for unstacked bar chart', () => {
+      const { data, args } = sampleArgs();
+      const firstLayer: LayerArgs = { ...args.layers[0], seriesType: 'bar', isHistogram: true };
+      delete firstLayer.splitAccessor;
+      const component = shallow(
+        <XYChart
+          data={data}
+          args={{ ...args, layers: [firstLayer] }}
+          formatFactory={getFormatSpy}
+          timeZone="UTC"
+          chartsThemeService={chartsThemeService}
+          histogramBarTarget={50}
+          onClickValue={onClickValue}
+          onSelectRange={onSelectRange}
+        />
+      );
+      expect(component.find(BarSeries).at(0).prop('enableHistogramMode')).toEqual(false);
+      expect(component.find(BarSeries).at(1).prop('enableHistogramMode')).toEqual(false);
+    });
+
+    test('it applies histogram mode to more than one the series for unstacked line/area chart', () => {
+      const { data, args } = sampleArgs();
+      const firstLayer: LayerArgs = { ...args.layers[0], seriesType: 'line', isHistogram: true };
+      delete firstLayer.splitAccessor;
+      const secondLayer: LayerArgs = { ...args.layers[0], seriesType: 'line', isHistogram: true };
+      delete secondLayer.splitAccessor;
+      const component = shallow(
+        <XYChart
+          data={data}
+          args={{ ...args, layers: [firstLayer, secondLayer] }}
+          formatFactory={getFormatSpy}
+          timeZone="UTC"
+          chartsThemeService={chartsThemeService}
+          histogramBarTarget={50}
+          onClickValue={onClickValue}
+          onSelectRange={onSelectRange}
+        />
+      );
+      expect(component.find(LineSeries).at(0).prop('enableHistogramMode')).toEqual(true);
+      expect(component.find(LineSeries).at(1).prop('enableHistogramMode')).toEqual(true);
     });
 
     test('it applies histogram mode to the series for stacked series', () => {
diff --git a/x-pack/plugins/lens/public/xy_visualization/expression.tsx b/x-pack/plugins/lens/public/xy_visualization/expression.tsx
index f36525a9a0b14..a59739ec78f7f 100644
--- a/x-pack/plugins/lens/public/xy_visualization/expression.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/expression.tsx
@@ -299,6 +299,13 @@ export function XYChart({
     yRight: true,
   };
 
+  const filteredBarLayers = filteredLayers.filter((layer) => layer.seriesType.includes('bar'));
+
+  const chartHasMoreThanOneBarSeries =
+    filteredBarLayers.length > 1 ||
+    filteredBarLayers.some((layer) => layer.accessors.length > 1) ||
+    filteredBarLayers.some((layer) => layer.splitAccessor);
+
   function calculateMinInterval() {
     // check all the tables to see if all of the rows have the same timestamp
     // that would mean that chart will draw a single bar
@@ -599,7 +606,12 @@ export function XYChart({
             groupId: yAxesConfiguration.find((axisConfiguration) =>
               axisConfiguration.series.find((currentSeries) => currentSeries.accessor === accessor)
             )?.groupId,
-            enableHistogramMode: isHistogram && (seriesType.includes('stacked') || !splitAccessor),
+            enableHistogramMode:
+              isHistogram &&
+              (seriesType.includes('stacked') || !splitAccessor) &&
+              (seriesType.includes('stacked') ||
+                !seriesType.includes('bar') ||
+                !chartHasMoreThanOneBarSeries),
             stackMode: seriesType.includes('percentage') ? StackMode.Percentage : undefined,
             timeZone,
             areaSeriesStyle: {
diff --git a/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts b/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts
index f3521cca2e456..16b60492c9b78 100644
--- a/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts
@@ -38,15 +38,21 @@ export type VectorSourceRequestMeta = MapFilters & {
   applyGlobalQuery: boolean;
   fieldNames: string[];
   geogridPrecision?: number;
-  sourceQuery: MapQuery;
+  sourceQuery?: MapQuery;
   sourceMeta: VectorSourceSyncMeta;
 };
 
+export type VectorJoinSourceRequestMeta = MapFilters & {
+  applyGlobalQuery: boolean;
+  fieldNames: string[];
+  sourceQuery: MapQuery;
+};
+
 export type VectorStyleRequestMeta = MapFilters & {
   dynamicStyleFields: string[];
   isTimeAware: boolean;
   sourceQuery: MapQuery;
-  timeFilters: unknown;
+  timeFilters: TimeRange;
 };
 
 export type ESSearchSourceResponseMeta = {
@@ -59,9 +65,12 @@ export type ESSearchSourceResponseMeta = {
 };
 
 // Partial because objects are justified downstream in constructors
-export type DataMeta = Partial<VectorSourceRequestMeta> &
-  Partial<VectorStyleRequestMeta> &
-  Partial<ESSearchSourceResponseMeta>;
+export type DataMeta = Partial<
+  VectorSourceRequestMeta &
+    VectorJoinSourceRequestMeta &
+    VectorStyleRequestMeta &
+    ESSearchSourceResponseMeta
+>;
 
 type NumericalStyleFieldData = {
   avg: number;
diff --git a/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts b/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts
index d064dfb1c4a37..b769b125cf0f8 100644
--- a/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts
@@ -17,7 +17,7 @@ export type MapExtent = {
 };
 
 export type MapQuery = Query & {
-  queryLastTriggeredAt: string;
+  queryLastTriggeredAt?: string;
 };
 
 export type MapRefreshConfig = {
diff --git a/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts b/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts
index 7828c3cc6410b..f157ffe9f1c80 100644
--- a/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts
+++ b/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts
@@ -33,8 +33,10 @@ export function addFieldToDSL(dsl: object, field: IFieldType) {
       };
 }
 
+export type BucketProperties = Record<string | number, unknown>;
+
 export function extractPropertiesFromBucket(bucket: any, ignoreKeys: string[] = []) {
-  const properties: Record<string | number, unknown> = {};
+  const properties: BucketProperties = {};
   for (const key in bucket) {
     if (ignoreKeys.includes(key) || !bucket.hasOwnProperty(key)) {
       continue;
diff --git a/x-pack/plugins/maps/public/actions/data_request_actions.ts b/x-pack/plugins/maps/public/actions/data_request_actions.ts
index 14d8196900506..d7d9259e1539e 100644
--- a/x-pack/plugins/maps/public/actions/data_request_actions.ts
+++ b/x-pack/plugins/maps/public/actions/data_request_actions.ts
@@ -47,7 +47,7 @@ const FIT_TO_BOUNDS_SCALE_FACTOR = 0.1;
 
 export type DataRequestContext = {
   startLoading(dataId: string, requestToken: symbol, meta: DataMeta): void;
-  stopLoading(dataId: string, requestToken: symbol, data: object, meta: DataMeta): void;
+  stopLoading(dataId: string, requestToken: symbol, data: object, meta?: DataMeta): void;
   onLoadError(dataId: string, requestToken: symbol, errorMessage: string): void;
   updateSourceData(newData: unknown): void;
   isRequestStillActive(dataId: string, requestToken: symbol): boolean;
diff --git a/x-pack/plugins/maps/public/classes/joins/inner_join.d.ts b/x-pack/plugins/maps/public/classes/joins/inner_join.d.ts
index befff0965fb70..3e2ceac4971c4 100644
--- a/x-pack/plugins/maps/public/classes/joins/inner_join.d.ts
+++ b/x-pack/plugins/maps/public/classes/joins/inner_join.d.ts
@@ -4,19 +4,40 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { Feature, GeoJsonProperties } from 'geojson';
 import { IESTermSource } from '../sources/es_term_source';
-import { IJoin } from './join';
+import { IJoin, PropertiesMap } from './join';
 import { JoinDescriptor } from '../../../common/descriptor_types';
 import { ISource } from '../sources/source';
+import { ITooltipProperty } from '../tooltips/tooltip_property';
+import { IField } from '../fields/field';
 
 export class InnerJoin implements IJoin {
   constructor(joinDescriptor: JoinDescriptor, leftSource: ISource);
 
+  destroy: () => void;
+
   getRightJoinSource(): IESTermSource;
 
   toDescriptor(): JoinDescriptor;
 
+  getJoinFields: () => IField[];
+
+  getLeftField: () => IField;
+
+  getIndexPatternIds: () => string[];
+
+  getQueryableIndexPatternIds: () => string[];
+
+  getSourceDataRequestId: () => string;
+
   getSourceMetaDataRequestId(): string;
 
   getSourceFormattersDataRequestId(): string;
+
+  getTooltipProperties(properties: GeoJsonProperties): Promise<ITooltipProperty[]>;
+
+  hasCompleteConfig: () => boolean;
+
+  joinPropertiesToFeature: (feature: Feature, propertiesMap?: PropertiesMap) => boolean;
 }
diff --git a/x-pack/plugins/maps/public/classes/joins/join.ts b/x-pack/plugins/maps/public/classes/joins/join.ts
index 5bcc4bfdec87e..df6f6f684f4d2 100644
--- a/x-pack/plugins/maps/public/classes/joins/join.ts
+++ b/x-pack/plugins/maps/public/classes/joins/join.ts
@@ -4,15 +4,39 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { Feature, GeoJsonProperties } from 'geojson';
 import { IESTermSource } from '../sources/es_term_source';
 import { JoinDescriptor } from '../../../common/descriptor_types';
+import { ITooltipProperty } from '../tooltips/tooltip_property';
+import { IField } from '../fields/field';
+import { BucketProperties } from '../../../common/elasticsearch_util';
+
+export type PropertiesMap = Map<string, BucketProperties>;
 
 export interface IJoin {
-  getRightJoinSource(): IESTermSource;
+  destroy: () => void;
+
+  getRightJoinSource: () => IESTermSource;
+
+  toDescriptor: () => JoinDescriptor;
+
+  getJoinFields: () => IField[];
+
+  getLeftField: () => IField;
+
+  getIndexPatternIds: () => string[];
+
+  getQueryableIndexPatternIds: () => string[];
+
+  getSourceDataRequestId: () => string;
+
+  getSourceMetaDataRequestId: () => string;
+
+  getSourceFormattersDataRequestId: () => string;
 
-  toDescriptor(): JoinDescriptor;
+  getTooltipProperties: (properties: GeoJsonProperties) => Promise<ITooltipProperty[]>;
 
-  getSourceMetaDataRequestId(): string;
+  hasCompleteConfig: () => boolean;
 
-  getSourceFormattersDataRequestId(): string;
+  joinPropertiesToFeature: (feature: Feature, propertiesMap?: PropertiesMap) => boolean;
 }
diff --git a/x-pack/plugins/maps/public/classes/layers/blended_vector_layer/blended_vector_layer.ts b/x-pack/plugins/maps/public/classes/layers/blended_vector_layer/blended_vector_layer.ts
index 90e8d25a77958..9b6a67ac28ad0 100644
--- a/x-pack/plugins/maps/public/classes/layers/blended_vector_layer/blended_vector_layer.ts
+++ b/x-pack/plugins/maps/public/classes/layers/blended_vector_layer/blended_vector_layer.ts
@@ -37,7 +37,6 @@ import {
   LayerDescriptor,
   VectorLayerDescriptor,
 } from '../../../../common/descriptor_types';
-import { IStyle } from '../../styles/style';
 import { IVectorSource } from '../../sources/vector_source';
 
 const ACTIVE_COUNT_DATA_ID = 'ACTIVE_COUNT_DATA_ID';
@@ -257,7 +256,7 @@ export class BlendedVectorLayer extends VectorLayer implements IVectorLayer {
     return clonedDescriptor;
   }
 
-  getSource() {
+  getSource(): IVectorSource {
     return this._isClustered ? this._clusterSource : this._documentSource;
   }
 
@@ -268,11 +267,11 @@ export class BlendedVectorLayer extends VectorLayer implements IVectorLayer {
     return this._documentSource;
   }
 
-  getCurrentStyle(): IStyle {
+  getCurrentStyle(): IVectorStyle {
     return this._isClustered ? this._clusterStyle : this._documentStyle;
   }
 
-  getStyleForEditing(): IStyle {
+  getStyleForEditing(): IVectorStyle {
     return this._documentStyle;
   }
 
@@ -281,8 +280,8 @@ export class BlendedVectorLayer extends VectorLayer implements IVectorLayer {
     const requestToken = Symbol(`layer-active-count:${this.getId()}`);
     const searchFilters = this._getSearchFilters(
       syncContext.dataFilters,
-      this.getSource() as IVectorSource,
-      this.getCurrentStyle() as IVectorStyle
+      this.getSource(),
+      this.getCurrentStyle()
     );
     const canSkipFetch = await canSkipSourceUpdate({
       source: this.getSource(),
diff --git a/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.js b/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.js
index adcc86b9d1546..33e82db79f3cf 100644
--- a/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.js
+++ b/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.js
@@ -31,6 +31,18 @@ export class HeatmapLayer extends VectorLayer {
     }
   }
 
+  getStyleForEditing() {
+    return this._style;
+  }
+
+  getStyle() {
+    return this._style;
+  }
+
+  getCurrentStyle() {
+    return this._style;
+  }
+
   _getPropKeyOfSelectedMetric() {
     const metricfields = this.getSource().getMetricFields();
     return metricfields[0].getName();
diff --git a/x-pack/plugins/maps/public/classes/layers/layer.test.ts b/x-pack/plugins/maps/public/classes/layers/layer.test.ts
index 7bc91d71f83e2..76df7c2af840a 100644
--- a/x-pack/plugins/maps/public/classes/layers/layer.test.ts
+++ b/x-pack/plugins/maps/public/classes/layers/layer.test.ts
@@ -7,7 +7,6 @@
 
 import { AbstractLayer } from './layer';
 import { ISource } from '../sources/source';
-import { IStyle } from '../styles/style';
 import { AGG_TYPE, FIELD_ORIGIN, LAYER_STYLE_TYPE, VECTOR_STYLES } from '../../../common/constants';
 import { ESTermSourceDescriptor, VectorStyleDescriptor } from '../../../common/descriptor_types';
 import { getDefaultDynamicProperties } from '../styles/vector/vector_style_defaults';
@@ -38,8 +37,6 @@ class MockSource {
   }
 }
 
-class MockStyle {}
-
 describe('cloneDescriptor', () => {
   describe('with joins', () => {
     const styleDescriptor = {
@@ -84,7 +81,6 @@ describe('cloneDescriptor', () => {
       const layer = new MockLayer({
         layerDescriptor,
         source: (new MockSource() as unknown) as ISource,
-        style: (new MockStyle() as unknown) as IStyle,
       });
       const clonedDescriptor = await layer.cloneDescriptor();
       const clonedStyleProps = (clonedDescriptor.style as VectorStyleDescriptor).properties;
@@ -122,7 +118,6 @@ describe('cloneDescriptor', () => {
       const layer = new MockLayer({
         layerDescriptor,
         source: (new MockSource() as unknown) as ISource,
-        style: (new MockStyle() as unknown) as IStyle,
       });
       const clonedDescriptor = await layer.cloneDescriptor();
       const clonedStyleProps = (clonedDescriptor.style as VectorStyleDescriptor).properties;
@@ -165,7 +160,6 @@ describe('isFittable', () => {
       const layer = new MockLayer({
         layerDescriptor,
         source: (new MockSource({ fitToBounds: test.fitToBounds }) as unknown) as ISource,
-        style: (new MockStyle() as unknown) as IStyle,
       });
       expect(await layer.isFittable()).toBe(test.canFit);
     });
diff --git a/x-pack/plugins/maps/public/classes/layers/layer.tsx b/x-pack/plugins/maps/public/classes/layers/layer.tsx
index cd720063c6703..d6bd5180375ce 100644
--- a/x-pack/plugins/maps/public/classes/layers/layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/layer.tsx
@@ -110,13 +110,11 @@ export type CustomIconAndTooltipContent = {
 export interface ILayerArguments {
   layerDescriptor: LayerDescriptor;
   source: ISource;
-  style: IStyle;
 }
 
 export class AbstractLayer implements ILayer {
   protected readonly _descriptor: LayerDescriptor;
   protected readonly _source: ISource;
-  protected readonly _style: IStyle;
   protected readonly _dataRequests: DataRequest[];
 
   static createDescriptor(options: Partial<LayerDescriptor>): LayerDescriptor {
@@ -140,10 +138,9 @@ export class AbstractLayer implements ILayer {
     }
   }
 
-  constructor({ layerDescriptor, source, style }: ILayerArguments) {
+  constructor({ layerDescriptor, source }: ILayerArguments) {
     this._descriptor = AbstractLayer.createDescriptor(layerDescriptor);
     this._source = source;
-    this._style = style;
     if (this._descriptor.__dataRequests) {
       this._dataRequests = this._descriptor.__dataRequests.map(
         (dataRequest) => new DataRequest(dataRequest)
@@ -257,11 +254,15 @@ export class AbstractLayer implements ILayer {
   }
 
   getStyleForEditing(): IStyle {
-    return this._style;
+    throw new Error('Should implement AbstractLayer#getStyleForEditing');
   }
 
-  getStyle() {
-    return this._style;
+  getStyle(): IStyle {
+    throw new Error('Should implement AbstractLayer#getStyle');
+  }
+
+  getCurrentStyle(): IStyle {
+    throw new Error('Should implement AbstractLayer#getCurrentStyle');
   }
 
   getLabel(): string {
@@ -412,10 +413,6 @@ export class AbstractLayer implements ILayer {
     return this._descriptor.query ? this._descriptor.query : null;
   }
 
-  getCurrentStyle(): IStyle {
-    return this._style;
-  }
-
   async getImmutableSourceProperties() {
     const source = this.getSource();
     return await source.getImmutableProperties();
diff --git a/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js
index 3e2009c24a2e4..fa60017f0eaf7 100644
--- a/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js
+++ b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js
@@ -21,7 +21,20 @@ export class TileLayer extends AbstractLayer {
   }
 
   constructor({ source, layerDescriptor }) {
-    super({ source, layerDescriptor, style: new TileStyle() });
+    super({ source, layerDescriptor });
+    this._style = new TileStyle();
+  }
+
+  getStyleForEditing() {
+    return this._style;
+  }
+
+  getStyle() {
+    return this._style;
+  }
+
+  getCurrentStyle() {
+    return this._style;
   }
 
   async syncData({ startLoading, stopLoading, onLoadError, dataFilters }) {
diff --git a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx
index 70bf8ea3883b7..68b9f2931f398 100644
--- a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx
@@ -5,9 +5,14 @@
  */
 
 import React from 'react';
+import {
+  Map as MbMap,
+  GeoJSONSource as MbGeoJSONSource,
+  VectorSource as MbVectorSource,
+} from 'mapbox-gl';
 import { EuiIcon } from '@elastic/eui';
 import { Feature } from 'geojson';
-import { VectorStyle } from '../../styles/vector/vector_style';
+import { IVectorStyle, VectorStyle } from '../../styles/vector/vector_style';
 import { SOURCE_DATA_REQUEST_ID, LAYER_TYPE } from '../../../../common/constants';
 import { VectorLayer, VectorLayerArguments } from '../vector_layer/vector_layer';
 import { ITiledSingleLayerVectorSource } from '../../sources/vector_source';
@@ -59,7 +64,7 @@ export class TiledVectorLayer extends VectorLayer {
     const searchFilters: VectorSourceRequestMeta = this._getSearchFilters(
       dataFilters,
       this.getSource(),
-      this._style
+      this._style as IVectorStyle
     );
     const prevDataRequest = this.getSourceDataRequest();
 
@@ -88,13 +93,12 @@ export class TiledVectorLayer extends VectorLayer {
   }
 
   async syncData(syncContext: DataRequestContext) {
-    await this._syncSourceStyleMeta(syncContext, this._source, this._style);
-    await this._syncSourceFormatters(syncContext, this._source, this._style);
+    await this._syncSourceStyleMeta(syncContext, this._source, this._style as IVectorStyle);
+    await this._syncSourceFormatters(syncContext, this._source, this._style as IVectorStyle);
     await this._syncMVTUrlTemplate(syncContext);
   }
 
-  _syncSourceBindingWithMb(mbMap: unknown) {
-    // @ts-expect-error
+  _syncSourceBindingWithMb(mbMap: MbMap) {
     const mbSource = mbMap.getSource(this._getMbSourceId());
     if (mbSource) {
       return;
@@ -113,7 +117,6 @@ export class TiledVectorLayer extends VectorLayer {
     }
 
     const mbSourceId = this._getMbSourceId();
-    // @ts-expect-error
     mbMap.addSource(mbSourceId, {
       type: 'vector',
       tiles: [sourceMeta.urlTemplate],
@@ -126,7 +129,7 @@ export class TiledVectorLayer extends VectorLayer {
     return this._getMbSourceId() === mbSourceId;
   }
 
-  _syncStylePropertiesWithMb(mbMap: unknown) {
+  _syncStylePropertiesWithMb(mbMap: MbMap) {
     // @ts-ignore
     const mbSource = mbMap.getSource(this._getMbSourceId());
     if (!mbSource) {
@@ -146,12 +149,16 @@ export class TiledVectorLayer extends VectorLayer {
     this._setMbLinePolygonProperties(mbMap, sourceMeta.layerName);
   }
 
-  _requiresPrevSourceCleanup(mbMap: unknown): boolean {
-    // @ts-expect-error
-    const mbTileSource = mbMap.getSource(this._getMbSourceId());
-    if (!mbTileSource) {
+  _requiresPrevSourceCleanup(mbMap: MbMap): boolean {
+    const mbSource = mbMap.getSource(this._getMbSourceId()) as MbVectorSource | MbGeoJSONSource;
+    if (!mbSource) {
       return false;
     }
+    if (!('tiles' in mbSource)) {
+      // Expected source is not compatible, so remove.
+      return true;
+    }
+    const mbTileSource = mbSource as MbVectorSource;
 
     const dataRequest = this.getSourceDataRequest();
     if (!dataRequest) {
@@ -163,13 +170,8 @@ export class TiledVectorLayer extends VectorLayer {
       return false;
     }
 
-    if (!mbTileSource.tiles) {
-      // Expected source is not compatible, so remove.
-      return true;
-    }
-
     const isSourceDifferent =
-      mbTileSource.tiles[0] !== tiledSourceMeta.urlTemplate ||
+      mbTileSource.tiles?.[0] !== tiledSourceMeta.urlTemplate ||
       mbTileSource.minzoom !== tiledSourceMeta.minSourceZoom ||
       mbTileSource.maxzoom !== tiledSourceMeta.maxSourceZoom;
 
@@ -179,9 +181,8 @@ export class TiledVectorLayer extends VectorLayer {
 
     const layerIds = this.getMbLayerIds();
     for (let i = 0; i < layerIds.length; i++) {
-      // @ts-expect-error
       const mbLayer = mbMap.getLayer(layerIds[i]);
-      if (mbLayer && mbLayer.sourceLayer !== tiledSourceMeta.layerName) {
+      if (mbLayer && mbLayer['source-layer'] !== tiledSourceMeta.layerName) {
         // If the source-pointer of one of the layers is stale, they will all be stale.
         // In this case, all the mb-layers need to be removed and re-added.
         return true;
@@ -191,7 +192,7 @@ export class TiledVectorLayer extends VectorLayer {
     return false;
   }
 
-  syncLayerWithMB(mbMap: unknown) {
+  syncLayerWithMB(mbMap: MbMap) {
     this._removeStaleMbSourcesAndLayers(mbMap);
     this._syncSourceBindingWithMb(mbMap);
     this._syncStylePropertiesWithMb(mbMap);
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts
deleted file mode 100644
index fa614ae87b290..0000000000000
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts
+++ /dev/null
@@ -1,85 +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;
- * you may not use this file except in compliance with the Elastic License.
- */
-/* eslint-disable @typescript-eslint/consistent-type-definitions */
-
-import { Feature, GeoJsonProperties } from 'geojson';
-import { AbstractLayer } from '../layer';
-import { IVectorSource } from '../../sources/vector_source';
-import {
-  MapFilters,
-  VectorLayerDescriptor,
-  VectorSourceRequestMeta,
-} from '../../../../common/descriptor_types';
-import { ILayer } from '../layer';
-import { IJoin } from '../../joins/join';
-import { IVectorStyle } from '../../styles/vector/vector_style';
-import { IField } from '../../fields/field';
-import { DataRequestContext } from '../../../actions';
-import { ITooltipProperty } from '../../tooltips/tooltip_property';
-
-export type VectorLayerArguments = {
-  source: IVectorSource;
-  joins?: IJoin[];
-  layerDescriptor: VectorLayerDescriptor;
-};
-
-export interface IVectorLayer extends ILayer {
-  getFields(): Promise<IField[]>;
-  getStyleEditorFields(): Promise<IField[]>;
-  getJoins(): IJoin[];
-  getValidJoins(): IJoin[];
-  getSource(): IVectorSource;
-  getFeatureById(id: string | number): Feature | null;
-  getPropertiesForTooltip(properties: GeoJsonProperties): Promise<ITooltipProperty[]>;
-  hasJoins(): boolean;
-}
-
-export class VectorLayer extends AbstractLayer implements IVectorLayer {
-  static type: string;
-
-  protected readonly _style: IVectorStyle;
-  static createDescriptor(
-    options: Partial<VectorLayerDescriptor>,
-    mapColors?: string[]
-  ): VectorLayerDescriptor;
-
-  constructor(options: VectorLayerArguments);
-  getLayerTypeIconName(): string;
-  getFields(): Promise<IField[]>;
-  getStyleEditorFields(): Promise<IField[]>;
-  getJoins(): IJoin[];
-  getValidJoins(): IJoin[];
-  _syncSourceStyleMeta(
-    syncContext: DataRequestContext,
-    source: IVectorSource,
-    style: IVectorStyle
-  ): Promise<void>;
-  _syncSourceFormatters(
-    syncContext: DataRequestContext,
-    source: IVectorSource,
-    style: IVectorStyle
-  ): Promise<void>;
-  syncLayerWithMB(mbMap: unknown): void;
-  _getSearchFilters(
-    dataFilters: MapFilters,
-    source: IVectorSource,
-    style: IVectorStyle
-  ): VectorSourceRequestMeta;
-  _syncData(
-    syncContext: DataRequestContext,
-    source: IVectorSource,
-    style: IVectorStyle
-  ): Promise<void>;
-  ownsMbSourceId(sourceId: string): boolean;
-  ownsMbLayerId(sourceId: string): boolean;
-  _setMbPointsProperties(mbMap: unknown, mvtSourceLayer?: string): void;
-  _setMbLinePolygonProperties(mbMap: unknown, mvtSourceLayer?: string): void;
-  getSource(): IVectorSource;
-  getFeatureById(id: string | number): Feature | null;
-  getPropertiesForTooltip(properties: GeoJsonProperties): Promise<ITooltipProperty[]>;
-  hasJoins(): boolean;
-  isFittable(): Promise<boolean>;
-}
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.js b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
similarity index 78%
rename from x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.js
rename to x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
index 27c344b713a60..a2532d4e7b10e 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.js
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
@@ -5,8 +5,13 @@
  */
 
 import React from 'react';
+import { Map as MbMap, Layer as MbLayer, GeoJSONSource as MbGeoJSONSource } from 'mapbox-gl';
+import { Feature, FeatureCollection, GeoJsonProperties } from 'geojson';
+import _ from 'lodash';
+import { EuiIcon } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { AbstractLayer } from '../layer';
-import { VectorStyle } from '../../styles/vector/vector_style';
+import { IVectorStyle, VectorStyle } from '../../styles/vector/vector_style';
 import {
   FEATURE_ID_PROPERTY_NAME,
   SOURCE_DATA_REQUEST_ID,
@@ -20,11 +25,9 @@ import {
   FIELD_ORIGIN,
   LAYER_STYLE_TYPE,
   KBN_TOO_MANY_FEATURES_IMAGE_ID,
+  FieldFormatter,
 } from '../../../../common/constants';
-import _ from 'lodash';
 import { JoinTooltipProperty } from '../../tooltips/join_tooltip_property';
-import { EuiIcon } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
 import { DataRequestAbortError } from '../../util/data_request';
 import {
   canSkipSourceUpdate,
@@ -39,15 +42,66 @@ import {
   getPointFilterExpression,
 } from '../../util/mb_filter_expressions';
 
+import {
+  DynamicStylePropertyOptions,
+  MapFilters,
+  MapQuery,
+  VectorLayerDescriptor,
+  VectorSourceRequestMeta,
+  VectorStyleRequestMeta,
+} from '../../../../common/descriptor_types';
+import { IVectorSource } from '../../sources/vector_source';
+import { CustomIconAndTooltipContent, ILayer } from '../layer';
+import { IJoin, PropertiesMap } from '../../joins/join';
+import { IField } from '../../fields/field';
+import { DataRequestContext } from '../../../actions';
+import { ITooltipProperty } from '../../tooltips/tooltip_property';
+import { IDynamicStyleProperty } from '../../styles/vector/properties/dynamic_style_property';
+import { IESSource } from '../../sources/es_source';
+
+interface SourceResult {
+  refreshed: boolean;
+  featureCollection?: FeatureCollection;
+}
+
+interface JoinState {
+  dataHasChanged: boolean;
+  join: IJoin;
+  propertiesMap?: PropertiesMap;
+}
+
+export interface VectorLayerArguments {
+  source: IVectorSource;
+  joins?: IJoin[];
+  layerDescriptor: VectorLayerDescriptor;
+}
+
+export interface IVectorLayer extends ILayer {
+  getFields(): Promise<IField[]>;
+  getStyleEditorFields(): Promise<IField[]>;
+  getJoins(): IJoin[];
+  getValidJoins(): IJoin[];
+  getSource(): IVectorSource;
+  getFeatureById(id: string | number): Feature | null;
+  getPropertiesForTooltip(properties: GeoJsonProperties): Promise<ITooltipProperty[]>;
+  hasJoins(): boolean;
+}
+
 export class VectorLayer extends AbstractLayer {
   static type = LAYER_TYPE.VECTOR;
 
-  static createDescriptor(options, mapColors) {
+  protected readonly _style: IVectorStyle;
+  private readonly _joins: IJoin[];
+
+  static createDescriptor(
+    options: Partial<VectorLayerDescriptor>,
+    mapColors?: string[]
+  ): VectorLayerDescriptor {
     const layerDescriptor = super.createDescriptor(options);
     layerDescriptor.type = VectorLayer.type;
 
     if (!options.style) {
-      const styleProperties = VectorStyle.createDefaultStyleProperties(mapColors);
+      const styleProperties = VectorStyle.createDefaultStyleProperties(mapColors ? mapColors : []);
       layerDescriptor.style = VectorStyle.createDescriptor(styleProperties);
     }
 
@@ -55,16 +109,31 @@ export class VectorLayer extends AbstractLayer {
       layerDescriptor.joins = [];
     }
 
-    return layerDescriptor;
+    return layerDescriptor as VectorLayerDescriptor;
   }
 
-  constructor({ layerDescriptor, source, joins = [] }) {
-    super({ layerDescriptor, source });
+  constructor({ layerDescriptor, source, joins = [] }: VectorLayerArguments) {
+    super({
+      layerDescriptor,
+      source,
+    });
     this._joins = joins;
-    this._style = new VectorStyle(this._descriptor.style, source, this);
+    this._style = new VectorStyle(layerDescriptor.style, source, this);
+  }
+
+  getSource(): IVectorSource {
+    return super.getSource() as IVectorSource;
+  }
+
+  getStyleForEditing(): IVectorStyle {
+    return this._style;
+  }
+
+  getStyle(): IVectorStyle {
+    return this._style;
   }
 
-  getStyle() {
+  getCurrentStyle(): IVectorStyle {
     return this._style;
   }
 
@@ -108,7 +177,7 @@ export class VectorLayer extends AbstractLayer {
     return true;
   }
 
-  getCustomIconAndTooltipContent() {
+  getCustomIconAndTooltipContent(): CustomIconAndTooltipContent {
     const featureCollection = this._getSourceFeatureCollection();
 
     const noResultsIcon = <EuiIcon size="m" color="subdued" type="minusInCircle" />;
@@ -124,7 +193,7 @@ export class VectorLayer extends AbstractLayer {
     if (
       this.getJoins().length &&
       !featureCollection.features.some(
-        (feature) => feature.properties[FEATURE_VISIBLE_PROPERTY_NAME]
+        (feature) => feature.properties?.[FEATURE_VISIBLE_PROPERTY_NAME]
       )
     ) {
       return {
@@ -141,8 +210,8 @@ export class VectorLayer extends AbstractLayer {
     );
     return {
       icon: this.getCurrentStyle().getIcon(),
-      tooltipContent: tooltipContent,
-      areResultsTrimmed: areResultsTrimmed,
+      tooltipContent,
+      areResultsTrimmed,
     };
   }
 
@@ -158,7 +227,12 @@ export class VectorLayer extends AbstractLayer {
     return this.getCurrentStyle().renderLegendDetails();
   }
 
-  async getBounds({ startLoading, stopLoading, registerCancelCallback, dataFilters }) {
+  async getBounds({
+    startLoading,
+    stopLoading,
+    registerCancelCallback,
+    dataFilters,
+  }: DataRequestContext) {
     const isStaticLayer = !this.getSource().isBoundsAware();
     if (isStaticLayer || this.hasJoins()) {
       return getFeatureCollectionBounds(this._getSourceFeatureCollection(), this.hasJoins());
@@ -190,7 +264,7 @@ export class VectorLayer extends AbstractLayer {
     } finally {
       // Use stopLoading callback instead of onLoadError callback.
       // Function is loading bounds and not feature data.
-      stopLoading(SOURCE_BOUNDS_DATA_REQUEST_ID, requestToken, bounds, boundsFilters);
+      stopLoading(SOURCE_BOUNDS_DATA_REQUEST_ID, requestToken, bounds ? bounds : {}, boundsFilters);
     }
     return bounds;
   }
@@ -205,7 +279,7 @@ export class VectorLayer extends AbstractLayer {
   }
 
   _getJoinFields() {
-    const joinFields = [];
+    const joinFields: IField[] = [];
     this.getValidJoins().forEach((join) => {
       const fields = join.getJoinFields();
       joinFields.push(...fields);
@@ -219,7 +293,7 @@ export class VectorLayer extends AbstractLayer {
   }
 
   async getStyleEditorFields() {
-    const sourceFields = await this.getSourceForEditing().getFields();
+    const sourceFields = await (this.getSourceForEditing() as IVectorSource).getFields();
     return [...sourceFields, ...this._getJoinFields()];
   }
 
@@ -246,7 +320,7 @@ export class VectorLayer extends AbstractLayer {
     onLoadError,
     registerCancelCallback,
     dataFilters,
-  }) {
+  }: { join: IJoin } & DataRequestContext): Promise<JoinState> {
     const joinSource = join.getRightJoinSource();
     const sourceDataId = join.getSourceDataRequestId();
     const requestToken = Symbol(`layer-join-refresh:${this.getId()} - ${sourceDataId}`);
@@ -266,15 +340,15 @@ export class VectorLayer extends AbstractLayer {
     if (canSkipFetch) {
       return {
         dataHasChanged: false,
-        join: join,
-        propertiesMap: prevDataRequest.getData(),
+        join,
+        propertiesMap: prevDataRequest?.getData() as PropertiesMap,
       };
     }
 
     try {
       startLoading(sourceDataId, requestToken, searchFilters);
       const leftSourceName = await this._source.getDisplayName();
-      const { propertiesMap } = await joinSource.getPropertiesMap(
+      const propertiesMap = await joinSource.getPropertiesMap(
         searchFilters,
         leftSourceName,
         join.getLeftField().getName(),
@@ -283,8 +357,8 @@ export class VectorLayer extends AbstractLayer {
       stopLoading(sourceDataId, requestToken, propertiesMap);
       return {
         dataHasChanged: true,
-        join: join,
-        propertiesMap: propertiesMap,
+        join,
+        propertiesMap,
       };
     } catch (e) {
       if (!(e instanceof DataRequestAbortError)) {
@@ -292,13 +366,12 @@ export class VectorLayer extends AbstractLayer {
       }
       return {
         dataHasChanged: true,
-        join: join,
-        propertiesMap: null,
+        join,
       };
     }
   }
 
-  async _syncJoins(syncContext, style) {
+  async _syncJoins(syncContext: DataRequestContext, style: IVectorStyle) {
     const joinSyncs = this.getValidJoins().map(async (join) => {
       await this._syncJoinStyleMeta(syncContext, join, style);
       await this._syncJoinFormatters(syncContext, join, style);
@@ -308,28 +381,37 @@ export class VectorLayer extends AbstractLayer {
     return await Promise.all(joinSyncs);
   }
 
-  _getSearchFilters(dataFilters, source, style) {
+  _getSearchFilters(
+    dataFilters: MapFilters,
+    source: IVectorSource,
+    style: IVectorStyle
+  ): VectorSourceRequestMeta {
     const fieldNames = [
       ...source.getFieldNames(),
       ...(style.getType() === LAYER_STYLE_TYPE.VECTOR ? style.getSourceFieldNames() : []),
       ...this.getValidJoins().map((join) => join.getLeftField().getName()),
     ];
 
+    const sourceQuery = this.getQuery() as MapQuery;
     return {
       ...dataFilters,
       fieldNames: _.uniq(fieldNames).sort(),
       geogridPrecision: source.getGeoGridPrecision(dataFilters.zoom),
-      sourceQuery: this.getQuery(),
+      sourceQuery: sourceQuery ? sourceQuery : undefined,
       applyGlobalQuery: source.getApplyGlobalQuery(),
       sourceMeta: source.getSyncMeta(),
     };
   }
 
-  async _performInnerJoins(sourceResult, joinStates, updateSourceData) {
-    //should update the store if
-    //-- source result was refreshed
-    //-- any of the join configurations changed (joinState changed)
-    //-- visibility of any of the features has changed
+  async _performInnerJoins(
+    sourceResult: SourceResult,
+    joinStates: JoinState[],
+    updateSourceData: DataRequestContext['updateSourceData']
+  ) {
+    // should update the store if
+    // -- source result was refreshed
+    // -- any of the join configurations changed (joinState changed)
+    // -- visibility of any of the features has changed
 
     let shouldUpdateStore =
       sourceResult.refreshed || joinStates.some((joinState) => joinState.dataHasChanged);
@@ -338,8 +420,11 @@ export class VectorLayer extends AbstractLayer {
       return;
     }
 
-    for (let i = 0; i < sourceResult.featureCollection.features.length; i++) {
-      const feature = sourceResult.featureCollection.features[i];
+    for (let i = 0; i < sourceResult.featureCollection!.features.length; i++) {
+      const feature = sourceResult.featureCollection!.features[i];
+      if (!feature.properties) {
+        feature.properties = {};
+      }
       const oldVisbility = feature.properties[FEATURE_VISIBLE_PROPERTY_NAME];
       let isFeatureVisible = true;
       for (let j = 0; j < joinStates.length; j++) {
@@ -364,7 +449,11 @@ export class VectorLayer extends AbstractLayer {
     }
   }
 
-  async _syncSource(syncContext, source, style) {
+  async _syncSource(
+    syncContext: DataRequestContext,
+    source: IVectorSource,
+    style: IVectorStyle
+  ): Promise<SourceResult> {
     const {
       startLoading,
       stopLoading,
@@ -385,7 +474,9 @@ export class VectorLayer extends AbstractLayer {
     if (canSkipFetch) {
       return {
         refreshed: false,
-        featureCollection: prevDataRequest.getData(),
+        featureCollection: prevDataRequest
+          ? (prevDataRequest.getData() as FeatureCollection)
+          : EMPTY_FEATURE_COLLECTION,
       };
     }
 
@@ -416,15 +507,20 @@ export class VectorLayer extends AbstractLayer {
     }
   }
 
-  async _syncSourceStyleMeta(syncContext, source, style) {
+  async _syncSourceStyleMeta(
+    syncContext: DataRequestContext,
+    source: IVectorSource,
+    style: IVectorStyle
+  ) {
     if (this.getCurrentStyle().getType() !== LAYER_STYLE_TYPE.VECTOR) {
       return;
     }
 
+    const sourceQuery = this.getQuery() as MapQuery;
     return this._syncStyleMeta({
       source,
       style,
-      sourceQuery: this.getQuery(),
+      sourceQuery: sourceQuery ? sourceQuery : undefined,
       dataRequestId: SOURCE_META_DATA_REQUEST_ID,
       dynamicStyleProps: style.getDynamicPropertiesArray().filter((dynamicStyleProp) => {
         return (
@@ -436,7 +532,7 @@ export class VectorLayer extends AbstractLayer {
     });
   }
 
-  async _syncJoinStyleMeta(syncContext, join, style) {
+  async _syncJoinStyleMeta(syncContext: DataRequestContext, join: IJoin, style: IVectorStyle) {
     const joinSource = join.getRightJoinSource();
     return this._syncStyleMeta({
       source: joinSource,
@@ -446,9 +542,7 @@ export class VectorLayer extends AbstractLayer {
       dynamicStyleProps: this.getCurrentStyle()
         .getDynamicPropertiesArray()
         .filter((dynamicStyleProp) => {
-          const matchingField = joinSource.getMetricFieldForName(
-            dynamicStyleProp.getField().getName()
-          );
+          const matchingField = joinSource.getMetricFieldForName(dynamicStyleProp.getFieldName());
           return (
             dynamicStyleProp.getFieldOrigin() === FIELD_ORIGIN.JOIN &&
             !!matchingField &&
@@ -470,13 +564,19 @@ export class VectorLayer extends AbstractLayer {
     stopLoading,
     onLoadError,
     registerCancelCallback,
-  }) {
+  }: {
+    dataRequestId: string;
+    dynamicStyleProps: Array<IDynamicStyleProperty<DynamicStylePropertyOptions>>;
+    source: IVectorSource;
+    sourceQuery?: MapQuery;
+    style: IVectorStyle;
+  } & DataRequestContext) {
     if (!source.isESSource() || dynamicStyleProps.length === 0) {
       return;
     }
 
     const dynamicStyleFields = dynamicStyleProps.map((dynamicStyleProp) => {
-      return `${dynamicStyleProp.getField().getName()}${dynamicStyleProp.getNumberOfCategories()}`;
+      return `${dynamicStyleProp.getFieldName()}${dynamicStyleProp.getNumberOfCategories()}`;
     });
 
     const nextMeta = {
@@ -484,7 +584,7 @@ export class VectorLayer extends AbstractLayer {
       sourceQuery,
       isTimeAware: this.getCurrentStyle().isTimeAware() && (await source.isTimeAware()),
       timeFilters: dataFilters.timeFilters,
-    };
+    } as VectorStyleRequestMeta;
     const prevDataRequest = this.getDataRequest(dataRequestId);
     const canSkipFetch = canSkipStyleMetaUpdate({ prevDataRequest, nextMeta });
     if (canSkipFetch) {
@@ -496,14 +596,14 @@ export class VectorLayer extends AbstractLayer {
       startLoading(dataRequestId, requestToken, nextMeta);
       const layerName = await this.getDisplayName(source);
 
-      //todo: cast source to ESSource when migrating to TS
-      const styleMeta = await source.loadStylePropsMeta(
+      const styleMeta = await (source as IESSource).loadStylePropsMeta({
         layerName,
         style,
         dynamicStyleProps,
-        registerCancelCallback.bind(null, requestToken),
-        nextMeta
-      );
+        registerCancelCallback: registerCancelCallback.bind(null, requestToken),
+        sourceQuery: nextMeta.sourceQuery,
+        timeFilters: nextMeta.timeFilters,
+      });
       stopLoading(dataRequestId, requestToken, styleMeta, nextMeta);
     } catch (error) {
       if (!(error instanceof DataRequestAbortError)) {
@@ -512,7 +612,11 @@ export class VectorLayer extends AbstractLayer {
     }
   }
 
-  async _syncSourceFormatters(syncContext, source, style) {
+  async _syncSourceFormatters(
+    syncContext: DataRequestContext,
+    source: IVectorSource,
+    style: IVectorStyle
+  ) {
     if (style.getType() !== LAYER_STYLE_TYPE.VECTOR) {
       return;
     }
@@ -526,13 +630,13 @@ export class VectorLayer extends AbstractLayer {
           return dynamicStyleProp.getFieldOrigin() === FIELD_ORIGIN.SOURCE;
         })
         .map((dynamicStyleProp) => {
-          return dynamicStyleProp.getField();
+          return dynamicStyleProp.getField()!;
         }),
       ...syncContext,
     });
   }
 
-  async _syncJoinFormatters(syncContext, join, style) {
+  async _syncJoinFormatters(syncContext: DataRequestContext, join: IJoin, style: IVectorStyle) {
     const joinSource = join.getRightJoinSource();
     return this._syncFormatters({
       source: joinSource,
@@ -540,19 +644,28 @@ export class VectorLayer extends AbstractLayer {
       fields: style
         .getDynamicPropertiesArray()
         .filter((dynamicStyleProp) => {
-          const matchingField = joinSource.getMetricFieldForName(
-            dynamicStyleProp.getField().getName()
-          );
+          const matchingField = joinSource.getMetricFieldForName(dynamicStyleProp.getFieldName());
           return dynamicStyleProp.getFieldOrigin() === FIELD_ORIGIN.JOIN && !!matchingField;
         })
         .map((dynamicStyleProp) => {
-          return dynamicStyleProp.getField();
+          return dynamicStyleProp.getField()!;
         }),
       ...syncContext,
     });
   }
 
-  async _syncFormatters({ source, dataRequestId, fields, startLoading, stopLoading, onLoadError }) {
+  async _syncFormatters({
+    source,
+    dataRequestId,
+    fields,
+    startLoading,
+    stopLoading,
+    onLoadError,
+  }: {
+    dataRequestId: string;
+    fields: IField[];
+    source: IVectorSource;
+  } & DataRequestContext) {
     if (fields.length === 0) {
       return;
     }
@@ -573,7 +686,7 @@ export class VectorLayer extends AbstractLayer {
     try {
       startLoading(dataRequestId, requestToken, nextMeta);
 
-      const formatters = {};
+      const formatters: { [key: string]: FieldFormatter | null } = {};
       const promises = fields
         .filter((field) => {
           return field.canValueBeFormatted();
@@ -589,7 +702,7 @@ export class VectorLayer extends AbstractLayer {
     }
   }
 
-  async syncData(syncContext) {
+  async syncData(syncContext: DataRequestContext) {
     await this._syncData(syncContext, this.getSource(), this.getCurrentStyle());
   }
 
@@ -603,7 +716,7 @@ export class VectorLayer extends AbstractLayer {
   // Given 1 above, which source/style to use can not be stored in Layer instance state.
   // Given 2 above, which source/style to use can not be pulled from data request state.
   // Therefore, source and style are provided as arugments and must be used instead of calling getSource or getCurrentStyle.
-  async _syncData(syncContext, source, style) {
+  async _syncData(syncContext: DataRequestContext, source: IVectorSource, style: IVectorStyle) {
     if (this.isLoadingBounds()) {
       return;
     }
@@ -624,11 +737,11 @@ export class VectorLayer extends AbstractLayer {
 
   _getSourceFeatureCollection() {
     const sourceDataRequest = this.getSourceDataRequest();
-    return sourceDataRequest ? sourceDataRequest.getData() : null;
+    return sourceDataRequest ? (sourceDataRequest.getData() as FeatureCollection) : null;
   }
 
-  _syncFeatureCollectionWithMb(mbMap) {
-    const mbGeoJSONSource = mbMap.getSource(this.getId());
+  _syncFeatureCollectionWithMb(mbMap: MbMap) {
+    const mbGeoJSONSource = mbMap.getSource(this.getId()) as MbGeoJSONSource;
     const featureCollection = this._getSourceFeatureCollection();
     const featureCollectionOnMap = AbstractLayer.getBoundDataForSource(mbMap, this.getId());
 
@@ -653,7 +766,7 @@ export class VectorLayer extends AbstractLayer {
     }
   }
 
-  _setMbPointsProperties(mbMap, mvtSourceLayer) {
+  _setMbPointsProperties(mbMap: MbMap, mvtSourceLayer?: string) {
     const pointLayerId = this._getMbPointLayerId();
     const symbolLayerId = this._getMbSymbolLayerId();
     const pointLayer = mbMap.getLayer(pointLayerId);
@@ -689,12 +802,12 @@ export class VectorLayer extends AbstractLayer {
     }
   }
 
-  _setMbCircleProperties(mbMap, mvtSourceLayer) {
+  _setMbCircleProperties(mbMap: MbMap, mvtSourceLayer?: string) {
     const sourceId = this.getId();
     const pointLayerId = this._getMbPointLayerId();
     const pointLayer = mbMap.getLayer(pointLayerId);
     if (!pointLayer) {
-      const mbLayer = {
+      const mbLayer: MbLayer = {
         id: pointLayerId,
         type: 'circle',
         source: sourceId,
@@ -710,7 +823,7 @@ export class VectorLayer extends AbstractLayer {
     const textLayerId = this._getMbTextLayerId();
     const textLayer = mbMap.getLayer(textLayerId);
     if (!textLayer) {
-      const mbLayer = {
+      const mbLayer: MbLayer = {
         id: textLayerId,
         type: 'symbol',
         source: sourceId,
@@ -740,13 +853,13 @@ export class VectorLayer extends AbstractLayer {
     });
   }
 
-  _setMbSymbolProperties(mbMap, mvtSourceLayer) {
+  _setMbSymbolProperties(mbMap: MbMap, mvtSourceLayer?: string) {
     const sourceId = this.getId();
     const symbolLayerId = this._getMbSymbolLayerId();
     const symbolLayer = mbMap.getLayer(symbolLayerId);
 
     if (!symbolLayer) {
-      const mbLayer = {
+      const mbLayer: MbLayer = {
         id: symbolLayerId,
         type: 'symbol',
         source: sourceId,
@@ -775,7 +888,7 @@ export class VectorLayer extends AbstractLayer {
     });
   }
 
-  _setMbLinePolygonProperties(mbMap, mvtSourceLayer) {
+  _setMbLinePolygonProperties(mbMap: MbMap, mvtSourceLayer?: string) {
     const sourceId = this.getId();
     const fillLayerId = this._getMbPolygonLayerId();
     const lineLayerId = this._getMbLineLayerId();
@@ -783,7 +896,7 @@ export class VectorLayer extends AbstractLayer {
 
     const hasJoins = this.hasJoins();
     if (!mbMap.getLayer(fillLayerId)) {
-      const mbLayer = {
+      const mbLayer: MbLayer = {
         id: fillLayerId,
         type: 'fill',
         source: sourceId,
@@ -795,7 +908,7 @@ export class VectorLayer extends AbstractLayer {
       mbMap.addLayer(mbLayer);
     }
     if (!mbMap.getLayer(lineLayerId)) {
-      const mbLayer = {
+      const mbLayer: MbLayer = {
         id: lineLayerId,
         type: 'line',
         source: sourceId,
@@ -807,7 +920,7 @@ export class VectorLayer extends AbstractLayer {
       mbMap.addLayer(mbLayer);
     }
     if (!mbMap.getLayer(tooManyFeaturesLayerId)) {
-      const mbLayer = {
+      const mbLayer: MbLayer = {
         id: tooManyFeaturesLayerId,
         type: 'fill',
         source: sourceId,
@@ -855,12 +968,12 @@ export class VectorLayer extends AbstractLayer {
     mbMap.setLayerZoomRange(tooManyFeaturesLayerId, this.getMinZoom(), this.getMaxZoom());
   }
 
-  _syncStylePropertiesWithMb(mbMap) {
+  _syncStylePropertiesWithMb(mbMap: MbMap) {
     this._setMbPointsProperties(mbMap);
     this._setMbLinePolygonProperties(mbMap);
   }
 
-  _syncSourceBindingWithMb(mbMap) {
+  _syncSourceBindingWithMb(mbMap: MbMap) {
     const mbSource = mbMap.getSource(this._getMbSourceId());
     if (!mbSource) {
       mbMap.addSource(this._getMbSourceId(), {
@@ -883,7 +996,7 @@ export class VectorLayer extends AbstractLayer {
     }
   }
 
-  syncLayerWithMB(mbMap) {
+  syncLayerWithMB(mbMap: MbMap) {
     this._syncSourceBindingWithMb(mbMap);
     this._syncFeatureCollectionWithMb(mbMap);
     this._syncStylePropertiesWithMb(mbMap);
@@ -924,15 +1037,15 @@ export class VectorLayer extends AbstractLayer {
     ];
   }
 
-  ownsMbLayerId(mbLayerId) {
+  ownsMbLayerId(mbLayerId: string) {
     return this.getMbLayerIds().includes(mbLayerId);
   }
 
-  ownsMbSourceId(mbSourceId) {
+  ownsMbSourceId(mbSourceId: string) {
     return this.getId() === mbSourceId;
   }
 
-  _addJoinsToSourceTooltips(tooltipsFromSource) {
+  _addJoinsToSourceTooltips(tooltipsFromSource: ITooltipProperty[]) {
     for (let i = 0; i < tooltipsFromSource.length; i++) {
       const tooltipProperty = tooltipsFromSource[i];
       const matchingJoins = [];
@@ -947,7 +1060,7 @@ export class VectorLayer extends AbstractLayer {
     }
   }
 
-  async getPropertiesForTooltip(properties) {
+  async getPropertiesForTooltip(properties: GeoJsonProperties) {
     const vectorSource = this.getSource();
     let allProperties = await vectorSource.getTooltipProperties(properties);
     this._addJoinsToSourceTooltips(allProperties);
@@ -961,18 +1074,20 @@ export class VectorLayer extends AbstractLayer {
 
   canShowTooltip() {
     return (
-      this.isVisible() && (this.getSource().canFormatFeatureProperties() || this.getJoins().length)
+      this.isVisible() &&
+      (this.getSource().canFormatFeatureProperties() || this.getJoins().length > 0)
     );
   }
 
-  getFeatureById(id) {
+  getFeatureById(id: string | number) {
     const featureCollection = this._getSourceFeatureCollection();
     if (!featureCollection) {
       return null;
     }
 
-    return featureCollection.features.find((feature) => {
-      return feature.properties[FEATURE_ID_PROPERTY_NAME] === id;
+    const targetFeature = featureCollection.features.find((feature) => {
+      return feature.properties?.[FEATURE_ID_PROPERTY_NAME] === id;
     });
+    return targetFeature ? targetFeature : null;
   }
 }
diff --git a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts
index be947d79f4e39..5c062f3419e28 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts
@@ -29,7 +29,7 @@ export interface IESAggSource extends IESSource {
   getValueAggsDsl(indexPattern: IndexPattern): { [key: string]: unknown };
 }
 
-export class AbstractESAggSource extends AbstractESSource {
+export abstract class AbstractESAggSource extends AbstractESSource {
   private readonly _metricFields: IESAggField[];
   private readonly _canReadFromGeoJson: boolean;
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.d.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.d.ts
index ada76b8e4e674..b221d13bb0f8a 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.d.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.d.ts
@@ -10,6 +10,7 @@ import {
   MapFilters,
   MapQuery,
   VectorSourceSyncMeta,
+  VectorSourceRequestMeta,
 } from '../../../../common/descriptor_types';
 import { GRID_RESOLUTION } from '../../../../common/constants';
 import { IField } from '../../fields/field';
@@ -35,13 +36,7 @@ export class ESGeoGridSource extends AbstractESAggSource implements ITiledSingle
   getLayerName(): string;
 
   getUrlTemplateWithMeta(
-    searchFilters: MapFilters & {
-      applyGlobalQuery: boolean;
-      fieldNames: string[];
-      geogridPrecision?: number;
-      sourceQuery: MapQuery;
-      sourceMeta: VectorSourceSyncMeta;
-    }
+    searchFilters: VectorSourceRequestMeta
   ): Promise<{
     layerName: string;
     urlTemplate: string;
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
index 189e7dea1b0c1..06df68283c434 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
@@ -160,7 +160,8 @@ describe('ESGeoGridSource', () => {
       const { data, meta } = await geogridSource.getGeoJsonWithMeta(
         'foobarLayer',
         vectorSourceRequestMeta,
-        () => {}
+        () => {},
+        () => true
       );
 
       expect(meta && meta.areResultsTrimmed).toEqual(false);
diff --git a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.d.ts b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.d.ts
index 01fde589dcb84..c11b6f0853cc7 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.d.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.d.ts
@@ -6,12 +6,14 @@
 
 import { AbstractVectorSource } from '../vector_source';
 import { IVectorSource } from '../vector_source';
+import { TimeRange } from '../../../../../../../src/plugins/data/common';
 import { IndexPattern, ISearchSource } from '../../../../../../../src/plugins/data/public';
 import {
   DynamicStylePropertyOptions,
+  MapQuery,
   VectorSourceRequestMeta,
 } from '../../../../common/descriptor_types';
-import { VectorStyle } from '../../styles/vector/vector_style';
+import { IVectorStyle } from '../../styles/vector/vector_style';
 import { IDynamicStyleProperty } from '../../styles/vector/properties/dynamic_style_property';
 
 export interface IESSource extends IVectorSource {
@@ -25,13 +27,21 @@ export interface IESSource extends IVectorSource {
     limit: number,
     initialSearchContext?: object
   ): Promise<ISearchSource>;
-  loadStylePropsMeta(
-    layerName: string,
-    style: VectorStyle,
-    dynamicStyleProps: Array<IDynamicStyleProperty<DynamicStylePropertyOptions>>,
-    registerCancelCallback: (requestToken: symbol, callback: () => void) => void,
-    searchFilters: VectorSourceRequestMeta
-  ): Promise<unknown>;
+  loadStylePropsMeta({
+    layerName,
+    style,
+    dynamicStyleProps,
+    registerCancelCallback,
+    sourceQuery,
+    timeFilters,
+  }: {
+    layerName: string;
+    style: IVectorStyle;
+    dynamicStyleProps: Array<IDynamicStyleProperty<DynamicStylePropertyOptions>>;
+    registerCancelCallback: (callback: () => void) => void;
+    sourceQuery?: MapQuery;
+    timeFilters: TimeRange;
+  }): Promise<object>;
 }
 
 export class AbstractESSource extends AbstractVectorSource implements IESSource {
@@ -45,13 +55,21 @@ export class AbstractESSource extends AbstractVectorSource implements IESSource
     limit: number,
     initialSearchContext?: object
   ): Promise<ISearchSource>;
-  loadStylePropsMeta(
-    layerName: string,
-    style: VectorStyle,
-    dynamicStyleProps: Array<IDynamicStyleProperty<DynamicStylePropertyOptions>>,
-    registerCancelCallback: (requestToken: symbol, callback: () => void) => void,
-    searchFilters: VectorSourceRequestMeta
-  ): Promise<unknown>;
+  loadStylePropsMeta({
+    layerName,
+    style,
+    dynamicStyleProps,
+    registerCancelCallback,
+    sourceQuery,
+    timeFilters,
+  }: {
+    layerName: string;
+    style: IVectorStyle;
+    dynamicStyleProps: Array<IDynamicStyleProperty<DynamicStylePropertyOptions>>;
+    registerCancelCallback: (callback: () => void) => void;
+    sourceQuery?: MapQuery;
+    timeFilters: TimeRange;
+  }): Promise<object>;
   _runEsQuery: ({
     requestId,
     requestName,
diff --git a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js
index ab56ceeab4e77..0c8cb5f514247 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js
@@ -284,13 +284,14 @@ export class AbstractESSource extends AbstractVectorSource {
     return indexPattern.getFormatterForField(fieldFromIndexPattern).getConverterFor('text');
   }
 
-  async loadStylePropsMeta(
+  async loadStylePropsMeta({
     layerName,
     style,
     dynamicStyleProps,
     registerCancelCallback,
-    searchFilters
-  ) {
+    sourceQuery,
+    timeFilters,
+  }) {
     const promises = dynamicStyleProps.map((dynamicStyleProp) => {
       return dynamicStyleProp.getFieldMetaRequest();
     });
@@ -307,13 +308,11 @@ export class AbstractESSource extends AbstractVectorSource {
     searchSource.setField('index', indexPattern);
     searchSource.setField('size', 0);
     searchSource.setField('aggs', aggs);
-    if (searchFilters.sourceQuery) {
-      searchSource.setField('query', searchFilters.sourceQuery);
+    if (sourceQuery) {
+      searchSource.setField('query', sourceQuery);
     }
     if (style.isTimeAware() && (await this.isTimeAware())) {
-      searchSource.setField('filter', [
-        getTimeFilter().createFilter(indexPattern, searchFilters.timeFilters),
-      ]);
+      searchSource.setField('filter', [getTimeFilter().createFilter(indexPattern, timeFilters)]);
     }
 
     const resp = await this._runEsQuery({
diff --git a/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.d.ts b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.d.ts
index 248ca2b9212b4..ef1ada8da8289 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.d.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.d.ts
@@ -4,10 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { MapQuery, VectorJoinSourceRequestMeta } from '../../../../common/descriptor_types';
 import { IField } from '../../fields/field';
 import { IESAggSource } from '../es_agg_source';
+import { PropertiesMap } from '../../joins/join';
 
 export interface IESTermSource extends IESAggSource {
-  getTermField(): IField;
-  hasCompleteConfig(): boolean;
+  getTermField: () => IField;
+  hasCompleteConfig: () => boolean;
+  getWhereQuery: () => MapQuery;
+  getPropertiesMap: (
+    searchFilters: VectorJoinSourceRequestMeta,
+    leftSourceName: string,
+    leftFieldName: string,
+    registerCancelCallback: (callback: () => void) => void
+  ) => PropertiesMap;
 }
diff --git a/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.js b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.js
index 359d22d2c44ce..ff52dccdd2ef4 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.js
@@ -119,9 +119,7 @@ export class ESTermSource extends AbstractESAggSource {
     });
 
     const countPropertyName = this.getAggKey(AGG_TYPE.COUNT);
-    return {
-      propertiesMap: extractPropertiesMap(rawEsData, countPropertyName),
-    };
+    return extractPropertiesMap(rawEsData, countPropertyName);
   }
 
   isFilterByMapBounds() {
diff --git a/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/kibana_regionmap_source.js b/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/kibana_regionmap_source.js
index eeb34ed672221..d937edb4ed362 100644
--- a/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/kibana_regionmap_source.js
+++ b/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/kibana_regionmap_source.js
@@ -74,6 +74,7 @@ export class KibanaRegionmapSource extends AbstractVectorSource {
     });
     return {
       data: featureCollection,
+      meta: {},
     };
   }
 
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
index 3e515613b3fd0..440f0cb4457e8 100644
--- a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
@@ -179,7 +179,7 @@ export class MVTSingleLayerVectorSource
 
   getBoundsForFilters(
     boundsFilters: BoundsFilters,
-    registerCancelCallback: (requestToken: symbol, callback: () => void) => void
+    registerCancelCallback: (callback: () => void) => void
   ): MapExtent | null {
     return null;
   }
@@ -192,6 +192,18 @@ export class MVTSingleLayerVectorSource
     return false;
   }
 
+  isBoundsAware() {
+    return false;
+  }
+
+  getSourceTooltipContent() {
+    return { tooltipContent: null, areResultsTrimmed: false };
+  }
+
+  async getLeftJoinFields() {
+    return [];
+  }
+
   async getTooltipProperties(
     properties: GeoJsonProperties,
     featureId?: string | number
diff --git a/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.d.ts b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.d.ts
index a481e273bc33e..7bf1db43c2871 100644
--- a/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.d.ts
+++ b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.d.ts
@@ -19,6 +19,12 @@ import {
 } from '../../../../common/descriptor_types';
 import { VECTOR_SHAPE_TYPE } from '../../../../common/constants';
 import { ITooltipProperty } from '../../tooltips/tooltip_property';
+import { DataRequest } from '../../util/data_request';
+
+export interface SourceTooltipConfig {
+  tooltipContent: string | null;
+  areResultsTrimmed: boolean;
+}
 
 export type GeoJsonFetchMeta = ESSearchSourceResponseMeta;
 
@@ -30,8 +36,8 @@ export type GeoJsonWithMeta = {
 export type BoundsFilters = {
   applyGlobalQuery: boolean;
   filters: Filter[];
-  query: MapQuery;
-  sourceQuery: MapQuery;
+  query?: MapQuery;
+  sourceQuery?: MapQuery;
   timeFilters: TimeRange;
 };
 
@@ -39,44 +45,52 @@ export interface IVectorSource extends ISource {
   getTooltipProperties(properties: GeoJsonProperties): Promise<ITooltipProperty[]>;
   getBoundsForFilters(
     boundsFilters: BoundsFilters,
-    registerCancelCallback: (requestToken: symbol, callback: () => void) => void
+    registerCancelCallback: (callback: () => void) => void
   ): MapExtent | null;
   getGeoJsonWithMeta(
-    layerName: 'string',
+    layerName: string,
     searchFilters: MapFilters,
-    registerCancelCallback: (callback: () => void) => void
+    registerCancelCallback: (callback: () => void) => void,
+    isRequestStillActive: () => boolean
   ): Promise<GeoJsonWithMeta>;
 
   getFields(): Promise<IField[]>;
   getFieldByName(fieldName: string): IField | null;
+  getLeftJoinFields(): Promise<IField[]>;
   getSyncMeta(): VectorSourceSyncMeta;
   getFieldNames(): string[];
   getApplyGlobalQuery(): boolean;
   createField({ fieldName }: { fieldName: string }): IField;
   canFormatFeatureProperties(): boolean;
   getSupportedShapeTypes(): Promise<VECTOR_SHAPE_TYPE[]>;
+  isBoundsAware(): boolean;
+  getSourceTooltipContent(sourceDataRequest?: DataRequest): SourceTooltipConfig;
 }
 
 export class AbstractVectorSource extends AbstractSource implements IVectorSource {
   getTooltipProperties(properties: GeoJsonProperties): Promise<ITooltipProperty[]>;
   getBoundsForFilters(
     boundsFilters: BoundsFilters,
-    registerCancelCallback: (requestToken: symbol, callback: () => void) => void
+    registerCancelCallback: (callback: () => void) => void
   ): MapExtent | null;
   getGeoJsonWithMeta(
     layerName: string,
     searchFilters: VectorSourceRequestMeta,
-    registerCancelCallback: (callback: () => void) => void
+    registerCancelCallback: (callback: () => void) => void,
+    isRequestStillActive: () => boolean
   ): Promise<GeoJsonWithMeta>;
 
   getFields(): Promise<IField[]>;
   getFieldByName(fieldName: string): IField | null;
+  getLeftJoinFields(): Promise<IField[]>;
   getSyncMeta(): VectorSourceSyncMeta;
   getSupportedShapeTypes(): Promise<VECTOR_SHAPE_TYPE[]>;
   canFormatFeatureProperties(): boolean;
   getApplyGlobalQuery(): boolean;
   getFieldNames(): string[];
   createField({ fieldName }: { fieldName: string }): IField;
+  isBoundsAware(): boolean;
+  getSourceTooltipContent(sourceDataRequest?: DataRequest): SourceTooltipConfig;
 }
 
 export interface ITiledSingleLayerVectorSource extends IVectorSource {
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx
index 1244c53afe9a6..5d0d9712ef988 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx
@@ -5,7 +5,7 @@
  */
 
 import _ from 'lodash';
-import React from 'react';
+import React, { ReactElement } from 'react';
 import { Map as MbMap, FeatureIdentifier } from 'mapbox-gl';
 import { FeatureCollection } from 'geojson';
 // @ts-expect-error
@@ -92,6 +92,55 @@ export interface IVectorStyle extends IStyle {
     mapColors: string[]
   ): { hasChanges: boolean; nextStyleDescriptor?: VectorStyleDescriptor };
   pluckStyleMetaFromSourceDataRequest(sourceDataRequest: DataRequest): Promise<StyleMetaDescriptor>;
+  isTimeAware: () => boolean;
+  getIcon: () => ReactElement<any>;
+  hasLegendDetails: () => Promise<boolean>;
+  renderLegendDetails: () => ReactElement<any>;
+  clearFeatureState: (featureCollection: FeatureCollection, mbMap: MbMap, sourceId: string) => void;
+  setFeatureStateAndStyleProps: (
+    featureCollection: FeatureCollection,
+    mbMap: MbMap,
+    mbSourceId: string
+  ) => boolean;
+  arePointsSymbolizedAsCircles: () => boolean;
+  setMBPaintProperties: ({
+    alpha,
+    mbMap,
+    fillLayerId,
+    lineLayerId,
+  }: {
+    alpha: number;
+    mbMap: MbMap;
+    fillLayerId: string;
+    lineLayerId: string;
+  }) => void;
+  setMBPaintPropertiesForPoints: ({
+    alpha,
+    mbMap,
+    pointLayerId,
+  }: {
+    alpha: number;
+    mbMap: MbMap;
+    pointLayerId: string;
+  }) => void;
+  setMBPropertiesForLabelText: ({
+    alpha,
+    mbMap,
+    textLayerId,
+  }: {
+    alpha: number;
+    mbMap: MbMap;
+    textLayerId: string;
+  }) => void;
+  setMBSymbolPropertiesForPoints: ({
+    mbMap,
+    symbolLayerId,
+    alpha,
+  }: {
+    alpha: number;
+    mbMap: MbMap;
+    symbolLayerId: string;
+  }) => void;
 }
 
 export class VectorStyle implements IVectorStyle {
@@ -594,12 +643,12 @@ export class VectorStyle implements IVectorStyle {
     mbSourceId: string
   ) {
     if (!featureCollection) {
-      return;
+      return false;
     }
 
     const dynamicStyleProps = this.getDynamicPropertiesArray();
     if (dynamicStyleProps.length === 0) {
-      return;
+      return false;
     }
 
     const tmpFeatureIdentifier: FeatureIdentifier = {
diff --git a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
index 6c6cb6ba143cd..24728465de3bd 100644
--- a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { AbstractLayer, ILayer } from '../../../../../../classes/layers/layer';
 import { AbstractSource, ISource } from '../../../../../../classes/sources/source';
-import { IStyle } from '../../../../../../classes/styles/style';
 
 import { TOCEntryActionsPopover } from './toc_entry_actions_popover';
 
@@ -17,28 +16,17 @@ let supportsFitToBounds: boolean;
 
 class MockSource extends AbstractSource implements ISource {}
 
-class MockStyle implements IStyle {
-  renderEditor() {
-    return null;
-  }
-
-  getType() {
-    return 'mockStyle';
-  }
-}
-
 class LayerMock extends AbstractLayer implements ILayer {
   constructor() {
     const sourceDescriptor = {
       type: 'mySourceType',
     };
     const source = new MockSource(sourceDescriptor);
-    const style = new MockStyle();
     const layerDescriptor = {
       id: 'testLayer',
       sourceDescriptor,
     };
-    super({ layerDescriptor, source, style });
+    super({ layerDescriptor, source });
   }
 
   async supportsFitToBounds(): Promise<boolean> {
diff --git a/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts b/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts
index 1bab51e70a494..c501ad82954a3 100644
--- a/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts
+++ b/x-pack/plugins/security/public/management/roles/__fixtures__/kibana_features.ts
@@ -14,14 +14,15 @@ export const createFeature = (
     excludeFromBaseAll?: boolean;
     excludeFromBaseRead?: boolean;
     privileges?: KibanaFeatureConfig['privileges'];
+    category?: KibanaFeatureConfig['category'];
   }
 ) => {
-  const { excludeFromBaseAll, excludeFromBaseRead, privileges, ...rest } = config;
+  const { excludeFromBaseAll, excludeFromBaseRead, privileges, category, ...rest } = config;
   return new KibanaFeature({
     icon: 'discoverApp',
     navLinkId: 'discover',
     app: [],
-    category: { id: 'foo', label: 'foo' },
+    category: category ?? { id: 'foo', label: 'foo' },
     catalogue: [],
     privileges:
       privileges === null
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/__fixtures__/index.ts b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/__fixtures__/index.ts
index 9df50b198bde0..7cfa50f6204fb 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/__fixtures__/index.ts
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/__fixtures__/index.ts
@@ -6,30 +6,37 @@
 
 import { ReactWrapper } from 'enzyme';
 
-import {
-  EuiTableRow,
-  EuiCheckbox,
-  EuiCheckboxProps,
-  EuiButtonGroup,
-  EuiButtonGroupProps,
-} from '@elastic/eui';
+import { EuiCheckbox, EuiCheckboxProps, EuiButtonGroup, EuiButtonGroupProps } from '@elastic/eui';
 
 import { findTestSubject } from 'test_utils/find_test_subject';
+import { EuiAccordion } from '@elastic/eui';
 import { SubFeatureForm } from '../sub_feature_form';
 
 export function getDisplayedFeaturePrivileges(wrapper: ReactWrapper<any>) {
-  const allExpanderButtons = findTestSubject(wrapper, 'expandFeaturePrivilegeRow');
+  const categoryExpander = findTestSubject(wrapper, 'featureCategoryButton_foo');
+  categoryExpander.simulate('click');
+
+  const allExpanderButtons = findTestSubject(wrapper, 'featureTableCell');
   allExpanderButtons.forEach((button) => button.simulate('click'));
 
-  // each expanded row renders its own `EuiTableRow`, so there are 2 rows
-  // for each feature: one for the primary feature privilege, and one for the sub privilege form
-  const rows = wrapper.find(EuiTableRow);
+  const featurePrivilegeControls = wrapper
+    .find(EuiAccordion)
+    .filter('[data-test-subj="featurePrivilegeControls"]');
+
+  return featurePrivilegeControls.reduce((acc, featureControls) => {
+    const buttonGroup = featureControls
+      .find(EuiButtonGroup)
+      .filter('[data-test-subj="primaryFeaturePrivilegeControl"]');
+    const { name, idSelected } = buttonGroup.props();
+    expect(name).toBeDefined();
+    expect(idSelected).toBeDefined();
 
-  return rows.reduce((acc, row) => {
+    const featureId = name!.substr(`featurePrivilege_`.length);
+    const primaryFeaturePrivilege = idSelected!.substr(`${featureId}_`.length);
     const subFeaturePrivileges = [];
-    const subFeatureForm = row.find(SubFeatureForm);
+
+    const subFeatureForm = featureControls.find(SubFeatureForm);
     if (subFeatureForm.length > 0) {
-      const { featureId } = subFeatureForm.props();
       const independentPrivileges = (subFeatureForm.find(EuiCheckbox) as ReactWrapper<
         EuiCheckboxProps
       >).reduce((acc2, checkbox) => {
@@ -47,30 +54,15 @@ export function getDisplayedFeaturePrivileges(wrapper: ReactWrapper<any>) {
       }, [] as string[]);
 
       subFeaturePrivileges.push(...independentPrivileges, ...mutuallyExclusivePrivileges);
-
-      return {
-        ...acc,
-        [featureId]: {
-          ...acc[featureId],
-          subFeaturePrivileges,
-        },
-      };
-    } else {
-      const buttonGroup = row.find(EuiButtonGroup);
-      const { name, idSelected } = buttonGroup.props();
-      expect(name).toBeDefined();
-      expect(idSelected).toBeDefined();
-
-      const featureId = name!.substr(`featurePrivilege_`.length);
-      const primaryFeaturePrivilege = idSelected!.substr(`${featureId}_`.length);
-
-      return {
-        ...acc,
-        [featureId]: {
-          ...acc[featureId],
-          primaryFeaturePrivilege,
-        },
-      };
     }
+
+    return {
+      ...acc,
+      [featureId]: {
+        ...acc[featureId],
+        primaryFeaturePrivilege,
+        subFeaturePrivileges,
+      },
+    };
   }, {} as Record<string, { primaryFeaturePrivilege: string; subFeaturePrivileges: string[] }>);
 }
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/change_all_privileges.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/change_all_privileges.tsx
index 14375587c8497..426d9d7bf336b 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/change_all_privileges.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/change_all_privileges.tsx
@@ -6,7 +6,14 @@
 
 import './change_all_privileges.scss';
 
-import { EuiContextMenuItem, EuiContextMenuPanel, EuiLink, EuiPopover } from '@elastic/eui';
+import {
+  EuiContextMenuItem,
+  EuiContextMenuPanel,
+  EuiLink,
+  EuiPopover,
+  EuiIcon,
+  EuiText,
+} from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import _ from 'lodash';
 import React, { Component } from 'react';
@@ -34,10 +41,13 @@ export class ChangeAllPrivilegesControl extends Component<Props, State> {
         className={'secPrivilegeFeatureChangeAllLink'}
         data-test-subj="changeAllPrivilegesButton"
       >
-        <FormattedMessage
-          id="xpack.security.management.editRole.changeAllPrivilegesLink"
-          defaultMessage="(change all)"
-        />
+        <EuiText size="xs">
+          <FormattedMessage
+            id="xpack.security.management.editRole.changeAllPrivilegesLink"
+            defaultMessage="Bulk actions"
+          />{' '}
+          <EuiIcon size="s" type="arrowDown" />
+        </EuiText>
       </EuiLink>
     );
 
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.scss b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.scss
new file mode 100644
index 0000000000000..e5c026d317034
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.scss
@@ -0,0 +1,5 @@
+.subFeaturePrivilegeExpandedRegion {
+  background-color: $euiColorLightestShade;
+  padding-left: $euiSizeXXL;
+  padding-top: $euiSizeS;
+}
\ No newline at end of file
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx
index 02d692bf9f507..002b13609005a 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.test.tsx
@@ -13,7 +13,7 @@ import { createKibanaPrivileges } from '../../../../__fixtures__/kibana_privileg
 import { PrivilegeFormCalculator } from '../privilege_form_calculator';
 import { getDisplayedFeaturePrivileges } from './__fixtures__';
 import { findTestSubject } from 'test_utils/find_test_subject';
-import { FeatureTableExpandedRow } from './feature_table_expanded_row';
+import { EuiAccordion } from '@elastic/eui';
 
 const createRole = (kibana: Role['kibana'] = []): Role => {
   return {
@@ -86,18 +86,19 @@ describe('FeatureTable', () => {
         expect(displayedPrivileges).toEqual({
           excluded_from_base: {
             primaryFeaturePrivilege: 'none',
-            ...(canCustomizeSubFeaturePrivileges ? { subFeaturePrivileges: [] } : {}),
+            subFeaturePrivileges: [],
           },
           no_sub_features: {
             primaryFeaturePrivilege: 'none',
+            subFeaturePrivileges: [],
           },
           with_excluded_sub_features: {
             primaryFeaturePrivilege: 'none',
-            ...(canCustomizeSubFeaturePrivileges ? { subFeaturePrivileges: [] } : {}),
+            subFeaturePrivileges: [],
           },
           with_sub_features: {
             primaryFeaturePrivilege: 'none',
-            ...(canCustomizeSubFeaturePrivileges ? { subFeaturePrivileges: [] } : {}),
+            subFeaturePrivileges: [],
           },
         });
       });
@@ -125,14 +126,15 @@ describe('FeatureTable', () => {
         expect(displayedPrivileges).toEqual({
           excluded_from_base: {
             primaryFeaturePrivilege: 'none',
-            ...(canCustomizeSubFeaturePrivileges ? { subFeaturePrivileges: [] } : {}),
+            subFeaturePrivileges: [],
           },
           no_sub_features: {
             primaryFeaturePrivilege: 'all',
+            subFeaturePrivileges: [],
           },
           with_excluded_sub_features: {
             primaryFeaturePrivilege: 'all',
-            ...(canCustomizeSubFeaturePrivileges ? { subFeaturePrivileges: [] } : {}),
+            subFeaturePrivileges: [],
           },
           with_sub_features: {
             primaryFeaturePrivilege: 'all',
@@ -144,7 +146,7 @@ describe('FeatureTable', () => {
                     'cool_all',
                   ],
                 }
-              : {}),
+              : { subFeaturePrivileges: [] }),
           },
         });
       });
@@ -175,14 +177,15 @@ describe('FeatureTable', () => {
         expect(displayedPrivileges).toEqual({
           excluded_from_base: {
             primaryFeaturePrivilege: 'none',
-            ...(canCustomizeSubFeaturePrivileges ? { subFeaturePrivileges: [] } : {}),
+            subFeaturePrivileges: [],
           },
           no_sub_features: {
             primaryFeaturePrivilege: 'none',
+            subFeaturePrivileges: [],
           },
           with_excluded_sub_features: {
             primaryFeaturePrivilege: 'none',
-            ...(canCustomizeSubFeaturePrivileges ? { subFeaturePrivileges: [] } : {}),
+            subFeaturePrivileges: [],
           },
           with_sub_features: {
             primaryFeaturePrivilege: 'all',
@@ -194,7 +197,7 @@ describe('FeatureTable', () => {
                     'cool_all',
                   ],
                 }
-              : {}),
+              : { subFeaturePrivileges: [] }),
           },
         });
       });
@@ -279,6 +282,7 @@ describe('FeatureTable', () => {
       },
       no_sub_features: {
         primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
       },
       with_excluded_sub_features: {
         primaryFeaturePrivilege: 'none',
@@ -313,43 +317,18 @@ describe('FeatureTable', () => {
     });
 
     kibanaFeatures.forEach((feature) => {
-      const rowExpander = findTestSubject(wrapper, `expandFeaturePrivilegeRow-${feature.id}`);
+      const { arrowDisplay } = wrapper
+        .find(EuiAccordion)
+        .filter(`#featurePrivilegeControls_${feature.id}`)
+        .props();
       if (!feature.subFeatures || feature.subFeatures.length === 0) {
-        expect(rowExpander).toHaveLength(0);
+        expect(arrowDisplay).toEqual('none');
       } else {
-        expect(rowExpander).toHaveLength(1);
+        expect(arrowDisplay).toEqual('left');
       }
     });
   });
 
-  it('renders the <FeatureTableExpandedRow> when the row is expanded', () => {
-    const role = createRole([
-      {
-        spaces: ['*'],
-        base: ['read'],
-        feature: {},
-      },
-      {
-        spaces: ['foo'],
-        base: [],
-        feature: {},
-      },
-    ]);
-    const { wrapper } = setup({
-      role,
-      features: kibanaFeatures,
-      privilegeIndex: 1,
-      calculateDisplayedPrivileges: false,
-      canCustomizeSubFeaturePrivileges: true,
-    });
-
-    expect(wrapper.find(FeatureTableExpandedRow)).toHaveLength(0);
-
-    findTestSubject(wrapper, 'expandFeaturePrivilegeRow').first().simulate('click');
-
-    expect(wrapper.find(FeatureTableExpandedRow)).toHaveLength(1);
-  });
-
   it('renders with sub-feature privileges granted when primary feature privilege is "all"', () => {
     const role = createRole([
       {
@@ -679,6 +658,7 @@ describe('FeatureTable', () => {
       },
       no_sub_features: {
         primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
       },
       with_excluded_sub_features: {
         primaryFeaturePrivilege: 'none',
@@ -716,15 +696,19 @@ describe('FeatureTable', () => {
     expect(displayedPrivileges).toEqual({
       excluded_from_base: {
         primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
       },
       no_sub_features: {
         primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
       },
       with_excluded_sub_features: {
         primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
       },
       with_sub_features: {
         primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
       },
     });
   });
@@ -750,15 +734,19 @@ describe('FeatureTable', () => {
     expect(displayedPrivileges).toEqual({
       excluded_from_base: {
         primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
       },
       no_sub_features: {
         primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
       },
       with_excluded_sub_features: {
         primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
       },
       with_sub_features: {
         primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
       },
     });
   });
@@ -843,6 +831,7 @@ describe('FeatureTable', () => {
     expect(displayedPrivileges).toEqual({
       reserved_feature: {
         primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
       },
     });
   });
@@ -873,16 +862,79 @@ describe('FeatureTable', () => {
     expect(displayedPrivileges).toEqual({
       excluded_from_base: {
         primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
       },
       no_sub_features: {
         primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
       },
       with_excluded_sub_features: {
         primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
       },
       with_sub_features: {
         primaryFeaturePrivilege: 'none',
+        subFeaturePrivileges: [],
       },
     });
   });
+
+  it('renders features by category, indicating how many features are granted within', async () => {
+    const role = createRole([
+      {
+        spaces: ['foo'],
+        base: [],
+        feature: {
+          feature_1: ['all'],
+          feature_3: ['all'],
+          feature_4: ['all'],
+        },
+      },
+    ]);
+
+    const features = [
+      createFeature({
+        id: 'feature_1',
+        name: 'Feature1',
+        category: { id: 'foo', label: 'foo' },
+      }),
+      createFeature({
+        id: 'feature_2',
+        name: 'Feature2',
+        category: { id: 'foo', label: 'foo' },
+      }),
+      createFeature({
+        id: 'feature_3',
+        name: 'Feature3',
+        category: { id: 'bar', label: 'bar' },
+      }),
+      createFeature({
+        id: 'feature_4',
+        name: 'Feature4',
+        category: { id: 'bar', label: 'bar' },
+      }),
+    ];
+
+    const { wrapper } = setup({
+      role,
+      features,
+      privilegeIndex: 0,
+      calculateDisplayedPrivileges: false,
+      canCustomizeSubFeaturePrivileges: false,
+    });
+
+    const fooCategory = findTestSubject(wrapper, 'featureCategory_foo');
+    const barCategory = findTestSubject(wrapper, 'featureCategory_bar');
+
+    expect(fooCategory).toHaveLength(1);
+    expect(barCategory).toHaveLength(1);
+
+    expect(findTestSubject(fooCategory, 'categoryLabel').text()).toMatchInlineSnapshot(
+      `"1 / 2 features granted"`
+    );
+
+    expect(findTestSubject(barCategory, 'categoryLabel').text()).toMatchInlineSnapshot(
+      `"2 / 2 features granted"`
+    );
+  });
 });
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx
index 57e24f2838226..a07c2e1c14ac4 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/feature_table.tsx
@@ -5,24 +5,31 @@
  */
 
 import {
+  EuiAccordionProps,
   EuiButtonGroup,
   EuiIconTip,
-  EuiInMemoryTable,
   EuiText,
-  EuiButtonIcon,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiSpacer,
+  EuiCallOut,
+  EuiHorizontalRule,
+  EuiAccordion,
+  EuiIcon,
+  EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import React, { Component } from 'react';
+import React, { Component, ReactElement } from 'react';
+import { AppCategory } from 'kibana/public';
 import { Role } from '../../../../../../../common/model';
 import { ChangeAllPrivilegesControl } from './change_all_privileges';
 import { FeatureTableExpandedRow } from './feature_table_expanded_row';
 import { NO_PRIVILEGE_VALUE } from '../constants';
 import { PrivilegeFormCalculator } from '../privilege_form_calculator';
 import { FeatureTableCell } from '../feature_table_cell';
-import { KibanaPrivileges, SecuredFeature, KibanaPrivilege } from '../../../../model';
+import { KibanaPrivileges, SecuredFeature } from '../../../../model';
+import './feature_table.scss';
 
 interface Props {
   role: Role;
@@ -35,250 +42,296 @@ interface Props {
   disabled?: boolean;
 }
 
-interface State {
-  expandedFeatures: string[];
-}
-
-interface TableRow {
-  featureId: string;
-  feature: SecuredFeature;
-  inherited: KibanaPrivilege[];
-  effective: KibanaPrivilege[];
-  role: Role;
-}
-
-export class FeatureTable extends Component<Props, State> {
+export class FeatureTable extends Component<Props, {}> {
   public static defaultProps = {
     privilegeIndex: -1,
     showLocks: true,
   };
 
+  private featureCategories: Map<string, SecuredFeature[]> = new Map();
+
   constructor(props: Props) {
     super(props);
-    this.state = {
-      expandedFeatures: [],
-    };
+
+    // features are static for the lifetime of the page, so this is safe to do here in a non-reactive manner
+    props.kibanaPrivileges
+      .getSecuredFeatures()
+      .filter((feature) => feature.privileges != null || feature.reserved != null)
+      .forEach((feature) => {
+        if (!this.featureCategories.has(feature.category.id)) {
+          this.featureCategories.set(feature.category.id, []);
+        }
+        this.featureCategories.get(feature.category.id)!.push(feature);
+      });
   }
 
   public render() {
-    const { role, kibanaPrivileges } = this.props;
+    const basePrivileges = this.props.kibanaPrivileges.getBasePrivileges(
+      this.props.role.kibana[this.props.privilegeIndex]
+    );
 
-    const featurePrivileges = kibanaPrivileges
-      .getSecuredFeatures()
-      .filter((feature) => feature.privileges != null || feature.reserved != null);
+    const accordions: Array<{ order: number; element: ReactElement }> = [];
+    this.featureCategories.forEach((featuresInCategory) => {
+      const { category } = featuresInCategory[0];
 
-    const items: TableRow[] = featurePrivileges
-      .sort((feature1, feature2) => {
-        if (feature1.reserved && !feature2.reserved) {
-          return 1;
-        }
+      const featureCount = featuresInCategory.length;
+      const grantedCount = featuresInCategory.filter(
+        (feature) =>
+          this.props.privilegeCalculator.getEffectivePrimaryFeaturePrivilege(
+            feature.id,
+            this.props.privilegeIndex
+          ) != null
+      ).length;
+
+      const canExpandCategory = true; // featuresInCategory.length > 1;
+
+      const buttonContent = (
+        <EuiFlexGroup
+          data-test-subj={`featureCategoryButton_${category.id}`}
+          alignItems={'center'}
+          responsive={false}
+          gutterSize="m"
+        >
+          {category.euiIconType ? (
+            <EuiFlexItem grow={false}>
+              <EuiIcon size="m" type={category.euiIconType} />
+            </EuiFlexItem>
+          ) : null}
+          <EuiFlexItem grow={1}>
+            <EuiTitle size="xs">
+              <h4 className="eui-displayInlineBlock">{category.label}</h4>
+            </EuiTitle>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      );
 
-        if (feature2.reserved && !feature1.reserved) {
-          return -1;
+      const label: string = i18n.translate(
+        'xpack.security.management.editRole.featureTable.featureAccordionSwitchLabel',
+        {
+          defaultMessage:
+            '{grantedCount} / {featureCount} {featureCount, plural, one {feature} other {features}} granted',
+          values: {
+            grantedCount,
+            featureCount,
+          },
         }
+      );
+      const extraAction = (
+        <EuiText size="s" aria-hidden="true" color={'subdued'} data-test-subj="categoryLabel">
+          {label}
+        </EuiText>
+      );
 
-        return 0;
-      })
-      .map((feature) => {
-        return {
-          featureId: feature.id,
-          feature,
-          inherited: [],
-          effective: [],
-          role,
-        };
+      const helpText = this.getCategoryHelpText(category);
+
+      const accordion = (
+        <EuiAccordion
+          id={`featureCategory_${category.id}`}
+          data-test-subj={`featureCategory_${category.id}`}
+          key={category.id}
+          arrowDisplay={canExpandCategory ? 'left' : 'none'}
+          forceState={canExpandCategory ? undefined : 'closed'}
+          buttonContent={buttonContent}
+          extraAction={canExpandCategory ? extraAction : undefined}
+        >
+          <div>
+            <EuiSpacer size="s" />
+            {helpText && (
+              <>
+                <EuiCallOut iconType="iInCircle" size="s">
+                  {helpText}
+                </EuiCallOut>
+                <EuiSpacer size="s" />
+              </>
+            )}
+            <EuiFlexGroup direction="column" gutterSize="s">
+              {featuresInCategory.map((feature) => (
+                <EuiFlexItem key={feature.id}>
+                  {this.renderPrivilegeControlsForFeature(feature)}
+                </EuiFlexItem>
+              ))}
+            </EuiFlexGroup>
+          </div>
+        </EuiAccordion>
+      );
+
+      accordions.push({
+        order: category.order ?? Number.MAX_SAFE_INTEGER,
+        element: accordion,
       });
+    });
+
+    accordions.sort((a1, a2) => a1.order - a2.order);
 
     return (
-      <EuiInMemoryTable
-        responsive={false}
-        columns={this.getColumns()}
-        itemId={'featureId'}
-        itemIdToExpandedRowMap={this.state.expandedFeatures.reduce((acc, featureId) => {
-          return {
-            ...acc,
-            [featureId]: (
-              <FeatureTableExpandedRow
-                feature={featurePrivileges.find((f) => f.id === featureId)!}
-                privilegeIndex={this.props.privilegeIndex}
-                onChange={this.props.onChange}
-                privilegeCalculator={this.props.privilegeCalculator}
-                selectedFeaturePrivileges={
-                  this.props.role.kibana[this.props.privilegeIndex].feature[featureId] ?? []
-                }
-                disabled={this.props.disabled}
+      <div>
+        <EuiFlexGroup alignItems={'flexEnd'}>
+          <EuiFlexItem>
+            <EuiText size="xs">
+              <b>
+                {i18n.translate(
+                  'xpack.security.management.editRole.featureTable.featureVisibilityTitle',
+                  {
+                    defaultMessage: 'Customize feature privileges',
+                  }
+                )}
+              </b>
+            </EuiText>
+          </EuiFlexItem>
+          {!this.props.disabled && (
+            <EuiFlexItem grow={false}>
+              <ChangeAllPrivilegesControl
+                privileges={basePrivileges}
+                onChange={this.onChangeAllFeaturePrivileges}
               />
-            ),
-          };
-        }, {})}
-        items={items}
-      />
+            </EuiFlexItem>
+          )}
+        </EuiFlexGroup>
+        <EuiHorizontalRule margin={'m'} />
+        {accordions.flatMap((a, idx) => [
+          a.element,
+          <EuiHorizontalRule key={`accordion-hr-${idx}`} margin={'m'} />,
+        ])}
+      </div>
     );
   }
 
-  public onChange = (featureId: string) => (featurePrivilegeId: string) => {
-    const privilege = featurePrivilegeId.substr(`${featureId}_`.length);
-    if (privilege === NO_PRIVILEGE_VALUE) {
-      this.props.onChange(featureId, []);
-    } else {
-      this.props.onChange(featureId, [privilege]);
+  private renderPrivilegeControlsForFeature = (feature: SecuredFeature) => {
+    const renderFeatureMarkup = (
+      buttonContent: EuiAccordionProps['buttonContent'],
+      extraAction: EuiAccordionProps['extraAction'],
+      warningIcon: JSX.Element
+    ) => {
+      const { canCustomizeSubFeaturePrivileges } = this.props;
+      const hasSubFeaturePrivileges = feature.getSubFeaturePrivileges().length > 0;
+
+      return (
+        <EuiFlexGroup gutterSize="s" alignItems="center">
+          <EuiFlexItem grow={false}>{warningIcon}</EuiFlexItem>
+          <EuiFlexItem>
+            <EuiAccordion
+              id={`featurePrivilegeControls_${feature.id}`}
+              data-test-subj="featurePrivilegeControls"
+              buttonContent={buttonContent}
+              extraAction={extraAction}
+              forceState={
+                canCustomizeSubFeaturePrivileges && hasSubFeaturePrivileges ? undefined : 'closed'
+              }
+              arrowDisplay={
+                canCustomizeSubFeaturePrivileges && hasSubFeaturePrivileges ? 'left' : 'none'
+              }
+            >
+              <div className="subFeaturePrivilegeExpandedRegion">
+                <FeatureTableExpandedRow
+                  feature={feature}
+                  privilegeIndex={this.props.privilegeIndex}
+                  onChange={this.props.onChange}
+                  privilegeCalculator={this.props.privilegeCalculator}
+                  selectedFeaturePrivileges={
+                    this.props.role.kibana[this.props.privilegeIndex].feature[feature.id] ?? []
+                  }
+                  disabled={this.props.disabled}
+                />
+              </div>
+            </EuiAccordion>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      );
+    };
+
+    const primaryFeaturePrivileges = feature.getPrimaryFeaturePrivileges();
+
+    if (feature.reserved && primaryFeaturePrivileges.length === 0) {
+      const buttonContent = (
+        <>
+          {<EuiIcon type="empty" size="l" />} <FeatureTableCell feature={feature} />
+        </>
+      );
+
+      const extraAction = (
+        <EuiText size={'s'} data-test-subj="reservedFeatureDescription">
+          {feature.reserved.description}
+        </EuiText>
+      );
+
+      return renderFeatureMarkup(buttonContent, extraAction, <EuiIcon type="empty" />);
     }
-  };
 
-  private getColumns = () => {
-    const basePrivileges = this.props.kibanaPrivileges.getBasePrivileges(
-      this.props.role.kibana[this.props.privilegeIndex]
+    if (primaryFeaturePrivileges.length === 0) {
+      return null;
+    }
+
+    const selectedPrivilegeId = this.props.privilegeCalculator.getDisplayedPrimaryFeaturePrivilegeId(
+      feature.id,
+      this.props.privilegeIndex
     );
 
-    const columns = [];
-
-    if (this.props.canCustomizeSubFeaturePrivileges) {
-      columns.push({
-        width: '30px',
-        isExpander: true,
-        field: 'featureId',
-        name: '',
-        render: (featureId: string, record: TableRow) => {
-          const { feature } = record;
-          const hasSubFeaturePrivileges = feature.getSubFeaturePrivileges().length > 0;
-          if (!hasSubFeaturePrivileges) {
-            return null;
-          }
-          return (
-            <EuiButtonIcon
-              onClick={() => this.toggleExpandedFeature(featureId)}
-              data-test-subj={`expandFeaturePrivilegeRow expandFeaturePrivilegeRow-${featureId}`}
-              aria-label={this.state.expandedFeatures.includes(featureId) ? 'Collapse' : 'Expand'}
-              iconType={this.state.expandedFeatures.includes(featureId) ? 'arrowUp' : 'arrowDown'}
-            />
-          );
-        },
-      });
-    }
+    const options = primaryFeaturePrivileges.map((privilege) => {
+      return {
+        id: `${feature.id}_${privilege.id}`,
+        label: privilege.name,
+        isDisabled: this.props.disabled,
+      };
+    });
 
-    columns.push(
-      {
-        field: 'feature',
-        width: '200px',
-        name: i18n.translate(
-          'xpack.security.management.editRole.featureTable.enabledRoleFeaturesFeatureColumnTitle',
-          {
-            defaultMessage: 'Feature',
-          }
-        ),
-        render: (feature: SecuredFeature) => {
-          return <FeatureTableCell feature={feature} />;
-        },
-      },
-      {
-        field: 'privilege',
-        width: '200px',
-        name: (
-          <span>
+    options.push({
+      id: `${feature.id}_${NO_PRIVILEGE_VALUE}`,
+      label: 'None',
+      isDisabled: this.props.disabled,
+    });
+
+    let warningIcon = <EuiIconTip type="empty" content={null} />;
+    if (
+      this.props.privilegeCalculator.hasCustomizedSubFeaturePrivileges(
+        feature.id,
+        this.props.privilegeIndex
+      )
+    ) {
+      warningIcon = (
+        <EuiIconTip
+          type="alert"
+          content={
             <FormattedMessage
-              id="xpack.security.management.editRole.featureTable.enabledRoleFeaturesEnabledColumnTitle"
-              defaultMessage="Privilege"
+              id="xpack.security.management.editRole.featureTable.privilegeCustomizationTooltip"
+              defaultMessage="Feature has customized sub-feature privileges. Expand this row for more information."
             />
-            {!this.props.disabled && (
-              <ChangeAllPrivilegesControl
-                privileges={basePrivileges}
-                onChange={this.onChangeAllFeaturePrivileges}
-              />
-            )}
-          </span>
-        ),
-        mobileOptions: {
-          // Table isn't responsive, so skip rendering this for mobile. <ChangeAllPrivilegesControl /> isn't free...
-          header: false,
-        },
-        render: (roleEntry: Role, record: TableRow) => {
-          const { feature } = record;
-
-          const primaryFeaturePrivileges = feature.getPrimaryFeaturePrivileges();
-
-          if (feature.reserved && primaryFeaturePrivileges.length === 0) {
-            return (
-              <EuiText size={'s'} data-test-subj="reservedFeatureDescription">
-                {feature.reserved.description}
-              </EuiText>
-            );
           }
+        />
+      );
+    }
 
-          if (primaryFeaturePrivileges.length === 0) {
-            return null;
-          }
+    const { canCustomizeSubFeaturePrivileges } = this.props;
+    const hasSubFeaturePrivileges = feature.getSubFeaturePrivileges().length > 0;
 
-          const selectedPrivilegeId = this.props.privilegeCalculator.getDisplayedPrimaryFeaturePrivilegeId(
-            feature.id,
-            this.props.privilegeIndex
-          );
-
-          const options = primaryFeaturePrivileges.map((privilege) => {
-            return {
-              id: `${feature.id}_${privilege.id}`,
-              label: privilege.name,
-              isDisabled: this.props.disabled,
-            };
-          });
-
-          options.push({
-            id: `${feature.id}_${NO_PRIVILEGE_VALUE}`,
-            label: 'None',
-            isDisabled: this.props.disabled,
-          });
-
-          let warningIcon = <EuiIconTip type="empty" content={null} />;
-          if (
-            this.props.privilegeCalculator.hasCustomizedSubFeaturePrivileges(
-              feature.id,
-              this.props.privilegeIndex
-            )
-          ) {
-            warningIcon = (
-              <EuiIconTip
-                type="iInCircle"
-                content={
-                  <FormattedMessage
-                    id="xpack.security.management.editRole.featureTable.privilegeCustomizationTooltip"
-                    defaultMessage="Feature has customized sub-feature privileges. Expand this row for more information."
-                  />
-                }
-              />
-            );
-          }
+    const showAccordionArrow = canCustomizeSubFeaturePrivileges && hasSubFeaturePrivileges;
 
-          return (
-            <EuiFlexGroup alignItems="center" gutterSize="xs">
-              <EuiFlexItem grow={false}>{warningIcon}</EuiFlexItem>
-              <EuiFlexItem>
-                <EuiButtonGroup
-                  name={`featurePrivilege_${feature.id}`}
-                  data-test-subj={`primaryFeaturePrivilegeControl`}
-                  buttonSize="compressed"
-                  color={'primary'}
-                  isFullWidth={true}
-                  options={options}
-                  idSelected={`${feature.id}_${selectedPrivilegeId ?? NO_PRIVILEGE_VALUE}`}
-                  onChange={this.onChange(feature.id)}
-                />
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          );
-        },
-      }
+    const buttonContent = (
+      <>
+        {!showAccordionArrow && <EuiIcon type="empty" size="l" />}{' '}
+        <FeatureTableCell feature={feature} />
+      </>
     );
-    return columns;
+
+    const extraAction = (
+      <EuiButtonGroup
+        name={`featurePrivilege_${feature.id}`}
+        data-test-subj={`primaryFeaturePrivilegeControl`}
+        isFullWidth={true}
+        options={options}
+        idSelected={`${feature.id}_${selectedPrivilegeId ?? NO_PRIVILEGE_VALUE}`}
+        onChange={this.onChange(feature.id)}
+      />
+    );
+
+    return renderFeatureMarkup(buttonContent, extraAction, warningIcon);
   };
 
-  private toggleExpandedFeature = (featureId: string) => {
-    if (this.state.expandedFeatures.includes(featureId)) {
-      this.setState({
-        expandedFeatures: this.state.expandedFeatures.filter((ef) => ef !== featureId),
-      });
+  private onChange = (featureId: string) => (featurePrivilegeId: string) => {
+    const privilege = featurePrivilegeId.substr(`${featureId}_`.length);
+    if (privilege === NO_PRIVILEGE_VALUE) {
+      this.props.onChange(featureId, []);
     } else {
-      this.setState({
-        expandedFeatures: [...this.state.expandedFeatures, featureId],
-      });
+      this.props.onChange(featureId, [privilege]);
     }
   };
 
@@ -289,4 +342,16 @@ export class FeatureTable extends Component<Props, State> {
       this.props.onChangeAll([privilege]);
     }
   };
+
+  private getCategoryHelpText = (category: AppCategory) => {
+    if (category.id === 'management') {
+      return i18n.translate(
+        'xpack.security.management.editRole.featureTable.managementCategoryHelpText',
+        {
+          defaultMessage:
+            'Access to Stack Management is determined by both Elasticsearch and Kibana privileges, and cannot be explicitly disabled.',
+        }
+      );
+    }
+  };
 }
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.scss b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.scss
deleted file mode 100644
index a7f24c96a2821..0000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.secPrivilegeFeatureIcon {
-  flex-shrink: 0;
-  margin-right: $euiSizeS;
-}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.test.tsx
index 155e41baeba1e..1514677c82457 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.test.tsx
@@ -9,10 +9,10 @@ import { createFeature } from '../../../../__fixtures__/kibana_features';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { FeatureTableCell } from '.';
 import { SecuredFeature } from '../../../../model';
-import { EuiIcon, EuiIconTip } from '@elastic/eui';
+import { EuiIconTip } from '@elastic/eui';
 
 describe('FeatureTableCell', () => {
-  it('renders an icon and feature name', () => {
+  it('renders the feature name', () => {
     const feature = createFeature({
       id: 'test-feature',
       name: 'Test Feature',
@@ -23,13 +23,10 @@ describe('FeatureTableCell', () => {
     );
 
     expect(wrapper.text()).toMatchInlineSnapshot(`"Test Feature "`);
-    expect(wrapper.find(EuiIcon).props()).toMatchObject({
-      type: feature.icon,
-    });
     expect(wrapper.find(EuiIconTip)).toHaveLength(0);
   });
 
-  it('renders an icon and feature name with tooltip when configured', () => {
+  it('renders a feature name with tooltip when configured', () => {
     const feature = createFeature({
       id: 'test-feature',
       name: 'Test Feature',
@@ -41,9 +38,7 @@ describe('FeatureTableCell', () => {
     );
 
     expect(wrapper.text()).toMatchInlineSnapshot(`"Test Feature "`);
-    expect(wrapper.find(EuiIcon).first().props()).toMatchObject({
-      type: feature.icon,
-    });
+
     expect(wrapper.find(EuiIconTip).props().content).toMatchInlineSnapshot(`
       <EuiText>
         <p>
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.tsx
index 77445952f3d69..869be7f6a583a 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.tsx
@@ -4,10 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import './feature_table_cell.scss';
-
 import React from 'react';
-import { EuiText, EuiIconTip, EuiIcon, IconType } from '@elastic/eui';
+import { EuiText, EuiIconTip } from '@elastic/eui';
 import { SecuredFeature } from '../../../../model';
 
 interface Props {
@@ -35,8 +33,7 @@ export const FeatureTableCell = ({ feature }: Props) => {
   }
 
   return (
-    <span>
-      <EuiIcon size="m" type={feature.icon as IconType} className="secPrivilegeFeatureIcon" />
+    <span data-test-subj={`featureTableCell`}>
       {feature.name} {tooltipElement}
     </span>
   );
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx
index e0889d91d759a..aa37b95ba3f2a 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary.tsx
@@ -6,16 +6,9 @@
 
 import React, { useState, Fragment } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
-import {
-  EuiModal,
-  EuiButtonEmpty,
-  EuiOverlayMask,
-  EuiModalHeader,
-  EuiModalHeaderTitle,
-  EuiModalBody,
-  EuiModalFooter,
-  EuiButton,
-} from '@elastic/eui';
+import { EuiButtonEmpty, EuiOverlayMask, EuiButton } from '@elastic/eui';
+import { EuiFlyout } from '@elastic/eui';
+import { EuiFlyoutHeader, EuiTitle, EuiFlyoutBody, EuiFlyoutFooter } from '@elastic/eui';
 import { Space } from '../../../../../../../../spaces/common/model/space';
 import { Role } from '../../../../../../../common/model';
 import { PrivilegeSummaryTable } from './privilege_summary_table';
@@ -30,6 +23,9 @@ interface Props {
 export const PrivilegeSummary = (props: Props) => {
   const [isOpen, setIsOpen] = useState(false);
 
+  const numberOfPrivilegeDefinitions = props.role.kibana.length;
+  const flyoutSize = numberOfPrivilegeDefinitions > 5 ? 'l' : 'm';
+
   return (
     <Fragment>
       <EuiButtonEmpty onClick={() => setIsOpen(true)} data-test-subj="viewPrivilegeSummaryButton">
@@ -39,33 +35,35 @@ export const PrivilegeSummary = (props: Props) => {
         />
       </EuiButtonEmpty>
       {isOpen && (
-        <EuiOverlayMask>
-          <EuiModal onClose={() => setIsOpen(false)} maxWidth={false}>
-            <EuiModalHeader>
-              <EuiModalHeaderTitle>
-                <FormattedMessage
-                  id="xpack.security.management.editRole.privilegeSummary.modalHeaderTitle"
-                  defaultMessage="Privilege summary"
-                />
-              </EuiModalHeaderTitle>
-            </EuiModalHeader>
-            <EuiModalBody>
+        <EuiOverlayMask headerZindexLocation="below">
+          <EuiFlyout onClose={() => setIsOpen(false)} size={flyoutSize}>
+            <EuiFlyoutHeader>
+              <EuiTitle size="m">
+                <h2>
+                  <FormattedMessage
+                    id="xpack.security.management.editRole.privilegeSummary.modalHeaderTitle"
+                    defaultMessage="Privilege summary"
+                  />
+                </h2>
+              </EuiTitle>
+            </EuiFlyoutHeader>
+            <EuiFlyoutBody>
               <PrivilegeSummaryTable
                 role={props.role}
                 spaces={props.spaces}
                 kibanaPrivileges={props.kibanaPrivileges}
                 canCustomizeSubFeaturePrivileges={props.canCustomizeSubFeaturePrivileges}
               />
-            </EuiModalBody>
-            <EuiModalFooter>
+            </EuiFlyoutBody>
+            <EuiFlyoutFooter>
               <EuiButton onClick={() => setIsOpen(false)}>
                 <FormattedMessage
                   id="xpack.security.management.editRole.privilegeSummary.closeSummaryButtonText"
                   defaultMessage="Close"
                 />
               </EuiButton>
-            </EuiModalFooter>
-          </EuiModal>
+            </EuiFlyoutFooter>
+          </EuiFlyout>
         </EuiOverlayMask>
       )}
     </Fragment>
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx
index 4b5169de3dfc3..8d24c0b220863 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/privilege_summary_table.tsx
@@ -4,14 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useState } from 'react';
+import React, { useMemo, useState, Fragment } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
+  EuiFlexGroup,
+  EuiFlexItem,
   EuiInMemoryTable,
   EuiBasicTableColumn,
   EuiButtonIcon,
   EuiIcon,
   EuiIconTip,
+  EuiSpacer,
+  EuiAccordion,
+  EuiTitle,
 } from '@elastic/eui';
 import { Space } from '../../../../../../../../spaces/common/model/space';
 import { Role, RoleKibanaPrivilege } from '../../../../../../../common/model';
@@ -39,6 +44,22 @@ function getColumnKey(entry: RoleKibanaPrivilege) {
 export const PrivilegeSummaryTable = (props: Props) => {
   const [expandedFeatures, setExpandedFeatures] = useState<string[]>([]);
 
+  const featureCategories = useMemo(() => {
+    const featureCategoryMap = new Map<string, SecuredFeature[]>();
+
+    props.kibanaPrivileges
+      .getSecuredFeatures()
+      .filter((feature) => feature.privileges != null || feature.reserved != null)
+      .forEach((feature) => {
+        if (!featureCategoryMap.has(feature.category.id)) {
+          featureCategoryMap.set(feature.category.id, []);
+        }
+        featureCategoryMap.get(feature.category.id)!.push(feature);
+      });
+
+    return featureCategoryMap;
+  }, [props.kibanaPrivileges]);
+
   const calculator = new PrivilegeSummaryCalculator(props.kibanaPrivileges, props.role);
 
   const toggleExpandedFeature = (featureId: string) => {
@@ -140,35 +161,80 @@ export const PrivilegeSummaryTable = (props: Props) => {
     };
   }, {} as Record<string, EffectiveFeaturePrivileges>);
 
-  const items = props.kibanaPrivileges.getSecuredFeatures().map((feature) => {
-    return {
-      feature,
-      featureId: feature.id,
-      ...privileges,
-    };
+  const accordions: any[] = [];
+
+  featureCategories.forEach((featuresInCategory) => {
+    const { category } = featuresInCategory[0];
+
+    const buttonContent = (
+      <EuiFlexGroup
+        data-test-subj={`featureCategoryButton_${category.id}`}
+        alignItems={'center'}
+        responsive={false}
+        gutterSize="m"
+      >
+        {category.euiIconType ? (
+          <EuiFlexItem grow={false}>
+            <EuiIcon size="m" type={category.euiIconType} />
+          </EuiFlexItem>
+        ) : null}
+        <EuiFlexItem grow={1}>
+          <EuiTitle size="xs">
+            <h4 className="eui-displayInlineBlock">{category.label}</h4>
+          </EuiTitle>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    );
+
+    const categoryItems = featuresInCategory.map((feature) => {
+      return {
+        feature,
+        featureId: feature.id,
+        ...privileges,
+      };
+    });
+
+    accordions.push(
+      <EuiAccordion
+        id={`privilegeSummaryFeatureCategory_${category.id}`}
+        data-test-subj={`privilegeSummaryFeatureCategory_${category.id}`}
+        key={category.id}
+        buttonContent={buttonContent}
+        initialIsOpen={true}
+      >
+        <EuiInMemoryTable
+          columns={columns}
+          items={categoryItems}
+          itemId="featureId"
+          rowProps={(record) => {
+            return {
+              'data-test-subj': `summaryTableRow-${record.featureId}`,
+            };
+          }}
+          itemIdToExpandedRowMap={expandedFeatures.reduce((acc, featureId) => {
+            return {
+              ...acc,
+              [featureId]: (
+                <PrivilegeSummaryExpandedRow
+                  feature={props.kibanaPrivileges.getSecuredFeature(featureId)}
+                  effectiveFeaturePrivileges={Object.values(privileges).map((p) => p[featureId])}
+                />
+              ),
+            };
+          }, {})}
+        />
+      </EuiAccordion>
+    );
   });
 
   return (
-    <EuiInMemoryTable
-      columns={columns}
-      items={items}
-      itemId="featureId"
-      rowProps={(record) => {
-        return {
-          'data-test-subj': `summaryTableRow-${record.featureId}`,
-        };
-      }}
-      itemIdToExpandedRowMap={expandedFeatures.reduce((acc, featureId) => {
-        return {
-          ...acc,
-          [featureId]: (
-            <PrivilegeSummaryExpandedRow
-              feature={props.kibanaPrivileges.getSecuredFeature(featureId)}
-              effectiveFeaturePrivileges={Object.values(privileges).map((p) => p[featureId])}
-            />
-          ),
-        };
-      }, {})}
-    />
+    <>
+      {accordions.map((a, idx) => (
+        <Fragment key={idx}>
+          {a}
+          <EuiSpacer />
+        </Fragment>
+      ))}
+    </>
   );
 };
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx
index b691056528498..3c9d1789fa5ab 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.test.tsx
@@ -43,7 +43,7 @@ const spaces = [
 ];
 
 describe('SpaceColumnHeader', () => {
-  it('renders the Global privilege definition with a special label and popover control', () => {
+  it('renders the Global privilege definition with a special label', () => {
     const wrapper = mountWithIntl(
       <SpaceColumnHeader
         spaces={spaces}
@@ -55,10 +55,9 @@ describe('SpaceColumnHeader', () => {
       />
     );
 
-    expect(wrapper.find(SpacesPopoverList)).toHaveLength(1);
     // Snapshot includes space avatar (The first "G"), followed by the "Global" label,
     // followed by the (all spaces) text as part of the SpacesPopoverList
-    expect(wrapper.text()).toMatchInlineSnapshot(`"G Global(all spaces)"`);
+    expect(wrapper.text()).toMatchInlineSnapshot(`"G All Spaces"`);
   });
 
   it('renders a placeholder space when the requested space no longer exists', () => {
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx
index 24ac0022b12af..a1641577dbb2f 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/privilege_summary/space_column_header.tsx
@@ -39,17 +39,7 @@ export const SpaceColumnHeader = (props: Props) => {
               <span>
                 <FormattedMessage
                   id="xpack.security.management.editRole.spacePrivilegeMatrix.globalSpaceName"
-                  defaultMessage="Global"
-                />
-                <br />
-                <SpacesPopoverList
-                  spaces={props.spaces.filter((s) => s.id !== '*')}
-                  buttonText={i18n.translate(
-                    'xpack.security.management.editRole.spacePrivilegeMatrix.showAllSpacesLink',
-                    {
-                      defaultMessage: '(all spaces)',
-                    }
-                  )}
+                  defaultMessage="All Spaces"
                 />
               </span>
             )}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx
index 32eed6c878016..e4dc0606ebf67 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.test.tsx
@@ -11,11 +11,11 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { PrivilegeSpaceForm } from './privilege_space_form';
 import React from 'react';
 import { Space } from '../../../../../../../../spaces/public';
-import { EuiSuperSelect } from '@elastic/eui';
 import { FeatureTable } from '../feature_table';
 import { getDisplayedFeaturePrivileges } from '../feature_table/__fixtures__';
 import { findTestSubject } from 'test_utils/find_test_subject';
 import { SpaceSelector } from './space_selector';
+import { EuiButtonGroup } from '@elastic/eui';
 
 const createRole = (kibana: Role['kibana'] = []): Role => {
   return {
@@ -59,7 +59,9 @@ describe('PrivilegeSpaceForm', () => {
       />
     );
 
-    expect(wrapper.find(EuiSuperSelect).props().valueOfSelected).toEqual(`basePrivilege_custom`);
+    expect(
+      wrapper.find(EuiButtonGroup).filter('[name="basePrivilegeButtonGroup"]').props().idSelected
+    ).toEqual(`basePrivilege_custom`);
     expect(wrapper.find(FeatureTable).props().disabled).toEqual(true);
     expect(getDisplayedFeaturePrivileges(wrapper)).toMatchInlineSnapshot(`
       Object {
@@ -69,6 +71,7 @@ describe('PrivilegeSpaceForm', () => {
         },
         "no_sub_features": Object {
           "primaryFeaturePrivilege": "none",
+          "subFeaturePrivileges": Array [],
         },
         "with_excluded_sub_features": Object {
           "primaryFeaturePrivilege": "none",
@@ -106,7 +109,9 @@ describe('PrivilegeSpaceForm', () => {
       />
     );
 
-    expect(wrapper.find(EuiSuperSelect).props().valueOfSelected).toEqual(`basePrivilege_all`);
+    expect(
+      wrapper.find(EuiButtonGroup).filter('[name="basePrivilegeButtonGroup"]').props().idSelected
+    ).toEqual(`basePrivilege_all`);
     expect(wrapper.find(FeatureTable).props().disabled).toEqual(true);
     expect(getDisplayedFeaturePrivileges(wrapper)).toMatchInlineSnapshot(`
       Object {
@@ -116,6 +121,7 @@ describe('PrivilegeSpaceForm', () => {
         },
         "no_sub_features": Object {
           "primaryFeaturePrivilege": "all",
+          "subFeaturePrivileges": Array [],
         },
         "with_excluded_sub_features": Object {
           "primaryFeaturePrivilege": "all",
@@ -159,7 +165,9 @@ describe('PrivilegeSpaceForm', () => {
       />
     );
 
-    expect(wrapper.find(EuiSuperSelect).props().valueOfSelected).toEqual(`basePrivilege_custom`);
+    expect(
+      wrapper.find(EuiButtonGroup).filter('[name="basePrivilegeButtonGroup"]').props().idSelected
+    ).toEqual(`basePrivilege_custom`);
     expect(wrapper.find(FeatureTable).props().disabled).toEqual(false);
     expect(getDisplayedFeaturePrivileges(wrapper)).toMatchInlineSnapshot(`
       Object {
@@ -169,6 +177,7 @@ describe('PrivilegeSpaceForm', () => {
         },
         "no_sub_features": Object {
           "primaryFeaturePrivilege": "none",
+          "subFeaturePrivileges": Array [],
         },
         "with_excluded_sub_features": Object {
           "primaryFeaturePrivilege": "none",
@@ -256,7 +265,10 @@ describe('PrivilegeSpaceForm', () => {
       />
     );
 
-    expect(wrapper.find(EuiSuperSelect).props().valueOfSelected).toEqual(`basePrivilege_custom`);
+    expect(
+      wrapper.find(EuiButtonGroup).filter('[name="basePrivilegeButtonGroup"]').props().idSelected
+    ).toEqual(`basePrivilege_custom`);
+
     expect(wrapper.find(FeatureTable).props().disabled).toEqual(false);
     expect(getDisplayedFeaturePrivileges(wrapper)).toMatchInlineSnapshot(`
       Object {
@@ -266,6 +278,7 @@ describe('PrivilegeSpaceForm', () => {
         },
         "no_sub_features": Object {
           "primaryFeaturePrivilege": "none",
+          "subFeaturePrivileges": Array [],
         },
         "with_excluded_sub_features": Object {
           "primaryFeaturePrivilege": "none",
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
index 6c43f2f7ea734..28bbd55c7d544 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_form.tsx
@@ -18,7 +18,6 @@ import {
   EuiFormRow,
   EuiOverlayMask,
   EuiSpacer,
-  EuiSuperSelect,
   EuiText,
   EuiTitle,
   EuiErrorBoundary,
@@ -26,6 +25,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component, Fragment } from 'react';
+import { EuiButtonGroup } from '@elastic/eui';
 import { Space } from '../../../../../../../../spaces/public';
 import { Role, copyRole } from '../../../../../../../common/model';
 import { SpaceSelector } from './space_selector';
@@ -95,7 +95,7 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
               <h2>
                 <FormattedMessage
                   id="xpack.security.management.editRole.spacePrivilegeForm.modalTitle"
-                  defaultMessage="Space privileges"
+                  defaultMessage="Kibana privileges"
                 />
               </h2>
             </EuiTitle>
@@ -164,6 +164,13 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
               defaultMessage: 'Spaces',
             }
           )}
+          helpText={i18n.translate(
+            'xpack.security.management.editRole.spacePrivilegeForm.spaceSelectorFormHelpText',
+            {
+              defaultMessage:
+                'Select one or more Kibana spaces to which you wish to assign privileges.',
+            }
+          )}
         >
           <SpaceSelector
             selectedSpaceIds={this.state.selectedSpaceIds}
@@ -179,104 +186,46 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
           label={i18n.translate(
             'xpack.security.management.editRole.spacePrivilegeForm.privilegeSelectorFormLabel',
             {
-              defaultMessage: 'Privilege',
+              defaultMessage: 'Privileges for all features',
+            }
+          )}
+          helpText={i18n.translate(
+            'xpack.security.management.editRole.spacePrivilegeForm.privilegeSelectorFormHelpText',
+            {
+              defaultMessage:
+                'Assign the privilege level you wish to grant to all present and future features across this space.',
             }
           )}
         >
-          <EuiSuperSelect
-            data-test-subj={'basePrivilegeComboBox'}
-            fullWidth
-            onChange={this.onSpaceBasePrivilegeChange}
+          <EuiButtonGroup
+            name={`basePrivilegeButtonGroup`}
+            data-test-subj={`basePrivilegeButtonGroup`}
+            isFullWidth={true}
+            color={'primary'}
             options={[
               {
-                value: 'basePrivilege_custom',
-                inputDisplay: (
-                  <EuiText>
-                    <FormattedMessage
-                      id="xpack.security.management.editRole.spacePrivilegeForm.customPrivilegeDisplay"
-                      defaultMessage="Custom"
-                    />
-                  </EuiText>
-                ),
-                dropdownDisplay: (
-                  <EuiText>
-                    <strong>
-                      <FormattedMessage
-                        id="xpack.security.management.editRole.spacePrivilegeForm.customPrivilegeDropdownDisplay"
-                        defaultMessage="Custom"
-                      />
-                    </strong>
-                    <p>
-                      <FormattedMessage
-                        id="xpack.security.management.editRole.spacePrivilegeForm.customPrivilegeDetails"
-                        defaultMessage="Customize access by feature in selected spaces."
-                      />
-                    </p>
-                  </EuiText>
-                ),
+                id: 'basePrivilege_all',
+                label: 'All',
+                ['data-test-subj']: 'basePrivilege_all',
               },
               {
-                value: 'basePrivilege_read',
-                inputDisplay: (
-                  <EuiText>
-                    <FormattedMessage
-                      id="xpack.security.management.editRole.spacePrivilegeForm.readPrivilegeDisplay"
-                      defaultMessage="Read"
-                    />
-                  </EuiText>
-                ),
-                dropdownDisplay: (
-                  <EuiText>
-                    <strong>
-                      <FormattedMessage
-                        id="xpack.security.management.editRole.spacePrivilegeForm.readPrivilegeDropdownDisplay"
-                        defaultMessage="Read"
-                      />
-                    </strong>
-                    <p>
-                      <FormattedMessage
-                        id="xpack.security.management.editRole.spacePrivilegeForm.readPrivilegeDetails"
-                        defaultMessage="Grant read-only access to all features in selected spaces."
-                      />
-                    </p>
-                  </EuiText>
-                ),
+                id: 'basePrivilege_read',
+                label: 'Read',
+                ['data-test-subj']: 'basePrivilege_read',
               },
               {
-                value: 'basePrivilege_all',
-                inputDisplay: (
-                  <EuiText>
-                    <FormattedMessage
-                      id="xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDisplay"
-                      defaultMessage="All"
-                    />
-                  </EuiText>
-                ),
-                dropdownDisplay: (
-                  <EuiText>
-                    <strong>
-                      <FormattedMessage
-                        id="xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDropdownDisplay"
-                        defaultMessage="All"
-                      />
-                    </strong>
-                    <p>
-                      <FormattedMessage
-                        id="xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDetails"
-                        defaultMessage="Grant full access to all features in selected spaces."
-                      />
-                    </p>
-                  </EuiText>
-                ),
+                id: 'basePrivilege_custom',
+                label: 'Customize',
+                ['data-test-subj']: 'basePrivilege_custom',
               },
             ]}
-            hasDividers
-            valueOfSelected={this.getDisplayedBasePrivilege()}
-            disabled={!hasSelectedSpaces}
+            idSelected={this.getDisplayedBasePrivilege()}
+            isDisabled={!hasSelectedSpaces}
+            onChange={this.onSpaceBasePrivilegeChange}
           />
         </EuiFormRow>
 
-        <EuiSpacer size="s" />
+        <EuiSpacer />
 
         <EuiTitle size="xxs">
           <h3>{this.getFeatureListLabel(this.state.selectedBasePrivilege.length > 0)}</h3>
@@ -338,7 +287,7 @@ export class PrivilegeSpaceForm extends Component<Props, State> {
           buttonText = (
             <FormattedMessage
               id="xpack.security.management.editRolespacePrivilegeForm.createPrivilegeButton"
-              defaultMessage="Create space privilege"
+              defaultMessage="Add Kibana privilege"
             />
           );
         }
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
index 64b7fe3e2e3a9..6bb9840fd343c 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
@@ -23,7 +23,6 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component } from 'react';
 import { Space, getSpaceColor } from '../../../../../../../../spaces/public';
 import { FeaturesPrivileges, Role, copyRole } from '../../../../../../../common/model';
-import { SpacesPopoverList } from '../../../spaces_popover_list';
 import { PrivilegeDisplay } from './privilege_display';
 import { isGlobalPrivilegeDefinition } from '../../../privilege_utils';
 import { PrivilegeFormCalculator } from '../privilege_form_calculator';
@@ -118,19 +117,7 @@ export class PrivilegeSpaceTable extends Component<Props, State> {
           const displayedSpaces = isExpanded ? spaces : spaces.slice(0, SPACES_DISPLAY_COUNT);
 
           let button = null;
-          if (record.isGlobal) {
-            button = (
-              <SpacesPopoverList
-                spaces={this.props.displaySpaces.filter((s) => s.id !== '*')}
-                buttonText={i18n.translate(
-                  'xpack.security.management.editRole.spacePrivilegeTable.showAllSpacesLink',
-                  {
-                    defaultMessage: 'show spaces',
-                  }
-                )}
-              />
-            );
-          } else if (spaces.length > displayedSpaces.length) {
+          if (spaces.length > displayedSpaces.length) {
             button = (
               <EuiButtonEmpty
                 size="xs"
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
index 734f7b1826723..442e95016c750 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/space_aware_privilege_section.tsx
@@ -50,7 +50,7 @@ export class SpaceAwarePrivilegeSection extends Component<Props, State> {
     name: i18n.translate(
       'xpack.security.management.editRole.spaceAwarePrivilegeForm.globalSpacesName',
       {
-        defaultMessage: '* Global (all spaces)',
+        defaultMessage: '* All Spaces',
       }
     ),
     color: '#D3DAE6',
@@ -198,7 +198,7 @@ export class SpaceAwarePrivilegeSection extends Component<Props, State> {
       >
         <FormattedMessage
           id="xpack.security.management.editRole.spacePrivilegeSection.addSpacePrivilegeButton"
-          defaultMessage="Add space privilege"
+          defaultMessage="Add Kibana privilege"
         />
       </EuiButton>
     );
diff --git a/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.test.ts b/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.test.ts
index 13a3fb96e10f7..ef1d9a99b0aeb 100644
--- a/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.test.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.test.ts
@@ -76,7 +76,7 @@ describe('When invoking Trusted Apps Schema', () => {
       os: 'windows',
       entries: [
         {
-          field: 'process.path.text',
+          field: 'process.executable.text',
           type: 'match',
           operator: 'included',
           value: 'c:/programs files/Anti-Virus',
@@ -204,7 +204,7 @@ describe('When invoking Trusted Apps Schema', () => {
             field: 'process.hash.*',
             value: 'A4370C0CF81686C0B696FA6261c9d3e0d810ae704ab8301839dffd5d5112f476',
           },
-          { field: 'process.path.text', value: '/tmp/dir1' },
+          { field: 'process.executable.text', value: '/tmp/dir1' },
         ].forEach((partialEntry) => {
           const bodyMsg3 = {
             ...getCreateTrustedAppItem(),
diff --git a/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts b/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts
index 912468b52adc0..25456115b3713 100644
--- a/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts
@@ -35,7 +35,7 @@ export const PostTrustedAppCreateRequestSchema = {
       schema.object({
         field: schema.oneOf([
           schema.literal('process.hash.*'),
-          schema.literal('process.path.text'),
+          schema.literal('process.executable.text'),
         ]),
         type: schema.literal('match'),
         operator: schema.literal('included'),
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts b/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts
index c0afe3b612d82..75e0347b10078 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts
@@ -33,7 +33,7 @@ export interface PostTrustedAppCreateResponse {
 }
 
 export interface MacosLinuxConditionEntry {
-  field: 'process.hash.*' | 'process.path.text';
+  field: 'process.hash.*' | 'process.executable.text';
   type: 'match';
   operator: 'included';
   value: string;
diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts
index 0503a9c327467..f673fca290a29 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts
@@ -6,7 +6,7 @@
 
 import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
 import { Ecs } from '../../../../ecs';
-import { CursorType, Inspect, Maybe } from '../../../common';
+import { CursorType, Inspect, Maybe, PageInfoPaginated } from '../../../common';
 import { TimelineRequestOptionsPaginated } from '../..';
 
 export interface TimelineEdges {
@@ -29,10 +29,7 @@ export interface TimelineNonEcsData {
 export interface TimelineEventsAllStrategyResponse extends IEsSearchResponse {
   edges: TimelineEdges[];
   totalCount: number;
-  pageInfo: {
-    activePage: number;
-    totalPages: number;
-  };
+  pageInfo: PageInfoPaginated;
   inspect?: Maybe<Inspect>;
 }
 
diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts
index 773ee60855886..6b96783adc25a 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts
@@ -14,7 +14,13 @@ import {
   TimelineEventsLastEventTimeRequestOptions,
   TimelineEventsLastEventTimeStrategyResponse,
 } from './events';
-import { DocValueFields, TimerangeInput, SortField } from '../common';
+import {
+  DocValueFields,
+  PaginationInput,
+  PaginationInputPaginated,
+  TimerangeInput,
+  SortField,
+} from '../common';
 
 export * from './events';
 
@@ -29,19 +35,13 @@ export interface TimelineRequestBasicOptions extends IEsSearchRequest {
 }
 
 export interface TimelineRequestOptions<Field = string> extends TimelineRequestBasicOptions {
-  pagination: {
-    activePage: number;
-    querySize: number;
-  };
+  pagination: PaginationInput;
   sort: SortField<Field>;
 }
 
 export interface TimelineRequestOptionsPaginated<Field = string>
   extends TimelineRequestBasicOptions {
-  pagination: {
-    activePage: number;
-    querySize: number;
-  };
+  pagination: PaginationInputPaginated;
   sort: SortField<Field>;
 }
 
diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_eql.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_eql.spec.ts
index e2ff51dd544a2..ca7832603f13d 100644
--- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_eql.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_eql.spec.ts
@@ -6,6 +6,14 @@
 
 import { eqlRule, indexPatterns } from '../objects/rule';
 
+import {
+  ALERT_RULE_METHOD,
+  ALERT_RULE_NAME,
+  ALERT_RULE_RISK_SCORE,
+  ALERT_RULE_SEVERITY,
+  ALERT_RULE_VERSION,
+  NUMBER_OF_ALERTS,
+} from '../screens/alerts';
 import {
   CUSTOM_RULES_BTN,
   RISK_SCORE,
@@ -59,9 +67,11 @@ import {
   fillDefineEqlRuleAndContinue,
   fillScheduleRuleAndContinue,
   selectEqlRuleType,
+  waitForTheRuleToBeExecuted,
 } from '../tasks/create_new_rule';
 import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver';
 import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
+import { refreshPage } from '../tasks/security_header';
 
 import { DETECTIONS_URL } from '../urls/navigation';
 
@@ -74,6 +84,7 @@ const expectedMitre = eqlRule.mitre
   })
   .join('');
 const expectedNumberOfRules = 1;
+const expectedNumberOfAlerts = 7;
 
 describe('Detection rules, EQL', () => {
   before(() => {
@@ -146,5 +157,19 @@ describe('Detection rules, EQL', () => {
         `${eqlRule.lookBack.interval}${eqlRule.lookBack.type}`
       );
     });
+
+    refreshPage();
+    waitForTheRuleToBeExecuted();
+
+    cy.get(NUMBER_OF_ALERTS)
+      .invoke('text')
+      .then((numberOfAlertsText) => {
+        cy.wrap(parseInt(numberOfAlertsText, 10)).should('eql', expectedNumberOfAlerts);
+      });
+    cy.get(ALERT_RULE_NAME).first().should('have.text', eqlRule.name);
+    cy.get(ALERT_RULE_VERSION).first().should('have.text', '1');
+    cy.get(ALERT_RULE_METHOD).first().should('have.text', 'eql');
+    cy.get(ALERT_RULE_SEVERITY).first().should('have.text', eqlRule.severity.toLowerCase());
+    cy.get(ALERT_RULE_RISK_SCORE).first().should('have.text', eqlRule.riskScore);
   });
 });
diff --git a/x-pack/plugins/security_solution/cypress/objects/rule.ts b/x-pack/plugins/security_solution/cypress/objects/rule.ts
index e84e2b7b1669f..f375eccd902c4 100644
--- a/x-pack/plugins/security_solution/cypress/objects/rule.ts
+++ b/x-pack/plugins/security_solution/cypress/objects/rule.ts
@@ -215,7 +215,7 @@ export const machineLearningRule: MachineLearningRule = {
 };
 
 export const eqlRule: CustomRule = {
-  customQuery: 'process where process_name == "explorer.exe"',
+  customQuery: 'any where process.name == "which"',
   name: 'New EQL Rule',
   description: 'New EQL rule description.',
   severity: 'High',
diff --git a/x-pack/plugins/security_solution/public/common/components/add_filter_to_global_search_bar/index.tsx b/x-pack/plugins/security_solution/public/common/components/add_filter_to_global_search_bar/index.tsx
index 8a294ec1b71fd..9f273b4f293ba 100644
--- a/x-pack/plugins/security_solution/public/common/components/add_filter_to_global_search_bar/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/add_filter_to_global_search_bar/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
-import React, { useCallback } from 'react';
+import React, { useCallback, useMemo } from 'react';
 
 import { Filter } from '../../../../../../../src/plugins/data/public';
 import { WithHoverActions } from '../with_hover_actions';
@@ -47,34 +47,36 @@ export const AddFilterToGlobalSearchBar = React.memo<OwnProps>(
       }
     }, [filterManager, filter, onFilterAdded]);
 
-    return (
-      <WithHoverActions
-        hoverContent={
-          <div data-test-subj="hover-actions-container">
-            <EuiToolTip content={i18n.FILTER_FOR_VALUE}>
-              <EuiButtonIcon
-                aria-label={i18n.FILTER_FOR_VALUE}
-                color="text"
-                data-test-subj="add-to-filter"
-                iconType="magnifyWithPlus"
-                onClick={filterForValue}
-              />
-            </EuiToolTip>
+    const HoverContent = useMemo(
+      () => (
+        <div data-test-subj="hover-actions-container">
+          <EuiToolTip content={i18n.FILTER_FOR_VALUE}>
+            <EuiButtonIcon
+              aria-label={i18n.FILTER_FOR_VALUE}
+              color="text"
+              data-test-subj="add-to-filter"
+              iconType="magnifyWithPlus"
+              onClick={filterForValue}
+            />
+          </EuiToolTip>
 
-            <EuiToolTip content={i18n.FILTER_OUT_VALUE}>
-              <EuiButtonIcon
-                aria-label={i18n.FILTER_OUT_VALUE}
-                color="text"
-                data-test-subj="filter-out-value"
-                iconType="magnifyWithMinus"
-                onClick={filterOutValue}
-              />
-            </EuiToolTip>
-          </div>
-        }
-        render={() => children}
-      />
+          <EuiToolTip content={i18n.FILTER_OUT_VALUE}>
+            <EuiButtonIcon
+              aria-label={i18n.FILTER_OUT_VALUE}
+              color="text"
+              data-test-subj="filter-out-value"
+              iconType="magnifyWithMinus"
+              onClick={filterOutValue}
+            />
+          </EuiToolTip>
+        </div>
+      ),
+      [filterForValue, filterOutValue]
     );
+
+    const render = useCallback(() => children, [children]);
+
+    return <WithHoverActions hoverContent={HoverContent} render={render} />;
   }
 );
 
diff --git a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx
index 74efe2d34fcca..4efb662a4aab6 100644
--- a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx
@@ -9,6 +9,7 @@ import React, { useCallback } from 'react';
 import { DropResult, DragDropContext } from 'react-beautiful-dnd';
 import { connect, ConnectedProps } from 'react-redux';
 import { Dispatch } from 'redux';
+import deepEqual from 'fast-deep-equal';
 
 import { BeforeCapture } from './drag_drop_context';
 import { BrowserFields } from '../../containers/source';
@@ -134,13 +135,11 @@ export const DragDropContextWrapperComponent = React.memo<Props & PropsFromRedux
       </DragDropContext>
     );
   },
-  (prevProps, nextProps) => {
-    return (
-      prevProps.children === nextProps.children &&
-      prevProps.dataProviders === nextProps.dataProviders &&
-      prevProps.activeTimelineDataProviders === nextProps.activeTimelineDataProviders
-    ); // prevent re-renders when data providers are added or removed, but all other props are the same
-  }
+  // prevent re-renders when data providers are added or removed, but all other props are the same
+  (prevProps, nextProps) =>
+    prevProps.children === nextProps.children &&
+    deepEqual(prevProps.dataProviders, nextProps.dataProviders) &&
+    prevProps.activeTimelineDataProviders === nextProps.activeTimelineDataProviders
 );
 
 DragDropContextWrapperComponent.displayName = 'DragDropContextWrapperComponent';
diff --git a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.tsx b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.tsx
index 64f6699d21dac..bd22811612a67 100644
--- a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.tsx
@@ -196,76 +196,93 @@ const DraggableWrapperComponent: React.FC<Props> = ({
     ]
   );
 
-  const renderContent = useCallback(
+  const RenderClone = useCallback(
+    (provided, snapshot) => (
+      <ConditionalPortal registerProvider={registerProvider}>
+        <div
+          {...provided.draggableProps}
+          {...provided.dragHandleProps}
+          style={getStyle(provided.draggableProps.style, snapshot)}
+          ref={provided.innerRef}
+          data-test-subj="providerContainer"
+        >
+          <ProviderContentWrapper
+            data-test-subj={`draggable-content-${dataProvider.queryMatch.field}`}
+          >
+            {render(dataProvider, provided, snapshot)}
+          </ProviderContentWrapper>
+        </div>
+      </ConditionalPortal>
+    ),
+    [dataProvider, registerProvider, render]
+  );
+
+  const DraggableContent = useCallback(
+    (provided, snapshot) => (
+      <ProviderContainer
+        {...provided.draggableProps}
+        {...provided.dragHandleProps}
+        ref={(e: HTMLDivElement) => {
+          provided.innerRef(e);
+          draggableRef.current = e;
+        }}
+        data-test-subj="providerContainer"
+        isDragging={snapshot.isDragging}
+        registerProvider={registerProvider}
+      >
+        {truncate && !snapshot.isDragging ? (
+          <TruncatableText data-test-subj="draggable-truncatable-content">
+            {render(dataProvider, provided, snapshot)}
+          </TruncatableText>
+        ) : (
+          <ProviderContentWrapper
+            data-test-subj={`draggable-content-${dataProvider.queryMatch.field}`}
+          >
+            {render(dataProvider, provided, snapshot)}
+          </ProviderContentWrapper>
+        )}
+      </ProviderContainer>
+    ),
+    [dataProvider, registerProvider, render, truncate]
+  );
+
+  const DroppableContent = useCallback(
+    (droppableProvided) => (
+      <div ref={droppableProvided.innerRef} {...droppableProvided.droppableProps}>
+        <Draggable
+          draggableId={getDraggableId(dataProvider.id)}
+          index={0}
+          key={getDraggableId(dataProvider.id)}
+          isDragDisabled={isDisabled}
+        >
+          {DraggableContent}
+        </Draggable>
+        {droppableProvided.placeholder}
+      </div>
+    ),
+    [DraggableContent, dataProvider.id, isDisabled]
+  );
+
+  const content = useMemo(
     () => (
       <Wrapper data-test-subj="draggableWrapperDiv" disabled={isDisabled}>
         <DragDropErrorBoundary>
           <Droppable
             isDropDisabled={true}
             droppableId={getDroppableId(dataProvider.id)}
-            renderClone={(provided, snapshot) => (
-              <ConditionalPortal registerProvider={registerProvider}>
-                <div
-                  {...provided.draggableProps}
-                  {...provided.dragHandleProps}
-                  style={getStyle(provided.draggableProps.style, snapshot)}
-                  ref={provided.innerRef}
-                  data-test-subj="providerContainer"
-                >
-                  <ProviderContentWrapper
-                    data-test-subj={`draggable-content-${dataProvider.queryMatch.field}`}
-                  >
-                    {render(dataProvider, provided, snapshot)}
-                  </ProviderContentWrapper>
-                </div>
-              </ConditionalPortal>
-            )}
+            renderClone={RenderClone}
           >
-            {(droppableProvided) => (
-              <div ref={droppableProvided.innerRef} {...droppableProvided.droppableProps}>
-                <Draggable
-                  draggableId={getDraggableId(dataProvider.id)}
-                  index={0}
-                  key={getDraggableId(dataProvider.id)}
-                  isDragDisabled={isDisabled}
-                >
-                  {(provided, snapshot) => (
-                    <ProviderContainer
-                      {...provided.draggableProps}
-                      {...provided.dragHandleProps}
-                      ref={(e: HTMLDivElement) => {
-                        provided.innerRef(e);
-                        draggableRef.current = e;
-                      }}
-                      data-test-subj="providerContainer"
-                      isDragging={snapshot.isDragging}
-                      registerProvider={registerProvider}
-                    >
-                      {truncate && !snapshot.isDragging ? (
-                        <TruncatableText data-test-subj="draggable-truncatable-content">
-                          {render(dataProvider, provided, snapshot)}
-                        </TruncatableText>
-                      ) : (
-                        <ProviderContentWrapper
-                          data-test-subj={`draggable-content-${dataProvider.queryMatch.field}`}
-                        >
-                          {render(dataProvider, provided, snapshot)}
-                        </ProviderContentWrapper>
-                      )}
-                    </ProviderContainer>
-                  )}
-                </Draggable>
-                {droppableProvided.placeholder}
-              </div>
-            )}
+            {DroppableContent}
           </Droppable>
         </DragDropErrorBoundary>
       </Wrapper>
     ),
-    [dataProvider, registerProvider, render, isDisabled, truncate]
+    [DroppableContent, RenderClone, dataProvider.id, isDisabled]
   );
 
-  if (isDisabled) return <>{renderContent()}</>;
+  const renderContent = useCallback(() => content, [content]);
+
+  if (isDisabled) return <>{content}</>;
 
   return (
     <WithHoverActions
diff --git a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/droppable_wrapper.tsx b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/droppable_wrapper.tsx
index 30c54a8b44a75..6818b03d450a7 100644
--- a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/droppable_wrapper.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/droppable_wrapper.tsx
@@ -5,7 +5,7 @@
  */
 
 import { rgba } from 'polished';
-import React from 'react';
+import React, { useCallback } from 'react';
 import { Droppable, DraggableChildrenFn } from 'react-beautiful-dnd';
 import styled from 'styled-components';
 
@@ -96,15 +96,9 @@ export const DroppableWrapper = React.memo<Props>(
     type,
     render = null,
     renderClone,
-  }) => (
-    <Droppable
-      isDropDisabled={isDropDisabled}
-      droppableId={droppableId}
-      direction={'horizontal'}
-      type={type}
-      renderClone={renderClone}
-    >
-      {(provided, snapshot) => (
+  }) => {
+    const DroppableContent = useCallback(
+      (provided, snapshot) => (
         <ReactDndDropTarget
           height={height}
           ref={provided.innerRef}
@@ -114,8 +108,21 @@ export const DroppableWrapper = React.memo<Props>(
           {render == null ? children : render({ isDraggingOver: snapshot.isDraggingOver })}
           {provided.placeholder}
         </ReactDndDropTarget>
-      )}
-    </Droppable>
-  )
+      ),
+      [children, height, render]
+    );
+
+    return (
+      <Droppable
+        isDropDisabled={isDropDisabled}
+        droppableId={droppableId}
+        direction={'horizontal'}
+        type={type}
+        renderClone={renderClone}
+      >
+        {DroppableContent}
+      </Droppable>
+    );
+  }
 );
 DroppableWrapper.displayName = 'DroppableWrapper';
diff --git a/x-pack/plugins/security_solution/public/common/components/draggables/index.tsx b/x-pack/plugins/security_solution/public/common/components/draggables/index.tsx
index 4dc3c6fcbe440..d37de2cd3ec3d 100644
--- a/x-pack/plugins/security_solution/public/common/components/draggables/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/draggables/index.tsx
@@ -135,7 +135,7 @@ DefaultDraggable.displayName = 'DefaultDraggable';
 
 export const Badge = styled(EuiBadge)`
   vertical-align: top;
-` as any; // eslint-disable-line @typescript-eslint/no-explicit-any
+`;
 
 Badge.displayName = 'Badge';
 
diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx
index 2c8c8136a4733..7859f5584b0e5 100644
--- a/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiPanel } from '@elastic/eui';
-import { getOr, isEmpty, union } from 'lodash/fp';
+import { isEmpty, union } from 'lodash/fp';
 import React, { useEffect, useMemo, useState } from 'react';
 import styled from 'styled-components';
 import deepEqual from 'fast-deep-equal';
@@ -239,6 +239,19 @@ const EventsViewerComponent: React.FC<Props> = ({
     events,
   ]);
 
+  const HeaderSectionContent = useMemo(
+    () =>
+      headerFilterGroup && (
+        <HeaderFilterGroupWrapper
+          data-test-subj="header-filter-group-wrapper"
+          show={!resolverIsShowing(graphEventId)}
+        >
+          {headerFilterGroup}
+        </HeaderFilterGroupWrapper>
+      ),
+    [graphEventId, headerFilterGroup]
+  );
+
   useEffect(() => {
     setIsQueryLoading(loading);
   }, [loading]);
@@ -257,14 +270,7 @@ const EventsViewerComponent: React.FC<Props> = ({
               subtitle={utilityBar ? undefined : subtitle}
               title={inspect ? justTitle : titleWithExitFullScreen}
             >
-              {headerFilterGroup && (
-                <HeaderFilterGroupWrapper
-                  data-test-subj="header-filter-group-wrapper"
-                  show={!resolverIsShowing(graphEventId)}
-                >
-                  {headerFilterGroup}
-                </HeaderFilterGroupWrapper>
-              )}
+              {HeaderSectionContent}
             </HeaderSection>
             {utilityBar && !resolverIsShowing(graphEventId) && (
               <UtilityBar>{utilityBar?.(refetch, totalCountMinusDeleted)}</UtilityBar>
@@ -293,7 +299,7 @@ const EventsViewerComponent: React.FC<Props> = ({
                 /** Hide the footer if Resolver is showing. */
                 !graphEventId && (
                   <Footer
-                    activePage={getOr(0, 'activePage', pageInfo)}
+                    activePage={pageInfo.activePage}
                     data-test-subj="events-viewer-footer"
                     updatedAt={updatedAt}
                     height={footerHeight}
@@ -306,7 +312,7 @@ const EventsViewerComponent: React.FC<Props> = ({
                     onChangeItemsPerPage={onChangeItemsPerPage}
                     onChangePage={loadPage}
                     serverSideEventCount={totalCountMinusDeleted}
-                    totalPages={getOr(0, 'totalPages', pageInfo)}
+                    totalCount={pageInfo.fakeTotalCount}
                   />
                 )
               }
diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/mock.ts b/x-pack/plugins/security_solution/public/common/components/events_viewer/mock.ts
index f6fb01be4371f..d2bd940dcc266 100644
--- a/x-pack/plugins/security_solution/public/common/components/events_viewer/mock.ts
+++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/mock.ts
@@ -8,7 +8,7 @@ export const mockEventViewerResponse = {
   totalCount: 12,
   pageInfo: {
     activePage: 0,
-    totalPages: 10,
+    fakeTotalCount: 100,
   },
   events: [],
 };
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/entity_draggable.tsx b/x-pack/plugins/security_solution/public/common/components/ml/entity_draggable.tsx
index 9024aec17400c..1c5b13acb0c22 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/entity_draggable.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/entity_draggable.tsx
@@ -4,9 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { DraggableWrapper, DragEffects } from '../drag_and_drop/draggable_wrapper';
-import { IS_OPERATOR } from '../../../timelines/components/timeline/data_providers/data_provider';
+import {
+  IS_OPERATOR,
+  QueryOperator,
+} from '../../../timelines/components/timeline/data_providers/data_provider';
 import { Provider } from '../../../timelines/components/timeline/data_providers/provider';
 import { escapeDataProviderId } from '../drag_and_drop/helpers';
 
@@ -16,39 +19,43 @@ interface Props {
   entityValue: string;
 }
 
-export const EntityDraggableComponent = ({
+export const EntityDraggableComponent: React.FC<Props> = ({
   idPrefix,
   entityName,
   entityValue,
-}: Props): JSX.Element => {
+}) => {
   const id = escapeDataProviderId(`entity-draggable-${idPrefix}-${entityName}-${entityValue}`);
-  return (
-    <DraggableWrapper
-      key={id}
-      dataProvider={{
-        and: [],
-        enabled: true,
-        id,
-        name: entityValue,
-        excluded: false,
-        kqlQuery: '',
-        queryMatch: {
-          field: entityName,
-          value: entityValue,
-          operator: IS_OPERATOR,
-        },
-      }}
-      render={(dataProvider, _, snapshot) =>
-        snapshot.isDragging ? (
-          <DragEffects>
-            <Provider dataProvider={dataProvider} />
-          </DragEffects>
-        ) : (
-          <>{`${entityName}: "${entityValue}"`}</>
-        )
-      }
-    />
+
+  const dataProviderProp = useMemo(
+    () => ({
+      and: [],
+      enabled: true,
+      id,
+      name: entityValue,
+      excluded: false,
+      kqlQuery: '',
+      queryMatch: {
+        field: entityName,
+        value: entityValue,
+        operator: IS_OPERATOR as QueryOperator,
+      },
+    }),
+    [entityName, entityValue, id]
+  );
+
+  const render = useCallback(
+    (dataProvider, _, snapshot) =>
+      snapshot.isDragging ? (
+        <DragEffects>
+          <Provider dataProvider={dataProvider} />
+        </DragEffects>
+      ) : (
+        <>{`${entityName}: "${entityValue}"`}</>
+      ),
+    [entityName, entityValue]
   );
+
+  return <DraggableWrapper key={id} dataProvider={dataProviderProp} render={render} />;
 };
 
 EntityDraggableComponent.displayName = 'EntityDraggableComponent';
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/score/draggable_score.tsx b/x-pack/plugins/security_solution/public/common/components/ml/score/draggable_score.tsx
index c849476f0c3db..668a374e57f0d 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/score/draggable_score.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/score/draggable_score.tsx
@@ -4,10 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { DraggableWrapper, DragEffects } from '../../drag_and_drop/draggable_wrapper';
 import { Anomaly } from '../types';
-import { IS_OPERATOR } from '../../../../timelines/components/timeline/data_providers/data_provider';
+import {
+  IS_OPERATOR,
+  QueryOperator,
+} from '../../../../timelines/components/timeline/data_providers/data_provider';
 import { Provider } from '../../../../timelines/components/timeline/data_providers/provider';
 import { Spacer } from '../../page';
 import { getScoreString } from './score_health';
@@ -23,39 +26,48 @@ export const DraggableScoreComponent = ({
 }): JSX.Element => {
   const scoreString = getScoreString(score.severity);
 
+  const dataProviderProp = useMemo(
+    () => ({
+      and: [],
+      enabled: true,
+      id,
+      name: score.entityName,
+      excluded: false,
+      kqlQuery: '',
+      queryMatch: {
+        field: score.entityName,
+        value: score.entityValue,
+        operator: IS_OPERATOR as QueryOperator,
+      },
+    }),
+    [id, score.entityName, score.entityValue]
+  );
+
+  const render = useCallback(
+    (dataProvider, _, snapshot) =>
+      snapshot.isDragging ? (
+        <DragEffects>
+          <Provider dataProvider={dataProvider} />
+        </DragEffects>
+      ) : (
+        <>
+          {index !== 0 && (
+            <>
+              {','}
+              <Spacer />
+            </>
+          )}
+          {scoreString}
+        </>
+      ),
+    [index, scoreString]
+  );
+
   return (
     <DraggableWrapper
       key={`draggable-score-draggable-wrapper-${id}`}
-      dataProvider={{
-        and: [],
-        enabled: true,
-        id,
-        name: score.entityName,
-        excluded: false,
-        kqlQuery: '',
-        queryMatch: {
-          field: score.entityName,
-          value: score.entityValue,
-          operator: IS_OPERATOR,
-        },
-      }}
-      render={(dataProvider, _, snapshot) =>
-        snapshot.isDragging ? (
-          <DragEffects>
-            <Provider dataProvider={dataProvider} />
-          </DragEffects>
-        ) : (
-          <>
-            {index !== 0 && (
-              <>
-                {','}
-                <Spacer />
-              </>
-            )}
-            {scoreString}
-          </>
-        )
-      }
+      dataProvider={dataProviderProp}
+      render={render}
     />
   );
 };
diff --git a/x-pack/plugins/security_solution/public/management/common/routing.test.ts b/x-pack/plugins/security_solution/public/management/common/routing.test.ts
index 7a36654dcffc3..7082ab0ce5c4f 100644
--- a/x-pack/plugins/security_solution/public/management/common/routing.test.ts
+++ b/x-pack/plugins/security_solution/public/management/common/routing.test.ts
@@ -4,57 +4,57 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { extractListPaginationParams, getTrustedAppsListPath } from './routing';
+import { extractTrustedAppsListPageLocation, getTrustedAppsListPath } from './routing';
 import { MANAGEMENT_DEFAULT_PAGE, MANAGEMENT_DEFAULT_PAGE_SIZE } from './constants';
 
 describe('routing', () => {
   describe('extractListPaginationParams()', () => {
     it('extracts default page index when not provided', () => {
-      expect(extractListPaginationParams({}).page_index).toBe(MANAGEMENT_DEFAULT_PAGE);
+      expect(extractTrustedAppsListPageLocation({}).page_index).toBe(MANAGEMENT_DEFAULT_PAGE);
     });
 
     it('extracts default page index when too small value provided', () => {
-      expect(extractListPaginationParams({ page_index: '-1' }).page_index).toBe(
+      expect(extractTrustedAppsListPageLocation({ page_index: '-1' }).page_index).toBe(
         MANAGEMENT_DEFAULT_PAGE
       );
     });
 
     it('extracts default page index when not a number provided', () => {
-      expect(extractListPaginationParams({ page_index: 'a' }).page_index).toBe(
+      expect(extractTrustedAppsListPageLocation({ page_index: 'a' }).page_index).toBe(
         MANAGEMENT_DEFAULT_PAGE
       );
     });
 
     it('extracts only last page index when multiple values provided', () => {
-      expect(extractListPaginationParams({ page_index: ['1', '2'] }).page_index).toBe(2);
+      expect(extractTrustedAppsListPageLocation({ page_index: ['1', '2'] }).page_index).toBe(2);
     });
 
     it('extracts proper page index when single valid value provided', () => {
-      expect(extractListPaginationParams({ page_index: '2' }).page_index).toBe(2);
+      expect(extractTrustedAppsListPageLocation({ page_index: '2' }).page_index).toBe(2);
     });
 
     it('extracts default page size when not provided', () => {
-      expect(extractListPaginationParams({}).page_size).toBe(MANAGEMENT_DEFAULT_PAGE_SIZE);
+      expect(extractTrustedAppsListPageLocation({}).page_size).toBe(MANAGEMENT_DEFAULT_PAGE_SIZE);
     });
 
     it('extracts default page size when invalid option provided', () => {
-      expect(extractListPaginationParams({ page_size: '25' }).page_size).toBe(
+      expect(extractTrustedAppsListPageLocation({ page_size: '25' }).page_size).toBe(
         MANAGEMENT_DEFAULT_PAGE_SIZE
       );
     });
 
     it('extracts default page size when not a number provided', () => {
-      expect(extractListPaginationParams({ page_size: 'a' }).page_size).toBe(
+      expect(extractTrustedAppsListPageLocation({ page_size: 'a' }).page_size).toBe(
         MANAGEMENT_DEFAULT_PAGE_SIZE
       );
     });
 
     it('extracts only last page size when multiple values provided', () => {
-      expect(extractListPaginationParams({ page_size: ['10', '20'] }).page_size).toBe(20);
+      expect(extractTrustedAppsListPageLocation({ page_size: ['10', '20'] }).page_size).toBe(20);
     });
 
     it('extracts proper page size when single valid value provided', () => {
-      expect(extractListPaginationParams({ page_size: '20' }).page_size).toBe(20);
+      expect(extractTrustedAppsListPageLocation({ page_size: '20' }).page_size).toBe(20);
     });
   });
 
diff --git a/x-pack/plugins/security_solution/public/management/common/routing.ts b/x-pack/plugins/security_solution/public/management/common/routing.ts
index cb4ed9b098fce..9acf4a1613c0b 100644
--- a/x-pack/plugins/security_solution/public/management/common/routing.ts
+++ b/x-pack/plugins/security_solution/public/management/common/routing.ts
@@ -21,7 +21,7 @@ import {
 import { AdministrationSubTab } from '../types';
 import { appendSearch } from '../../common/components/link_to/helpers';
 import { EndpointIndexUIQueryParams } from '../pages/endpoint_hosts/types';
-import { TrustedAppsUrlParams } from '../pages/trusted_apps/types';
+import { TrustedAppsListPageLocation } from '../pages/trusted_apps/state';
 
 // Taken from: https://github.com/microsoft/TypeScript/issues/12936#issuecomment-559034150
 type ExactKeys<T1, T2> = Exclude<keyof T1, keyof T2> extends never ? T1 : never;
@@ -94,18 +94,18 @@ const isDefaultOrMissing = <T>(value: T | undefined, defaultValue: T) => {
   return value === undefined || value === defaultValue;
 };
 
-const normalizeListPaginationParams = (
-  params?: Partial<TrustedAppsUrlParams>
-): Partial<TrustedAppsUrlParams> => {
-  if (params) {
+const normalizeTrustedAppsPageLocation = (
+  location?: Partial<TrustedAppsListPageLocation>
+): Partial<TrustedAppsListPageLocation> => {
+  if (location) {
     return {
-      ...(!isDefaultOrMissing(params.page_index, MANAGEMENT_DEFAULT_PAGE)
-        ? { page_index: params.page_index }
+      ...(!isDefaultOrMissing(location.page_index, MANAGEMENT_DEFAULT_PAGE)
+        ? { page_index: location.page_index }
         : {}),
-      ...(!isDefaultOrMissing(params.page_size, MANAGEMENT_DEFAULT_PAGE_SIZE)
-        ? { page_size: params.page_size }
+      ...(!isDefaultOrMissing(location.page_size, MANAGEMENT_DEFAULT_PAGE_SIZE)
+        ? { page_size: location.page_size }
         : {}),
-      ...(!isDefaultOrMissing(params.show, undefined) ? { show: params.show } : {}),
+      ...(!isDefaultOrMissing(location.show, undefined) ? { show: location.show } : {}),
     };
   } else {
     return {};
@@ -135,17 +135,22 @@ const extractPageSize = (query: querystring.ParsedUrlQuery): number => {
   return MANAGEMENT_PAGE_SIZE_OPTIONS.includes(pageSize) ? pageSize : MANAGEMENT_DEFAULT_PAGE_SIZE;
 };
 
-export const extractListPaginationParams = (
-  query: querystring.ParsedUrlQuery
-): TrustedAppsUrlParams => ({
+export const extractListPaginationParams = (query: querystring.ParsedUrlQuery) => ({
   page_index: extractPageIndex(query),
   page_size: extractPageSize(query),
 });
 
-export const getTrustedAppsListPath = (params?: Partial<TrustedAppsUrlParams>): string => {
+export const extractTrustedAppsListPageLocation = (
+  query: querystring.ParsedUrlQuery
+): TrustedAppsListPageLocation => ({
+  ...extractListPaginationParams(query),
+  show: extractFirstParamValue(query, 'show') === 'create' ? 'create' : undefined,
+});
+
+export const getTrustedAppsListPath = (params?: Partial<TrustedAppsListPageLocation>): string => {
   const path = generatePath(MANAGEMENT_ROUTING_TRUSTED_APPS_PATH, {
     tabName: AdministrationSubTab.trustedApps,
   });
 
-  return `${path}${appendSearch(querystring.stringify(normalizeListPaginationParams(params)))}`;
+  return `${path}${appendSearch(querystring.stringify(normalizeTrustedAppsPageLocation(params)))}`;
 };
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/trusted_apps_list_page_state.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/trusted_apps_list_page_state.ts
index 4c38ac0c4239a..a98ec03a006f5 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/trusted_apps_list_page_state.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/trusted_apps_list_page_state.ts
@@ -7,7 +7,6 @@
 import { ServerApiError } from '../../../../common/types';
 import { NewTrustedApp, TrustedApp } from '../../../../../common/endpoint/types/trusted_apps';
 import { AsyncResourceState } from '.';
-import { TrustedAppsUrlParams } from '../types';
 
 export interface PaginationInfo {
   index: number;
@@ -39,12 +38,16 @@ export interface TrustedAppCreateFailure {
   data: ServerApiError;
 }
 
+export interface TrustedAppsListPageLocation {
+  page_index: number;
+  page_size: number;
+  show?: 'create';
+}
+
 export interface TrustedAppsListPageState {
   listView: {
-    currentListResourceState: AsyncResourceState<TrustedAppsListData>;
-    currentPaginationInfo: PaginationInfo;
+    listResourceState: AsyncResourceState<TrustedAppsListData>;
     freshDataTimestamp: number;
-    show: TrustedAppsUrlParams['show'] | undefined;
   };
   deletionDialog: {
     entry?: TrustedApp;
@@ -56,5 +59,6 @@ export interface TrustedAppsListPageState {
     | TrustedAppCreatePending
     | TrustedAppCreateSuccess
     | TrustedAppCreateFailure;
+  location: TrustedAppsListPageLocation;
   active: boolean;
 }
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.test.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.test.ts
index 19c2d3a62781f..2143b5135c575 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.test.ts
@@ -9,13 +9,12 @@ import { applyMiddleware, createStore } from 'redux';
 import { createSpyMiddleware } from '../../../../common/store/test_utils';
 
 import {
-  createFailedListViewWithPagination,
   createListLoadedResourceState,
   createLoadedListViewWithPagination,
-  createLoadingListViewWithPagination,
   createSampleTrustedApp,
   createSampleTrustedApps,
   createServerApiError,
+  createUninitialisedResourceState,
   createUserChangedUrlAction,
 } from '../test_utils';
 
@@ -76,6 +75,7 @@ describe('middleware', () => {
   describe('refreshing list resource state', () => {
     it('refreshes the list when location changes and data gets outdated', async () => {
       const pagination = { index: 2, size: 50 };
+      const location = { page_index: 2, page_size: 50, show: undefined };
       const service = createTrustedAppsServiceMock();
       const { store, spyMiddleware } = createStoreSetup(service);
 
@@ -87,21 +87,30 @@ describe('middleware', () => {
 
       expect(store.getState()).toStrictEqual({
         ...initialState,
-        listView: createLoadingListViewWithPagination(initialNow, pagination),
+        listView: {
+          listResourceState: {
+            type: 'LoadingResourceState',
+            previousState: createUninitialisedResourceState(),
+          },
+          freshDataTimestamp: initialNow,
+        },
         active: true,
+        location,
       });
 
       await spyMiddleware.waitForAction('trustedAppsListResourceStateChanged');
 
       expect(store.getState()).toStrictEqual({
         ...initialState,
-        listView: createLoadedListViewWithPagination(initialNow, pagination, pagination, 500),
+        listView: createLoadedListViewWithPagination(initialNow, pagination, 500),
         active: true,
+        location,
       });
     });
 
     it('does not refresh the list when location changes and data does not get outdated', async () => {
       const pagination = { index: 2, size: 50 };
+      const location = { page_index: 2, page_size: 50, show: undefined };
       const service = createTrustedAppsServiceMock();
       const { store, spyMiddleware } = createStoreSetup(service);
 
@@ -118,14 +127,16 @@ describe('middleware', () => {
       expect(service.getTrustedAppsList).toBeCalledTimes(1);
       expect(store.getState()).toStrictEqual({
         ...initialState,
-        listView: createLoadedListViewWithPagination(initialNow, pagination, pagination, 500),
+        listView: createLoadedListViewWithPagination(initialNow, pagination, 500),
         active: true,
+        location,
       });
     });
 
     it('refreshes the list when data gets outdated with and outdate action', async () => {
       const newNow = 222222;
       const pagination = { index: 0, size: 10 };
+      const location = { page_index: 0, page_size: 10, show: undefined };
       const service = createTrustedAppsServiceMock();
       const { store, spyMiddleware } = createStoreSetup(service);
 
@@ -143,20 +154,24 @@ describe('middleware', () => {
 
       expect(store.getState()).toStrictEqual({
         ...initialState,
-        listView: createLoadingListViewWithPagination(
-          newNow,
-          pagination,
-          createListLoadedResourceState(pagination, 500, initialNow)
-        ),
+        listView: {
+          listResourceState: {
+            type: 'LoadingResourceState',
+            previousState: createListLoadedResourceState(pagination, 500, initialNow),
+          },
+          freshDataTimestamp: newNow,
+        },
         active: true,
+        location,
       });
 
       await spyMiddleware.waitForAction('trustedAppsListResourceStateChanged');
 
       expect(store.getState()).toStrictEqual({
         ...initialState,
-        listView: createLoadedListViewWithPagination(newNow, pagination, pagination, 500),
+        listView: createLoadedListViewWithPagination(newNow, pagination, 500),
         active: true,
+        location,
       });
     });
 
@@ -172,12 +187,16 @@ describe('middleware', () => {
 
       expect(store.getState()).toStrictEqual({
         ...initialState,
-        listView: createFailedListViewWithPagination(
-          initialNow,
-          { index: 2, size: 50 },
-          createServerApiError('Internal Server Error')
-        ),
+        listView: {
+          listResourceState: {
+            type: 'FailedResourceState',
+            error: createServerApiError('Internal Server Error'),
+            lastLoadedState: undefined,
+          },
+          freshDataTimestamp: initialNow,
+        },
         active: true,
+        location: { page_index: 2, page_size: 50, show: undefined },
       });
 
       const infiniteLoopTest = async () => {
@@ -193,10 +212,11 @@ describe('middleware', () => {
     const entry = createSampleTrustedApp(3);
     const notFoundError = createServerApiError('Not Found');
     const pagination = { index: 0, size: 10 };
+    const location = { page_index: 0, page_size: 10, show: undefined };
     const getTrustedAppsListResponse = createGetTrustedListAppsResponse(pagination, 500);
-    const listView = createLoadedListViewWithPagination(initialNow, pagination, pagination, 500);
-    const listViewNew = createLoadedListViewWithPagination(newNow, pagination, pagination, 500);
-    const testStartState = { ...initialState, listView, active: true };
+    const listView = createLoadedListViewWithPagination(initialNow, pagination, 500);
+    const listViewNew = createLoadedListViewWithPagination(newNow, pagination, 500);
+    const testStartState = { ...initialState, listView, active: true, location };
 
     it('does not submit when entry is undefined', async () => {
       const service = createTrustedAppsServiceMock();
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.ts
index dd96c8d807048..9fa456dc5ffe2 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/middleware.ts
@@ -29,12 +29,12 @@ import {
 } from './action';
 
 import {
-  getCurrentListResourceState,
+  getListResourceState,
   getDeletionDialogEntry,
   getDeletionSubmissionResourceState,
   getLastLoadedListResourceState,
-  getListCurrentPageIndex,
-  getListCurrentPageSize,
+  getCurrentLocationPageIndex,
+  getCurrentLocationPageSize,
   getTrustedAppCreateData,
   isCreatePending,
   needsRefreshOfListData,
@@ -56,15 +56,15 @@ const refreshListIfNeeded = async (
       createTrustedAppsListResourceStateChangedAction({
         type: 'LoadingResourceState',
         // need to think on how to avoid the casting
-        previousState: getCurrentListResourceState(store.getState()) as Immutable<
+        previousState: getListResourceState(store.getState()) as Immutable<
           StaleResourceState<TrustedAppsListData>
         >,
       })
     );
 
     try {
-      const pageIndex = getListCurrentPageIndex(store.getState());
-      const pageSize = getListCurrentPageSize(store.getState());
+      const pageIndex = getCurrentLocationPageIndex(store.getState());
+      const pageSize = getCurrentLocationPageSize(store.getState());
       const response = await trustedAppsService.getTrustedAppsList({
         page: pageIndex + 1,
         per_page: pageSize,
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/reducer.test.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/reducer.test.ts
index 228f0932edd28..94fcdb39bb169 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/reducer.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/reducer.test.ts
@@ -32,17 +32,14 @@ describe('reducer', () => {
 
       expect(result).toStrictEqual({
         ...initialState,
-        listView: { ...initialState.listView, currentPaginationInfo: { index: 5, size: 50 } },
+        location: { page_index: 5, page_size: 50, show: undefined },
         active: true,
       });
     });
 
     it('extracts default pagination parameters when none provided', () => {
       const result = trustedAppsPageReducer(
-        {
-          ...initialState,
-          listView: { ...initialState.listView, currentPaginationInfo: { index: 5, size: 50 } },
-        },
+        { ...initialState, location: { page_index: 5, page_size: 50 } },
         createUserChangedUrlAction('/trusted_apps', '?page_index=b&page_size=60')
       );
 
@@ -51,10 +48,7 @@ describe('reducer', () => {
 
     it('extracts default pagination parameters when invalid provided', () => {
       const result = trustedAppsPageReducer(
-        {
-          ...initialState,
-          listView: { ...initialState.listView, currentPaginationInfo: { index: 5, size: 50 } },
-        },
+        { ...initialState, location: { page_index: 5, page_size: 50 } },
         createUserChangedUrlAction('/trusted_apps')
       );
 
@@ -85,7 +79,7 @@ describe('reducer', () => {
 
       expect(result).toStrictEqual({
         ...initialState,
-        listView: { ...initialState.listView, currentListResourceState: listResourceState },
+        listView: { ...initialState.listView, listResourceState },
       });
     });
   });
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/reducer.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/reducer.ts
index ec210254bf76f..f4056f02a4140 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/reducer.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/reducer.ts
@@ -11,7 +11,8 @@ import { ImmutableReducer } from '../../../../common/store';
 import { AppLocation, Immutable } from '../../../../../common/endpoint/types';
 import { UserChangedUrl } from '../../../../common/store/routing/action';
 import { AppAction } from '../../../../common/store/actions';
-import { extractFirstParamValue, extractListPaginationParams } from '../../../common/routing';
+import { extractTrustedAppsListPageLocation } from '../../../common/routing';
+
 import {
   MANAGEMENT_ROUTING_TRUSTED_APPS_PATH,
   MANAGEMENT_DEFAULT_PAGE,
@@ -29,6 +30,7 @@ import {
   ServerReturnedCreateTrustedAppSuccess,
   UserClickedSaveNewTrustedAppButton,
 } from './action';
+
 import { TrustedAppsListPageState } from '../state';
 
 type StateReducer = ImmutableReducer<TrustedAppsListPageState, AppAction>;
@@ -64,7 +66,7 @@ const trustedAppsListResourceStateChanged: CaseReducer<TrustedAppsListResourceSt
     ...state,
     listView: {
       ...state.listView,
-      currentListResourceState: action.payload.newState,
+      listResourceState: action.payload.newState,
     },
   };
 };
@@ -110,22 +112,13 @@ const trustedAppDeletionDialogClosed: CaseReducer<TrustedAppDeletionDialogClosed
 const userChangedUrl: CaseReducer<UserChangedUrl> = (state, action) => {
   if (isTrustedAppsPageLocation(action.payload)) {
     const parsedUrlsParams = parse(action.payload.search.slice(1));
-    const paginationParams = extractListPaginationParams(parsedUrlsParams);
-    const show =
-      extractFirstParamValue(parsedUrlsParams, 'show') === 'create' ? 'create' : undefined;
+    const location = extractTrustedAppsListPageLocation(parsedUrlsParams);
 
     return {
       ...state,
-      listView: {
-        ...state.listView,
-        currentPaginationInfo: {
-          index: paginationParams.page_index,
-          size: paginationParams.page_size,
-        },
-        show,
-      },
-      createView: show ? state.createView : undefined,
+      createView: location.show ? state.createView : undefined,
       active: true,
+      location,
     };
   } else {
     return initialTrustedAppsPageState();
@@ -150,16 +143,16 @@ const initialDeletionDialogState = (): TrustedAppsListPageState['deletionDialog'
 
 export const initialTrustedAppsPageState = (): TrustedAppsListPageState => ({
   listView: {
-    currentListResourceState: { type: 'UninitialisedResourceState' },
-    currentPaginationInfo: {
-      index: MANAGEMENT_DEFAULT_PAGE,
-      size: MANAGEMENT_DEFAULT_PAGE_SIZE,
-    },
+    listResourceState: { type: 'UninitialisedResourceState' },
     freshDataTimestamp: Date.now(),
-    show: undefined,
   },
   deletionDialog: initialDeletionDialogState(),
   createView: undefined,
+  location: {
+    page_index: MANAGEMENT_DEFAULT_PAGE,
+    page_size: MANAGEMENT_DEFAULT_PAGE_SIZE,
+    show: undefined,
+  },
   active: false,
 });
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/selectors.test.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/selectors.test.ts
index 0be4d0b05acc4..01fe3e5bf202e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/selectors.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/selectors.test.ts
@@ -7,10 +7,10 @@
 import { AsyncResourceState, TrustedAppsListPageState } from '../state';
 import { initialTrustedAppsPageState } from './reducer';
 import {
-  getCurrentListResourceState,
+  getListResourceState,
   getLastLoadedListResourceState,
-  getListCurrentPageIndex,
-  getListCurrentPageSize,
+  getCurrentLocationPageIndex,
+  getCurrentLocationPageSize,
   getListErrorMessage,
   getListItems,
   getListTotalItemsCount,
@@ -25,7 +25,6 @@ import {
 } from './selectors';
 
 import {
-  createDefaultListView,
   createDefaultPaginationInfo,
   createListComplexLoadingResourceState,
   createListFailedResourceState,
@@ -85,16 +84,17 @@ describe('selectors', () => {
 
     it('returns false when current loaded data is up to date', () => {
       const listView = createLoadedListViewWithPagination(initialNow);
+      const location = { page_index: 0, page_size: 10 };
 
-      expect(needsRefreshOfListData({ ...initialState, listView, active: true })).toBe(false);
+      expect(needsRefreshOfListData({ ...initialState, listView, active: true, location })).toBe(
+        false
+      );
     });
   });
 
-  describe('getCurrentListResourceState()', () => {
+  describe('getListResourceState()', () => {
     it('returns current list resource state', () => {
-      const state = { ...initialState, listView: createDefaultListView(initialNow) };
-
-      expect(getCurrentListResourceState(state)).toStrictEqual(createUninitialisedResourceState());
+      expect(getListResourceState(initialState)).toStrictEqual(createUninitialisedResourceState());
     });
   });
 
@@ -103,14 +103,12 @@ describe('selectors', () => {
       const state = {
         ...initialState,
         listView: {
-          currentListResourceState: createListComplexLoadingResourceState(
+          listResourceState: createListComplexLoadingResourceState(
             createDefaultPaginationInfo(),
             200,
             initialNow
           ),
-          currentPaginationInfo: createDefaultPaginationInfo(),
           freshDataTimestamp: initialNow,
-          show: undefined,
         },
       };
 
@@ -122,23 +120,19 @@ describe('selectors', () => {
 
   describe('getListItems()', () => {
     it('returns empty list when no valid data loaded', () => {
-      const state = { ...initialState, listView: createDefaultListView(initialNow) };
-
-      expect(getListItems(state)).toStrictEqual([]);
+      expect(getListItems(initialState)).toStrictEqual([]);
     });
 
     it('returns last loaded list items', () => {
       const state = {
         ...initialState,
         listView: {
-          currentListResourceState: createListComplexLoadingResourceState(
+          listResourceState: createListComplexLoadingResourceState(
             createDefaultPaginationInfo(),
             200,
             initialNow
           ),
-          currentPaginationInfo: createDefaultPaginationInfo(),
           freshDataTimestamp: initialNow,
-          show: undefined,
         },
       };
 
@@ -150,23 +144,19 @@ describe('selectors', () => {
 
   describe('getListTotalItemsCount()', () => {
     it('returns 0 when no valid data loaded', () => {
-      const state = { ...initialState, listView: createDefaultListView(initialNow) };
-
-      expect(getListTotalItemsCount(state)).toBe(0);
+      expect(getListTotalItemsCount(initialState)).toBe(0);
     });
 
     it('returns last loaded total items count', () => {
       const state = {
         ...initialState,
         listView: {
-          currentListResourceState: createListComplexLoadingResourceState(
+          listResourceState: createListComplexLoadingResourceState(
             createDefaultPaginationInfo(),
             200,
             initialNow
           ),
-          currentPaginationInfo: createDefaultPaginationInfo(),
           freshDataTimestamp: initialNow,
-          show: undefined,
         },
       };
 
@@ -176,17 +166,17 @@ describe('selectors', () => {
 
   describe('getListCurrentPageIndex()', () => {
     it('returns page index', () => {
-      const state = { ...initialState, listView: createDefaultListView(initialNow) };
+      const state = { ...initialState, location: { page_index: 3, page_size: 10 } };
 
-      expect(getListCurrentPageIndex(state)).toBe(0);
+      expect(getCurrentLocationPageIndex(state)).toBe(3);
     });
   });
 
   describe('getListCurrentPageSize()', () => {
     it('returns page size', () => {
-      const state = { ...initialState, listView: createDefaultListView(initialNow) };
+      const state = { ...initialState, location: { page_index: 0, page_size: 20 } };
 
-      expect(getListCurrentPageSize(state)).toBe(20);
+      expect(getCurrentLocationPageSize(state)).toBe(20);
     });
   });
 
@@ -195,14 +185,12 @@ describe('selectors', () => {
       const state = {
         ...initialState,
         listView: {
-          currentListResourceState: createListComplexLoadingResourceState(
+          listResourceState: createListComplexLoadingResourceState(
             createDefaultPaginationInfo(),
             200,
             initialNow
           ),
-          currentPaginationInfo: createDefaultPaginationInfo(),
           freshDataTimestamp: initialNow,
-          show: undefined,
         },
       };
 
@@ -213,10 +201,8 @@ describe('selectors', () => {
       const state = {
         ...initialState,
         listView: {
-          currentListResourceState: createListFailedResourceState('Internal Server Error'),
-          currentPaginationInfo: createDefaultPaginationInfo(),
+          listResourceState: createListFailedResourceState('Internal Server Error'),
           freshDataTimestamp: initialNow,
-          show: undefined,
         },
       };
 
@@ -233,14 +219,12 @@ describe('selectors', () => {
       const state = {
         ...initialState,
         listView: {
-          currentListResourceState: createListComplexLoadingResourceState(
+          listResourceState: createListComplexLoadingResourceState(
             createDefaultPaginationInfo(),
             200,
             initialNow
           ),
-          currentPaginationInfo: createDefaultPaginationInfo(),
           freshDataTimestamp: initialNow,
-          show: undefined,
         },
       };
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/selectors.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/selectors.ts
index 6239b425efe2f..62ffa364e4a6c 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/selectors.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/store/selectors.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { createSelector } from 'reselect';
 import { ServerApiError } from '../../../../common/types';
 import { Immutable, NewTrustedApp, TrustedApp } from '../../../../../common/endpoint/types';
 
@@ -17,97 +16,76 @@ import {
   isLoadingResourceState,
   isOutdatedResourceState,
   LoadedResourceState,
-  PaginationInfo,
   TrustedAppCreateFailure,
   TrustedAppsListData,
+  TrustedAppsListPageLocation,
   TrustedAppsListPageState,
 } from '../state';
-import { TrustedAppsUrlParams } from '../types';
 import {
   isTrustedAppCreateFailureState,
   isTrustedAppCreatePendingState,
   isTrustedAppCreateSuccessState,
 } from '../state/type_guards';
 
-const pageInfosEqual = (pageInfo1: PaginationInfo, pageInfo2: PaginationInfo): boolean =>
-  pageInfo1.index === pageInfo2.index && pageInfo1.size === pageInfo2.size;
-
 export const needsRefreshOfListData = (state: Immutable<TrustedAppsListPageState>): boolean => {
-  const currentPageInfo = state.listView.currentPaginationInfo;
-  const currentPage = state.listView.currentListResourceState;
   const freshDataTimestamp = state.listView.freshDataTimestamp;
+  const currentPage = state.listView.listResourceState;
+  const location = state.location;
 
   return (
     state.active &&
     isOutdatedResourceState(currentPage, (data) => {
       return (
-        pageInfosEqual(currentPageInfo, data.paginationInfo) && data.timestamp >= freshDataTimestamp
+        data.paginationInfo.index === location.page_index &&
+        data.paginationInfo.size === location.page_size &&
+        data.timestamp >= freshDataTimestamp
       );
     })
   );
 };
 
-export const getCurrentListResourceState = (
+export const getListResourceState = (
   state: Immutable<TrustedAppsListPageState>
 ): Immutable<AsyncResourceState<TrustedAppsListData>> | undefined => {
-  return state.listView.currentListResourceState;
+  return state.listView.listResourceState;
 };
 
 export const getLastLoadedListResourceState = (
   state: Immutable<TrustedAppsListPageState>
 ): Immutable<LoadedResourceState<TrustedAppsListData>> | undefined => {
-  return getLastLoadedResourceState(state.listView.currentListResourceState);
+  return getLastLoadedResourceState(state.listView.listResourceState);
 };
 
 export const getListItems = (
   state: Immutable<TrustedAppsListPageState>
 ): Immutable<TrustedApp[]> => {
-  return getLastLoadedResourceState(state.listView.currentListResourceState)?.data.items || [];
+  return getLastLoadedResourceState(state.listView.listResourceState)?.data.items || [];
 };
 
-export const getListCurrentPageIndex = (state: Immutable<TrustedAppsListPageState>): number => {
-  return state.listView.currentPaginationInfo.index;
+export const getCurrentLocationPageIndex = (state: Immutable<TrustedAppsListPageState>): number => {
+  return state.location.page_index;
 };
 
-export const getListCurrentPageSize = (state: Immutable<TrustedAppsListPageState>): number => {
-  return state.listView.currentPaginationInfo.size;
+export const getCurrentLocationPageSize = (state: Immutable<TrustedAppsListPageState>): number => {
+  return state.location.page_size;
 };
 
 export const getListTotalItemsCount = (state: Immutable<TrustedAppsListPageState>): number => {
-  return (
-    getLastLoadedResourceState(state.listView.currentListResourceState)?.data.totalItemsCount || 0
-  );
-};
-
-export const getListCurrentShowValue: (
-  state: Immutable<TrustedAppsListPageState>
-) => TrustedAppsListPageState['listView']['show'] = (state) => {
-  return state.listView.show;
+  return getLastLoadedResourceState(state.listView.listResourceState)?.data.totalItemsCount || 0;
 };
 
-export const getListUrlSearchParams: (
+export const getCurrentLocation = (
   state: Immutable<TrustedAppsListPageState>
-) => TrustedAppsUrlParams = createSelector(
-  getListCurrentPageIndex,
-  getListCurrentPageSize,
-  getListCurrentShowValue,
-  (pageIndex, pageSize, showValue) => {
-    return {
-      page_index: pageIndex,
-      page_size: pageSize,
-      show: showValue,
-    };
-  }
-);
+): TrustedAppsListPageLocation => state.location;
 
 export const getListErrorMessage = (
   state: Immutable<TrustedAppsListPageState>
 ): string | undefined => {
-  return getCurrentResourceError(state.listView.currentListResourceState)?.message;
+  return getCurrentResourceError(state.listView.listResourceState)?.message;
 };
 
 export const isListLoading = (state: Immutable<TrustedAppsListPageState>): boolean => {
-  return isLoadingResourceState(state.listView.currentListResourceState);
+  return isLoadingResourceState(state.listView.listResourceState);
 };
 
 export const isDeletionDialogOpen = (state: Immutable<TrustedAppsListPageState>): boolean => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/test_utils/index.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/test_utils/index.ts
index 020a87f526e52..c23b6ceae7b07 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/test_utils/index.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/test_utils/index.ts
@@ -5,11 +5,12 @@
  */
 
 import { combineReducers, createStore } from 'redux';
-import { ServerApiError } from '../../../../common/types';
 import { TrustedApp } from '../../../../../common/endpoint/types';
 import { RoutingAction } from '../../../../common/store/routing';
 
 import {
+  MANAGEMENT_DEFAULT_PAGE,
+  MANAGEMENT_DEFAULT_PAGE_SIZE,
   MANAGEMENT_STORE_GLOBAL_NAMESPACE,
   MANAGEMENT_STORE_TRUSTED_APPS_NAMESPACE,
 } from '../../../common/constants';
@@ -105,54 +106,22 @@ export const createListComplexLoadingResourceState = (
     )
   );
 
-export const createDefaultPaginationInfo = () => ({ index: 0, size: 20 });
-
-export const createDefaultListView = (
-  freshDataTimestamp: number
-): TrustedAppsListPageState['listView'] => ({
-  currentListResourceState: createUninitialisedResourceState(),
-  currentPaginationInfo: createDefaultPaginationInfo(),
-  freshDataTimestamp,
-  show: undefined,
-});
-
-export const createLoadingListViewWithPagination = (
-  freshDataTimestamp: number,
-  currentPaginationInfo: PaginationInfo,
-  previousState: StaleResourceState<TrustedAppsListData> = createUninitialisedResourceState()
-): TrustedAppsListPageState['listView'] => ({
-  currentListResourceState: { type: 'LoadingResourceState', previousState },
-  currentPaginationInfo,
-  freshDataTimestamp,
-  show: undefined,
+export const createDefaultPaginationInfo = () => ({
+  index: MANAGEMENT_DEFAULT_PAGE,
+  size: MANAGEMENT_DEFAULT_PAGE_SIZE,
 });
 
 export const createLoadedListViewWithPagination = (
   freshDataTimestamp: number,
   paginationInfo: PaginationInfo = createDefaultPaginationInfo(),
-  currentPaginationInfo: PaginationInfo = createDefaultPaginationInfo(),
   totalItemsCount: number = 200
 ): TrustedAppsListPageState['listView'] => ({
-  currentListResourceState: createListLoadedResourceState(
+  listResourceState: createListLoadedResourceState(
     paginationInfo,
     totalItemsCount,
     freshDataTimestamp
   ),
-  currentPaginationInfo,
-  freshDataTimestamp,
-  show: undefined,
-});
-
-export const createFailedListViewWithPagination = (
-  freshDataTimestamp: number,
-  currentPaginationInfo: PaginationInfo,
-  error: ServerApiError,
-  lastLoadedState?: LoadedResourceState<TrustedAppsListData>
-): TrustedAppsListPageState['listView'] => ({
-  currentListResourceState: { type: 'FailedResourceState', error, lastLoadedState },
-  currentPaginationInfo,
   freshDataTimestamp,
-  show: undefined,
 });
 
 export const createUserChangedUrlAction = (path: string, search: string = ''): RoutingAction => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/logical_condition/components/condition_entry.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/logical_condition/components/condition_entry.tsx
index 7f7eae18b0816..7d30e81898cf2 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/logical_condition/components/condition_entry.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/logical_condition/components/condition_entry.tsx
@@ -83,7 +83,7 @@ export const ConditionEntry = memo<ConditionEntryProps>(
             'xpack.securitySolution.trustedapps.logicalConditionBuilder.entry.field.path',
             { defaultMessage: 'Path' }
           ),
-          value: 'process.path.text',
+          value: 'process.executable.text',
         },
       ];
     }, []);
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_app_card/index.stories.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_app_card/index.stories.tsx
index 713e5e7095e12..4b64030a702c5 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_app_card/index.stories.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_app_card/index.stories.tsx
@@ -30,7 +30,7 @@ storiesOf('TrustedApps|TrustedAppCard', module)
     trustedApp.created_at = '2020-09-17T14:52:33.899Z';
     trustedApp.entries = [
       {
-        field: 'process.path.text',
+        field: 'process.executable.text',
         operator: 'included',
         type: 'match',
         value: '/some/path/on/file/system',
@@ -44,7 +44,7 @@ storiesOf('TrustedApps|TrustedAppCard', module)
     trustedApp.created_at = '2020-09-17T14:52:33.899Z';
     trustedApp.entries = [
       {
-        field: 'process.path.text',
+        field: 'process.executable.text',
         operator: 'included',
         type: 'match',
         value: '/some/path/on/file/system',
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_list.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_list.tsx
index d0c1fb477ea46..ae1f314842aab 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_list.tsx
@@ -23,8 +23,8 @@ import { MANAGEMENT_PAGE_SIZE_OPTIONS } from '../../../common/constants';
 import { getTrustedAppsListPath } from '../../../common/routing';
 
 import {
-  getListCurrentPageIndex,
-  getListCurrentPageSize,
+  getCurrentLocationPageIndex,
+  getCurrentLocationPageSize,
   getListErrorMessage,
   getListItems,
   getListTotalItemsCount,
@@ -149,8 +149,8 @@ const getColumnDefinitions = (context: TrustedAppsListContext): ColumnsList => {
 
 export const TrustedAppsList = memo(() => {
   const [detailsMap, setDetailsMap] = useState<DetailsMap>({});
-  const pageIndex = useTrustedAppsSelector(getListCurrentPageIndex);
-  const pageSize = useTrustedAppsSelector(getListCurrentPageSize);
+  const pageIndex = useTrustedAppsSelector(getCurrentLocationPageIndex);
+  const pageSize = useTrustedAppsSelector(getCurrentLocationPageSize);
   const totalItemCount = useTrustedAppsSelector(getListTotalItemsCount);
   const listItems = useTrustedAppsSelector(getListItems);
   const dispatch = useDispatch();
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.tsx
index 878818d9b77fe..d63cda5b513dc 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.tsx
@@ -15,27 +15,26 @@ import { TrustedAppsNotifications } from './trusted_apps_notifications';
 import { CreateTrustedAppFlyout } from './components/create_trusted_app_flyout';
 import { getTrustedAppsListPath } from '../../../common/routing';
 import { useTrustedAppsSelector } from './hooks';
-import { getListCurrentShowValue, getListUrlSearchParams } from '../store/selectors';
+import { getCurrentLocation } from '../store/selectors';
 import { TrustedAppsListPageRouteState } from '../../../../../common/endpoint/types';
 import { useNavigateToAppEventHandler } from '../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
 
 export const TrustedAppsPage = memo(() => {
   const history = useHistory();
   const { state: routeState } = useLocation<TrustedAppsListPageRouteState | undefined>();
-  const urlParams = useTrustedAppsSelector(getListUrlSearchParams);
-  const showAddFlout = useTrustedAppsSelector(getListCurrentShowValue) === 'create';
+  const location = useTrustedAppsSelector(getCurrentLocation);
   const handleAddButtonClick = useCallback(() => {
     history.push(
       getTrustedAppsListPath({
-        ...urlParams,
+        ...location,
         show: 'create',
       })
     );
-  }, [history, urlParams]);
+  }, [history, location]);
   const handleAddFlyoutClose = useCallback(() => {
-    const { show, ...paginationParamsOnly } = urlParams;
+    const { show, ...paginationParamsOnly } = location;
     history.push(getTrustedAppsListPath(paginationParamsOnly));
-  }, [history, urlParams]);
+  }, [history, location]);
 
   const backButton = useMemo(() => {
     if (routeState && routeState.onBackButtonNavigateTo) {
@@ -50,7 +49,7 @@ export const TrustedAppsPage = memo(() => {
     <EuiButton
       fill
       iconType="plusInCircle"
-      isDisabled={showAddFlout}
+      isDisabled={location.show === 'create'}
       onClick={handleAddButtonClick}
       data-test-subj="trustedAppsListAddButton"
     >
@@ -82,7 +81,7 @@ export const TrustedAppsPage = memo(() => {
     >
       <TrustedAppsNotifications />
       <TrustedAppDeletionDialog />
-      {showAddFlout && (
+      {location.show === 'create' && (
         <CreateTrustedAppFlyout
           onClose={handleAddFlyoutClose}
           size="s"
diff --git a/x-pack/plugins/security_solution/public/overview/components/recent_timelines/recent_timelines.tsx b/x-pack/plugins/security_solution/public/overview/components/recent_timelines/recent_timelines.tsx
index ddad72081645b..598849c917d33 100644
--- a/x-pack/plugins/security_solution/public/overview/components/recent_timelines/recent_timelines.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/recent_timelines/recent_timelines.tsx
@@ -12,7 +12,7 @@ import {
   EuiToolTip,
   EuiButtonIcon,
 } from '@elastic/eui';
-import React from 'react';
+import React, { useCallback, useMemo } from 'react';
 
 import { RecentTimelineHeader } from './header';
 import {
@@ -25,76 +25,110 @@ import { TimelineType } from '../../../../common/types/timeline';
 import { RecentTimelineCounts } from './counts';
 import * as i18n from './translations';
 
-export const RecentTimelines = React.memo<{
-  noTimelinesMessage: string;
+interface RecentTimelinesItemProps {
+  timeline: OpenTimelineResult;
   onOpenTimeline: OnOpenTimeline;
-  timelines: OpenTimelineResult[];
-}>(({ noTimelinesMessage, onOpenTimeline, timelines }) => {
-  if (timelines.length === 0) {
+  isLastItem: boolean;
+}
+
+const RecentTimelinesItem = React.memo<RecentTimelinesItemProps>(
+  ({ timeline, onOpenTimeline, isLastItem }) => {
+    const handleClick = useCallback(
+      () =>
+        onOpenTimeline({
+          duplicate: true,
+          timelineId: `${timeline.savedObjectId}`,
+        }),
+      [onOpenTimeline, timeline.savedObjectId]
+    );
+
+    const render = useCallback(
+      (showHoverContent) => (
+        <EuiFlexGroup gutterSize="none" justifyContent="spaceBetween">
+          <EuiFlexItem grow={false}>
+            <RecentTimelineHeader onOpenTimeline={onOpenTimeline} timeline={timeline} />
+            <RecentTimelineCounts timeline={timeline} />
+            {timeline.description && timeline.description.length && (
+              <EuiText color="subdued" size="xs">
+                {timeline.description}
+              </EuiText>
+            )}
+          </EuiFlexItem>
+
+          {showHoverContent && (
+            <EuiFlexItem grow={false}>
+              <EuiToolTip
+                content={
+                  timeline.timelineType === TimelineType.default
+                    ? i18n.OPEN_AS_DUPLICATE
+                    : i18n.OPEN_AS_DUPLICATE_TEMPLATE
+                }
+              >
+                <EuiButtonIcon
+                  aria-label={
+                    timeline.timelineType === TimelineType.default
+                      ? i18n.OPEN_AS_DUPLICATE
+                      : i18n.OPEN_AS_DUPLICATE_TEMPLATE
+                  }
+                  data-test-subj="open-duplicate"
+                  isDisabled={timeline.savedObjectId == null}
+                  iconSize="s"
+                  iconType="copy"
+                  onClick={handleClick}
+                  size="s"
+                />
+              </EuiToolTip>
+            </EuiFlexItem>
+          )}
+        </EuiFlexGroup>
+      ),
+      [handleClick, onOpenTimeline, timeline]
+    );
+
     return (
       <>
-        <EuiText color="subdued" size="s">
-          {noTimelinesMessage}
-        </EuiText>
+        <WithHoverActions render={render} />
+        <>{!isLastItem && <EuiSpacer size="l" />}</>
       </>
     );
   }
+);
 
-  return (
-    <>
-      {timelines.map((t, i) => (
-        <React.Fragment key={`${t.savedObjectId}-${i}`}>
-          <WithHoverActions
-            render={(showHoverContent) => (
-              <EuiFlexGroup gutterSize="none" justifyContent="spaceBetween">
-                <EuiFlexItem grow={false}>
-                  <RecentTimelineHeader onOpenTimeline={onOpenTimeline} timeline={t} />
-                  <RecentTimelineCounts timeline={t} />
-                  {t.description && t.description.length && (
-                    <EuiText color="subdued" size="xs">
-                      {t.description}
-                    </EuiText>
-                  )}
-                </EuiFlexItem>
+RecentTimelinesItem.displayName = 'RecentTimelinesItem';
 
-                {showHoverContent && (
-                  <EuiFlexItem grow={false}>
-                    <EuiToolTip
-                      content={
-                        t.timelineType === TimelineType.default
-                          ? i18n.OPEN_AS_DUPLICATE
-                          : i18n.OPEN_AS_DUPLICATE_TEMPLATE
-                      }
-                    >
-                      <EuiButtonIcon
-                        aria-label={
-                          t.timelineType === TimelineType.default
-                            ? i18n.OPEN_AS_DUPLICATE
-                            : i18n.OPEN_AS_DUPLICATE_TEMPLATE
-                        }
-                        data-test-subj="open-duplicate"
-                        isDisabled={t.savedObjectId == null}
-                        iconSize="s"
-                        iconType="copy"
-                        onClick={() =>
-                          onOpenTimeline({
-                            duplicate: true,
-                            timelineId: `${t.savedObjectId}`,
-                          })
-                        }
-                        size="s"
-                      />
-                    </EuiToolTip>
-                  </EuiFlexItem>
-                )}
-              </EuiFlexGroup>
-            )}
+interface RecentTimelinesProps {
+  noTimelinesMessage: string;
+  onOpenTimeline: OnOpenTimeline;
+  timelines: OpenTimelineResult[];
+}
+
+export const RecentTimelines = React.memo<RecentTimelinesProps>(
+  ({ noTimelinesMessage, onOpenTimeline, timelines }) => {
+    const content = useMemo(
+      () =>
+        timelines.map((timeline, index) => (
+          <RecentTimelinesItem
+            key={`${timeline.savedObjectId}-${timeline.title}`}
+            timeline={timeline}
+            onOpenTimeline={onOpenTimeline}
+            isLastItem={index === timelines.length - 1}
           />
-          <>{i !== timelines.length - 1 && <EuiSpacer size="l" />}</>
-        </React.Fragment>
-      ))}
-    </>
-  );
-});
+        )),
+      [onOpenTimeline, timelines]
+    );
+
+    if (timelines.length === 0) {
+      return (
+        <>
+          <EuiText color="subdued" size="s">
+            {noTimelinesMessage}
+          </EuiText>
+        </>
+      );
+    }
+
+    return <>{content}</>;
+  }
+);
 
 RecentTimelines.displayName = 'RecentTimelines';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/button/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/button/index.tsx
index 954ae0b6a0d40..72fa20c9f152d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/button/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/button/index.tsx
@@ -4,11 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { noop } from 'lodash/fp';
 import { EuiButton, EuiNotificationBadge, EuiPanel } from '@elastic/eui';
 import { rgba } from 'polished';
 import React, { useMemo } from 'react';
 import styled from 'styled-components';
+import deepEqual from 'fast-deep-equal';
 
 import { IS_DRAGGING_CLASS_NAME } from '../../../../common/components/drag_and_drop/helpers';
 import { DataProvider } from '../../timeline/data_providers/data_provider';
@@ -88,6 +88,18 @@ export const FlyoutButton = React.memo<FlyoutButtonProps>(
     const badgeCount = useMemo(() => getBadgeCount(dataProviders), [dataProviders]);
     const { browserFields } = useSourcererScope(SourcererScopeName.timeline);
 
+    const badgeStyles: React.CSSProperties = useMemo(
+      () => ({
+        left: '-9px',
+        position: 'relative',
+        top: '-6px',
+        transform: 'rotate(90deg)',
+        visibility: dataProviders.length !== 0 ? 'inherit' : 'hidden',
+        zIndex: 10,
+      }),
+      [dataProviders.length]
+    );
+
     if (!show) {
       return null;
     }
@@ -108,18 +120,7 @@ export const FlyoutButton = React.memo<FlyoutButtonProps>(
           >
             {i18n.FLYOUT_BUTTON}
           </EuiButton>
-          <EuiNotificationBadge
-            color="accent"
-            data-test-subj="badge"
-            style={{
-              left: '-9px',
-              position: 'relative',
-              top: '-6px',
-              transform: 'rotate(90deg)',
-              visibility: dataProviders.length !== 0 ? 'inherit' : 'hidden',
-              zIndex: 10,
-            }}
-          >
+          <EuiNotificationBadge color="accent" data-test-subj="badge" style={badgeStyles}>
             {badgeCount}
           </EuiNotificationBadge>
         </BadgeButtonContainer>
@@ -128,11 +129,6 @@ export const FlyoutButton = React.memo<FlyoutButtonProps>(
             browserFields={browserFields}
             timelineId={timelineId}
             dataProviders={dataProviders}
-            onDataProviderEdited={noop}
-            onDataProviderRemoved={noop}
-            onToggleDataProviderEnabled={noop}
-            onToggleDataProviderExcluded={noop}
-            onToggleDataProviderType={noop}
           />
         </DataProvidersPanel>
       </Container>
@@ -140,7 +136,7 @@ export const FlyoutButton = React.memo<FlyoutButtonProps>(
   },
   (prevProps, nextProps) =>
     prevProps.show === nextProps.show &&
-    prevProps.dataProviders === nextProps.dataProviders &&
+    deepEqual(prevProps.dataProviders, nextProps.dataProviders) &&
     prevProps.timelineId === nextProps.timelineId
 );
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx
index e4148b5581435..091bb41bc2080 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/formatted_ip/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { isArray, isEmpty, isString, uniq } from 'lodash/fp';
-import React from 'react';
+import React, { useCallback, useMemo } from 'react';
 
 import {
   DragEffects,
@@ -71,16 +71,25 @@ const NonDecoratedIpComponent: React.FC<{
   fieldName: string;
   truncate?: boolean;
   value: string | object | null | undefined;
-}> = ({ contextId, eventId, fieldName, truncate, value }) => (
-  <DraggableWrapper
-    dataProvider={getDataProvider({ contextId, eventId, fieldName, address: value })}
-    key={`non-decorated-ip-draggable-wrapper-${getUniqueId({
-      contextId,
-      eventId,
-      fieldName,
-      address: value,
-    })}`}
-    render={(dataProvider, _, snapshot) =>
+}> = ({ contextId, eventId, fieldName, truncate, value }) => {
+  const key = useMemo(
+    () =>
+      `non-decorated-ip-draggable-wrapper-${getUniqueId({
+        contextId,
+        eventId,
+        fieldName,
+        address: value,
+      })}`,
+    [contextId, eventId, fieldName, value]
+  );
+
+  const dataProviderProp = useMemo(
+    () => getDataProvider({ contextId, eventId, fieldName, address: value }),
+    [contextId, eventId, fieldName, value]
+  );
+
+  const render = useCallback(
+    (dataProvider, _, snapshot) =>
       snapshot.isDragging ? (
         <DragEffects>
           <Provider dataProvider={dataProvider} />
@@ -89,47 +98,107 @@ const NonDecoratedIpComponent: React.FC<{
         getOrEmptyTagFromValue(value)
       ) : (
         getOrEmptyTagFromValue(tryStringify(value))
-      )
-    }
-    truncate={truncate}
-  />
-);
+      ),
+    [value]
+  );
+
+  return (
+    <DraggableWrapper
+      dataProvider={dataProviderProp}
+      key={key}
+      render={render}
+      truncate={truncate}
+    />
+  );
+};
 
 const NonDecoratedIp = React.memo(NonDecoratedIpComponent);
 
-const AddressLinksComponent: React.FC<{
+interface AddressLinksItemProps extends Omit<AddressLinksProps, 'addresses'> {
+  address: string;
+}
+
+const AddressLinksItemComponent: React.FC<AddressLinksItemProps> = ({
+  address,
+  contextId,
+  eventId,
+  fieldName,
+  truncate,
+}) => {
+  const key = useMemo(
+    () =>
+      `address-links-draggable-wrapper-${getUniqueId({
+        contextId,
+        eventId,
+        fieldName,
+        address,
+      })}`,
+    [address, contextId, eventId, fieldName]
+  );
+
+  const dataProviderProp = useMemo(
+    () => getDataProvider({ contextId, eventId, fieldName, address }),
+    [address, contextId, eventId, fieldName]
+  );
+
+  const render = useCallback(
+    (_props, _provided, snapshot) =>
+      snapshot.isDragging ? (
+        <DragEffects>
+          <Provider dataProvider={dataProviderProp} />
+        </DragEffects>
+      ) : (
+        <NetworkDetailsLink data-test-subj="network-details" ip={address} />
+      ),
+    [address, dataProviderProp]
+  );
+
+  return (
+    <DraggableWrapper
+      dataProvider={dataProviderProp}
+      key={key}
+      render={render}
+      truncate={truncate}
+    />
+  );
+};
+
+const AddressLinksItem = React.memo(AddressLinksItemComponent);
+
+interface AddressLinksProps {
   addresses: string[];
   contextId: string;
   eventId: string;
   fieldName: string;
   truncate?: boolean;
-}> = ({ addresses, contextId, eventId, fieldName, truncate }) => (
-  <>
-    {uniq(addresses).map((address) => (
-      <DraggableWrapper
-        dataProvider={getDataProvider({ contextId, eventId, fieldName, address })}
-        key={`address-links-draggable-wrapper-${getUniqueId({
-          contextId,
-          eventId,
-          fieldName,
-          address,
-        })}`}
-        render={(_props, _provided, snapshot) =>
-          snapshot.isDragging ? (
-            <DragEffects>
-              <Provider
-                dataProvider={getDataProvider({ contextId, eventId, fieldName, address })}
-              />
-            </DragEffects>
-          ) : (
-            <NetworkDetailsLink data-test-subj="network-details" ip={address} />
-          )
-        }
-        truncate={truncate}
-      />
-    ))}
-  </>
-);
+}
+
+const AddressLinksComponent: React.FC<AddressLinksProps> = ({
+  addresses,
+  contextId,
+  eventId,
+  fieldName,
+  truncate,
+}) => {
+  const uniqAddresses = useMemo(() => uniq(addresses), [addresses]);
+
+  const content = useMemo(
+    () =>
+      uniqAddresses.map((address) => (
+        <AddressLinksItem
+          key={address}
+          address={address}
+          contextId={contextId}
+          eventId={eventId}
+          fieldName={fieldName}
+          truncate={truncate}
+        />
+      )),
+    [contextId, eventId, fieldName, truncate, uniqAddresses]
+  );
+
+  return <>{content}</>;
+};
 
 const AddressLinks = React.memo(AddressLinksComponent);
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/__snapshots__/timeline.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/__snapshots__/timeline.test.tsx.snap
index 18a648f2abfaa..153128fb41826 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/__snapshots__/timeline.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/__snapshots__/timeline.test.tsx.snap
@@ -646,34 +646,7 @@ In other use cases the message field can be used to concatenate different values
               dataProviders={
                 Array [
                   Object {
-                    "and": Array [
-                      Object {
-                        "and": Array [],
-                        "enabled": true,
-                        "excluded": false,
-                        "id": "id-Provider 2",
-                        "kqlQuery": "",
-                        "name": "Provider 2",
-                        "queryMatch": Object {
-                          "field": "name",
-                          "operator": ":",
-                          "value": "Provider 2",
-                        },
-                      },
-                      Object {
-                        "and": Array [],
-                        "enabled": true,
-                        "excluded": false,
-                        "id": "id-Provider 3",
-                        "kqlQuery": "",
-                        "name": "Provider 3",
-                        "queryMatch": Object {
-                          "field": "name",
-                          "operator": ":",
-                          "value": "Provider 3",
-                        },
-                      },
-                    ],
+                    "and": Array [],
                     "enabled": true,
                     "excluded": false,
                     "id": "id-Provider 1",
@@ -921,11 +894,6 @@ In other use cases the message field can be used to concatenate different values
               loadingSourcerer={false}
               onChangeItemsPerPage={[MockFunction]}
               onClose={[MockFunction]}
-              onDataProviderEdited={[MockFunction]}
-              onDataProviderRemoved={[MockFunction]}
-              onToggleDataProviderEnabled={[MockFunction]}
-              onToggleDataProviderExcluded={[MockFunction]}
-              onToggleDataProviderType={[MockFunction]}
               show={true}
               showCallOutUnauthorizedMsg={false}
               sort={
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/auto_save_warning/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/auto_save_warning/index.tsx
index 210af7a571569..98faa84db851e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/auto_save_warning/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/auto_save_warning/index.tsx
@@ -11,84 +11,69 @@ import {
   EuiGlobalToastListToast as Toast,
 } from '@elastic/eui';
 import { getOr } from 'lodash/fp';
-import React from 'react';
-import { connect, ConnectedProps } from 'react-redux';
+import React, { useCallback, useMemo } from 'react';
+import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 
-import { State } from '../../../../common/store';
-import { setTimelineRangeDatePicker as dispatchSetTimelineRangeDatePicker } from '../../../../common/store/inputs/actions';
+import { setTimelineRangeDatePicker } from '../../../../common/store/inputs/actions';
 import { timelineActions, timelineSelectors } from '../../../store/timeline';
-import { AutoSavedWarningMsg } from '../../../store/timeline/types';
 import { useStateToaster } from '../../../../common/components/toasters';
 import * as i18n from './translations';
 
-const AutoSaveWarningMsgComponent = React.memo<PropsFromRedux>(
-  ({
-    newTimelineModel,
-    setTimelineRangeDatePicker,
-    timelineId,
-    updateAutoSaveMsg,
-    updateTimeline,
-  }) => {
-    const dispatchToaster = useStateToaster()[1];
+const AutoSaveWarningMsgComponent = () => {
+  const dispatch = useDispatch();
+  const dispatchToaster = useStateToaster()[1];
+  const { timelineId, newTimelineModel } = useSelector(
+    timelineSelectors.autoSaveMsgSelector,
+    shallowEqual
+  );
+
+  const handleClick = useCallback(() => {
     if (timelineId != null && newTimelineModel != null) {
-      const toast: Toast = {
-        id: 'AutoSaveWarningMsg',
-        title: i18n.TITLE,
-        color: 'warning',
-        iconType: 'alert',
-        toastLifeTimeMs: 10000,
-        text: (
-          <>
-            <p>{i18n.DESCRIPTION}</p>
-            <EuiFlexGroup justifyContent="flexEnd" gutterSize="s">
-              <EuiFlexItem grow={false}>
-                <EuiButton
-                  size="s"
-                  onClick={() => {
-                    updateTimeline({ id: timelineId, timeline: newTimelineModel });
-                    updateAutoSaveMsg({ timelineId: null, newTimelineModel: null });
-                    setTimelineRangeDatePicker({
-                      from: getOr(0, 'dateRange.start', newTimelineModel),
-                      to: getOr(0, 'dateRange.end', newTimelineModel),
-                    });
-                  }}
-                >
-                  {i18n.REFRESH_TIMELINE}
-                </EuiButton>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </>
-        ),
-      };
-      dispatchToaster({
-        type: 'addToaster',
-        toast,
-      });
+      dispatch(timelineActions.updateTimeline({ id: timelineId, timeline: newTimelineModel }));
+      dispatch(timelineActions.updateAutoSaveMsg({ timelineId: null, newTimelineModel: null }));
+      dispatch(
+        setTimelineRangeDatePicker({
+          from: getOr(0, 'dateRange.start', newTimelineModel),
+          to: getOr(0, 'dateRange.end', newTimelineModel),
+        })
+      );
     }
+  }, [dispatch, newTimelineModel, timelineId]);
 
-    return null;
-  }
-);
-
-AutoSaveWarningMsgComponent.displayName = 'AutoSaveWarningMsgComponent';
-
-const mapStateToProps = (state: State) => {
-  const autoSaveMessage: AutoSavedWarningMsg = timelineSelectors.autoSaveMsgSelector(state);
+  const TextComponent = useMemo(
+    () => (
+      <>
+        <p>{i18n.DESCRIPTION}</p>
+        <EuiFlexGroup justifyContent="flexEnd" gutterSize="s">
+          <EuiFlexItem grow={false}>
+            <EuiButton size="s" onClick={handleClick}>
+              {i18n.REFRESH_TIMELINE}
+            </EuiButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </>
+    ),
+    [handleClick]
+  );
 
-  return {
-    timelineId: autoSaveMessage.timelineId,
-    newTimelineModel: autoSaveMessage.newTimelineModel,
-  };
-};
+  if (timelineId != null && newTimelineModel != null) {
+    const toast: Toast = {
+      id: 'AutoSaveWarningMsg',
+      title: i18n.TITLE,
+      color: 'warning',
+      iconType: 'alert',
+      toastLifeTimeMs: 10000,
+      text: TextComponent,
+    };
+    dispatchToaster({
+      type: 'addToaster',
+      toast,
+    });
+  }
 
-const mapDispatchToProps = {
-  setTimelineRangeDatePicker: dispatchSetTimelineRangeDatePicker,
-  updateAutoSaveMsg: timelineActions.updateAutoSaveMsg,
-  updateTimeline: timelineActions.updateTimeline,
+  return null;
 };
 
-const connector = connect(mapStateToProps, mapDispatchToProps);
-
-type PropsFromRedux = ConnectedProps<typeof connector>;
+AutoSaveWarningMsgComponent.displayName = 'AutoSaveWarningMsgComponent';
 
-export const AutoSaveWarningMsg = connector(AutoSaveWarningMsgComponent);
+export const AutoSaveWarningMsg = React.memo(AutoSaveWarningMsgComponent);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/actions/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/actions/index.tsx
index 3352639fa95f8..c4c4e0e0c7065 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/actions/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/actions/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiButtonIcon } from '@elastic/eui';
-import React from 'react';
+import React, { useCallback } from 'react';
 
 import { ColumnHeaderOptions } from '../../../../../../timelines/store/timeline/model';
 import { OnColumnRemoved } from '../../../events';
@@ -26,20 +26,27 @@ interface Props {
 export const CloseButton = React.memo<{
   columnId: string;
   onColumnRemoved: OnColumnRemoved;
-}>(({ columnId, onColumnRemoved }) => (
-  <EuiButtonIcon
-    aria-label={i18n.REMOVE_COLUMN}
-    color="text"
-    data-test-subj="remove-column"
-    iconType="cross"
-    onClick={(event: React.MouseEvent<HTMLButtonElement>) => {
+}>(({ columnId, onColumnRemoved }) => {
+  const handleClick = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
       // To avoid a re-sorting when you delete a column
       event.preventDefault();
       event.stopPropagation();
       onColumnRemoved(columnId);
-    }}
-  />
-));
+    },
+    [columnId, onColumnRemoved]
+  );
+
+  return (
+    <EuiButtonIcon
+      aria-label={i18n.REMOVE_COLUMN}
+      color="text"
+      data-test-subj="remove-column"
+      iconType="cross"
+      onClick={handleClick}
+    />
+  );
+});
 
 CloseButton.displayName = 'CloseButton';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/column_header.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/column_header.tsx
index 617b2935ee75c..6e21446944573 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/column_header.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/column_header.tsx
@@ -78,6 +78,29 @@ const ColumnHeaderComponent: React.FC<ColumneHeaderProps> = ({
     [timelineId, header.id]
   );
 
+  const DraggableContent = useCallback(
+    (dragProvided) => (
+      <EventsTh
+        data-test-subj="draggable-header"
+        {...dragProvided.draggableProps}
+        {...dragProvided.dragHandleProps}
+        ref={dragProvided.innerRef}
+      >
+        <EventsThContent>
+          <Header
+            timelineId={timelineId}
+            header={header}
+            onColumnRemoved={onColumnRemoved}
+            onColumnSorted={onColumnSorted}
+            onFilterChange={onFilterChange}
+            sort={sort}
+          />
+        </EventsThContent>
+      </EventsTh>
+    ),
+    [header, onColumnRemoved, onColumnSorted, onFilterChange, sort, timelineId]
+  );
+
   return (
     <Resizable
       enable={RESIZABLE_ENABLE}
@@ -94,25 +117,7 @@ const ColumnHeaderComponent: React.FC<ColumneHeaderProps> = ({
         index={draggableIndex}
         key={header.id}
       >
-        {(dragProvided) => (
-          <EventsTh
-            data-test-subj="draggable-header"
-            {...dragProvided.draggableProps}
-            {...dragProvided.dragHandleProps}
-            ref={dragProvided.innerRef}
-          >
-            <EventsThContent>
-              <Header
-                timelineId={timelineId}
-                header={header}
-                onColumnRemoved={onColumnRemoved}
-                onColumnSorted={onColumnSorted}
-                onFilterChange={onFilterChange}
-                sort={sort}
-              />
-            </EventsThContent>
-          </EventsTh>
-        )}
+        {DraggableContent}
       </Draggable>
     </Resizable>
   );
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx
index 6e802053ab29f..f4d4cf29ba38b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx
@@ -200,6 +200,22 @@ export const ColumnHeadersComponent = ({
     [globalFullScreen, timelineId, timelineFullScreen]
   );
 
+  const DroppableContent = useCallback(
+    (dropProvided, snapshot) => (
+      <>
+        <EventsThGroupData
+          data-test-subj="headers-group"
+          ref={dropProvided.innerRef}
+          isDragging={snapshot.isDraggingOver}
+          {...dropProvided.droppableProps}
+        >
+          {ColumnHeaderList}
+        </EventsThGroupData>
+      </>
+    ),
+    [ColumnHeaderList]
+  );
+
   return (
     <EventsThead data-test-subj="column-headers">
       <EventsTrHeader>
@@ -275,18 +291,7 @@ export const ColumnHeadersComponent = ({
           type={DRAG_TYPE_FIELD}
           renderClone={renderClone}
         >
-          {(dropProvided, snapshot) => (
-            <>
-              <EventsThGroupData
-                data-test-subj="headers-group"
-                ref={dropProvided.innerRef}
-                isDragging={snapshot.isDraggingOver}
-                {...dropProvided.droppableProps}
-              >
-                {ColumnHeaderList}
-              </EventsThGroupData>
-            </>
-          )}
+          {DroppableContent}
         </Droppable>
       </EventsTrHeader>
     </EventsThead>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx
index 3b6585013c8d3..df5c48ad012a6 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx
@@ -151,13 +151,17 @@ export const EventColumnView = React.memo<Props>(
               />,
             ]
           : []),
-        <AlertContextMenu
-          key="alert-context-menu"
-          ecsRowData={ecsData}
-          timelineId={timelineId}
-          disabled={eventType !== 'signal'}
-          refetch={refetch}
-        />,
+        ...(eventType !== 'raw'
+          ? [
+              <AlertContextMenu
+                key="alert-context-menu"
+                ecsRowData={ecsData}
+                timelineId={timelineId}
+                disabled={eventType !== 'signal'}
+                refetch={refetch}
+              />,
+            ]
+          : []),
       ],
       [
         associateNote,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
index d71af86c80247..ee68c270e9aba 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
@@ -97,6 +97,8 @@ const TOP_OFFSET = 50;
  */
 const BOTTOM_OFFSET = -500;
 
+const VISIBILITY_SENSOR_OFFSET = { top: TOP_OFFSET, bottom: BOTTOM_OFFSET };
+
 const emptyNotes: string[] = [];
 
 const EventsTrSupplementContainerWrapper = React.memo(({ children }) => {
@@ -173,105 +175,145 @@ const StatefulEventComponent: React.FC<Props> = ({
   // Number of current columns plus one for actions.
   const columnCount = columnHeaders.length + 1;
 
+  const VisibilitySensorContent = useCallback(
+    ({ isVisible }) => {
+      if (isVisible || disableSensorVisibility) {
+        return (
+          <EventsTrGroup
+            className={STATEFUL_EVENT_CSS_CLASS_NAME}
+            data-test-subj="event"
+            eventType={getEventType(event.ecs)}
+            showLeftBorder={!isEventViewer}
+            ref={divElement}
+          >
+            <EventColumnView
+              id={event._id}
+              actionsColumnWidth={actionsColumnWidth}
+              associateNote={associateNote}
+              columnHeaders={columnHeaders}
+              columnRenderers={columnRenderers}
+              data={event.data}
+              ecsData={event.ecs}
+              expanded={!!expanded[event._id]}
+              eventIdToNoteIds={eventIdToNoteIds}
+              getNotesByIds={getNotesByIds}
+              isEventPinned={isEventPinned}
+              isEventViewer={isEventViewer}
+              loading={loading}
+              loadingEventIds={loadingEventIds}
+              onColumnResized={onColumnResized}
+              onEventToggled={onToggleExpanded}
+              onPinEvent={onPinEvent}
+              onRowSelected={onRowSelected}
+              onUnPinEvent={onUnPinEvent}
+              refetch={refetch}
+              selectedEventIds={selectedEventIds}
+              showCheckboxes={showCheckboxes}
+              showNotes={!!showNotes[event._id]}
+              timelineId={timelineId}
+              toggleShowNotes={onToggleShowNotes}
+              updateNote={updateNote}
+            />
+
+            <EventsTrSupplementContainerWrapper>
+              <EventsTrSupplement
+                className="siemEventsTable__trSupplement--notes"
+                data-test-subj="event-notes-flex-item"
+              >
+                <NoteCards
+                  associateNote={associateNote}
+                  data-test-subj="note-cards"
+                  getNewNoteId={getNewNoteId}
+                  getNotesByIds={getNotesByIds}
+                  noteIds={eventIdToNoteIds[event._id] || emptyNotes}
+                  showAddNote={!!showNotes[event._id]}
+                  status={timelineStatus}
+                  toggleShowAddNote={onToggleShowNotes}
+                  updateNote={updateNote}
+                />
+              </EventsTrSupplement>
+
+              {getRowRenderer(event.ecs, rowRenderers).renderRow({
+                browserFields,
+                data: event.ecs,
+                timelineId,
+              })}
+
+              <EventsTrSupplement
+                className="siemEventsTable__trSupplement--attributes"
+                data-test-subj="event-details"
+              >
+                <ExpandableEvent
+                  browserFields={browserFields}
+                  columnHeaders={columnHeaders}
+                  event={detailsData || emptyDetails}
+                  forceExpand={!!expanded[event._id] && !loading}
+                  id={event._id}
+                  onEventToggled={onToggleExpanded}
+                  onUpdateColumns={onUpdateColumns}
+                  timelineId={timelineId}
+                  toggleColumn={toggleColumn}
+                />
+              </EventsTrSupplement>
+            </EventsTrSupplementContainerWrapper>
+          </EventsTrGroup>
+        );
+      } else {
+        // Height place holder for visibility detection as well as re-rendering sections.
+        const height =
+          divElement.current != null && divElement.current!.clientHeight
+            ? `${divElement.current!.clientHeight}px`
+            : DEFAULT_ROW_HEIGHT;
+
+        return <SkeletonRow cellCount={columnCount} rowHeight={height} />;
+      }
+    },
+    [
+      actionsColumnWidth,
+      associateNote,
+      browserFields,
+      columnCount,
+      columnHeaders,
+      columnRenderers,
+      detailsData,
+      disableSensorVisibility,
+      event._id,
+      event.data,
+      event.ecs,
+      eventIdToNoteIds,
+      expanded,
+      getNotesByIds,
+      isEventPinned,
+      isEventViewer,
+      loading,
+      loadingEventIds,
+      onColumnResized,
+      onPinEvent,
+      onRowSelected,
+      onToggleExpanded,
+      onToggleShowNotes,
+      onUnPinEvent,
+      onUpdateColumns,
+      refetch,
+      rowRenderers,
+      selectedEventIds,
+      showCheckboxes,
+      showNotes,
+      timelineId,
+      timelineStatus,
+      toggleColumn,
+      updateNote,
+    ]
+  );
+
   return (
     <VisibilitySensor
       partialVisibility={true}
       scrollCheck={true}
       containment={containerElementRef}
-      offset={{ top: TOP_OFFSET, bottom: BOTTOM_OFFSET }}
+      offset={VISIBILITY_SENSOR_OFFSET}
     >
-      {({ isVisible }) => {
-        if (isVisible || disableSensorVisibility) {
-          return (
-            <EventsTrGroup
-              className={STATEFUL_EVENT_CSS_CLASS_NAME}
-              data-test-subj="event"
-              eventType={getEventType(event.ecs)}
-              showLeftBorder={!isEventViewer}
-              ref={divElement}
-            >
-              <EventColumnView
-                id={event._id}
-                actionsColumnWidth={actionsColumnWidth}
-                associateNote={associateNote}
-                columnHeaders={columnHeaders}
-                columnRenderers={columnRenderers}
-                data={event.data}
-                ecsData={event.ecs}
-                expanded={!!expanded[event._id]}
-                eventIdToNoteIds={eventIdToNoteIds}
-                getNotesByIds={getNotesByIds}
-                isEventPinned={isEventPinned}
-                isEventViewer={isEventViewer}
-                loading={loading}
-                loadingEventIds={loadingEventIds}
-                onColumnResized={onColumnResized}
-                onEventToggled={onToggleExpanded}
-                onPinEvent={onPinEvent}
-                onRowSelected={onRowSelected}
-                onUnPinEvent={onUnPinEvent}
-                refetch={refetch}
-                selectedEventIds={selectedEventIds}
-                showCheckboxes={showCheckboxes}
-                showNotes={!!showNotes[event._id]}
-                timelineId={timelineId}
-                toggleShowNotes={onToggleShowNotes}
-                updateNote={updateNote}
-              />
-
-              <EventsTrSupplementContainerWrapper>
-                <EventsTrSupplement
-                  className="siemEventsTable__trSupplement--notes"
-                  data-test-subj="event-notes-flex-item"
-                >
-                  <NoteCards
-                    associateNote={associateNote}
-                    data-test-subj="note-cards"
-                    getNewNoteId={getNewNoteId}
-                    getNotesByIds={getNotesByIds}
-                    noteIds={eventIdToNoteIds[event._id] || emptyNotes}
-                    showAddNote={!!showNotes[event._id]}
-                    status={timelineStatus}
-                    toggleShowAddNote={onToggleShowNotes}
-                    updateNote={updateNote}
-                  />
-                </EventsTrSupplement>
-
-                {getRowRenderer(event.ecs, rowRenderers).renderRow({
-                  browserFields,
-                  data: event.ecs,
-                  timelineId,
-                })}
-
-                <EventsTrSupplement
-                  className="siemEventsTable__trSupplement--attributes"
-                  data-test-subj="event-details"
-                >
-                  <ExpandableEvent
-                    browserFields={browserFields}
-                    columnHeaders={columnHeaders}
-                    event={detailsData || emptyDetails}
-                    forceExpand={!!expanded[event._id] && !loading}
-                    id={event._id}
-                    onEventToggled={onToggleExpanded}
-                    onUpdateColumns={onUpdateColumns}
-                    timelineId={timelineId}
-                    toggleColumn={toggleColumn}
-                  />
-                </EventsTrSupplement>
-              </EventsTrSupplementContainerWrapper>
-            </EventsTrGroup>
-          );
-        } else {
-          // Height place holder for visibility detection as well as re-rendering sections.
-          const height =
-            divElement.current != null && divElement.current!.clientHeight
-              ? `${divElement.current!.clientHeight}px`
-              : DEFAULT_ROW_HEIGHT;
-
-          return <SkeletonRow cellCount={columnCount} rowHeight={height} />;
-        }
-      }}
+      {VisibilitySensorContent}
     </VisibilitySensor>
   );
 };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_signature.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_signature.tsx
index 1cd78178d017f..5d4821757d774 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_signature.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_signature.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
-import React from 'react';
+import React, { useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 
 import {
@@ -19,7 +19,7 @@ import { Provider } from '../../../data_providers/provider';
 import { TokensFlexItem } from '../helpers';
 import { getBeginningTokens } from './suricata_links';
 import { DefaultDraggable } from '../../../../../../common/components/draggables';
-import { IS_OPERATOR } from '../../../data_providers/data_provider';
+import { IS_OPERATOR, QueryOperator } from '../../../data_providers/data_provider';
 
 export const SURICATA_SIGNATURE_FIELD_NAME = 'suricata.eve.alert.signature';
 export const SURICATA_SIGNATURE_ID_FIELD_NAME = 'suricata.eve.alert.signature_id';
@@ -57,41 +57,49 @@ export const Tokens = React.memo<{ tokens: string[] }>(({ tokens }) => (
 Tokens.displayName = 'Tokens';
 
 export const DraggableSignatureId = React.memo<{ id: string; signatureId: number }>(
-  ({ id, signatureId }) => (
-    <SignatureFlexItem grow={false}>
-      <DraggableWrapper
-        dataProvider={{
-          and: [],
-          enabled: true,
-          id: escapeDataProviderId(`suricata-draggable-signature-id-${id}-sig-${signatureId}`),
-          name: String(signatureId),
-          excluded: false,
-          kqlQuery: '',
-          queryMatch: {
-            field: SURICATA_SIGNATURE_ID_FIELD_NAME,
-            value: signatureId,
-            operator: IS_OPERATOR,
-          },
-        }}
-        render={(dataProvider, _, snapshot) =>
-          snapshot.isDragging ? (
-            <DragEffects>
-              <Provider dataProvider={dataProvider} />
-            </DragEffects>
-          ) : (
-            <EuiToolTip
-              data-test-subj="signature-id-tooltip"
-              content={SURICATA_SIGNATURE_ID_FIELD_NAME}
-            >
-              <Badge iconType="number" color="hollow" title="">
-                {signatureId}
-              </Badge>
-            </EuiToolTip>
-          )
-        }
-      />
-    </SignatureFlexItem>
-  )
+  ({ id, signatureId }) => {
+    const dataProviderProp = useMemo(
+      () => ({
+        and: [],
+        enabled: true,
+        id: escapeDataProviderId(`suricata-draggable-signature-id-${id}-sig-${signatureId}`),
+        name: String(signatureId),
+        excluded: false,
+        kqlQuery: '',
+        queryMatch: {
+          field: SURICATA_SIGNATURE_ID_FIELD_NAME,
+          value: signatureId,
+          operator: IS_OPERATOR as QueryOperator,
+        },
+      }),
+      [id, signatureId]
+    );
+
+    const render = useCallback(
+      (dataProvider, _, snapshot) =>
+        snapshot.isDragging ? (
+          <DragEffects>
+            <Provider dataProvider={dataProvider} />
+          </DragEffects>
+        ) : (
+          <EuiToolTip
+            data-test-subj="signature-id-tooltip"
+            content={SURICATA_SIGNATURE_ID_FIELD_NAME}
+          >
+            <Badge iconType="number" color="hollow" title="">
+              {signatureId}
+            </Badge>
+          </EuiToolTip>
+        ),
+      [signatureId]
+    );
+
+    return (
+      <SignatureFlexItem grow={false}>
+        <DraggableWrapper dataProvider={dataProviderProp} render={render} />
+      </SignatureFlexItem>
+    );
+  }
 );
 
 DraggableSignatureId.displayName = 'DraggableSignatureId';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.tsx
index 07e32a9a4e5d1..9ef579706f118 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.tsx
@@ -6,7 +6,7 @@
 
 import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import React from 'react';
+import React, { useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 
 import { Ecs } from '../../../../../../../common/ecs';
@@ -17,7 +17,7 @@ import {
 import { escapeDataProviderId } from '../../../../../../common/components/drag_and_drop/helpers';
 import { GoogleLink, ReputationLink } from '../../../../../../common/components/links';
 import { Provider } from '../../../data_providers/provider';
-import { IS_OPERATOR } from '../../../data_providers/data_provider';
+import { IS_OPERATOR, QueryOperator } from '../../../data_providers/data_provider';
 
 import * as i18n from './translations';
 
@@ -68,42 +68,46 @@ export const DraggableZeekElement = React.memo<{
   field: string;
   value: string | null | undefined;
   stringRenderer?: StringRenderer;
-}>(({ id, field, value, stringRenderer = defaultStringRenderer }) =>
-  value != null ? (
+}>(({ id, field, value, stringRenderer = defaultStringRenderer }) => {
+  const dataProviderProp = useMemo(
+    () => ({
+      and: [],
+      enabled: true,
+      id: escapeDataProviderId(`draggable-zeek-element-draggable-wrapper-${id}-${field}-${value}`),
+      name: value!,
+      excluded: false,
+      kqlQuery: '',
+      queryMatch: {
+        field,
+        value: value!,
+        operator: IS_OPERATOR as QueryOperator,
+      },
+    }),
+    [field, id, value]
+  );
+
+  const render = useCallback(
+    (dataProvider, _, snapshot) =>
+      snapshot.isDragging ? (
+        <DragEffects>
+          <Provider dataProvider={dataProvider} />
+        </DragEffects>
+      ) : (
+        <EuiToolTip data-test-subj="badge-tooltip" content={field}>
+          <Badge iconType="tag" color="hollow" title="">
+            {stringRenderer(value!)}
+          </Badge>
+        </EuiToolTip>
+      ),
+    [field, stringRenderer, value]
+  );
+
+  return value != null ? (
     <TokensFlexItem grow={false}>
-      <DraggableWrapper
-        dataProvider={{
-          and: [],
-          enabled: true,
-          id: escapeDataProviderId(
-            `draggable-zeek-element-draggable-wrapper-${id}-${field}-${value}`
-          ),
-          name: value,
-          excluded: false,
-          kqlQuery: '',
-          queryMatch: {
-            field,
-            value,
-            operator: IS_OPERATOR,
-          },
-        }}
-        render={(dataProvider, _, snapshot) =>
-          snapshot.isDragging ? (
-            <DragEffects>
-              <Provider dataProvider={dataProvider} />
-            </DragEffects>
-          ) : (
-            <EuiToolTip data-test-subj="badge-tooltip" content={field}>
-              <Badge iconType="tag" color="hollow" title="">
-                {stringRenderer(value)}
-              </Badge>
-            </EuiToolTip>
-          )
-        }
-      />
+      <DraggableWrapper dataProvider={dataProviderProp} render={render} />
     </TokensFlexItem>
-  ) : null
-);
+  ) : null;
+});
 
 DraggableZeekElement.displayName = 'DraggableZeekElement';
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/__snapshots__/data_providers.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/__snapshots__/data_providers.test.tsx.snap
index 14304b99263ac..a8818517fb94b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/__snapshots__/data_providers.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/__snapshots__/data_providers.test.tsx.snap
@@ -144,11 +144,6 @@ exports[`DataProviders rendering renders correctly against snapshot 1`] = `
           },
         ]
       }
-      onDataProviderEdited={[MockFunction]}
-      onDataProviderRemoved={[MockFunction]}
-      onToggleDataProviderEnabled={[MockFunction]}
-      onToggleDataProviderExcluded={[MockFunction]}
-      onToggleDataProviderType={[MockFunction]}
       timelineId="foo"
     />
   </DropTargetDataProviders>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/__snapshots__/providers.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/__snapshots__/providers.test.tsx.snap
index a86c99cbc094a..281a26b08df67 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/__snapshots__/providers.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/__snapshots__/providers.test.tsx.snap
@@ -2,556 +2,1717 @@
 
 exports[`Providers rendering renders correctly against snapshot 1`] = `
 <div>
-  <EuiFlexGroup
-    alignItems="center"
-    gutterSize="none"
-  >
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.div
-        hideBadge={true}
-      >
-        <AndOrBadge
-          type="or"
-        />
-      </styled.div>
-    </Styled(EuiFlexItem)>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        (
-      </styled.span>
-    </Styled(EuiFlexItem)>
-    <EuiFlexItem
-      grow={false}
-    >
-      <Connect(Droppable)
-        direction="horizontal"
-        droppableId="droppableId.timelineProviders.foo.group.0"
-        getContainerForClone={[Function]}
-        ignoreContainerClipping={false}
-        isCombineEnabled={false}
-        isDropDisabled={false}
-        mode="standard"
-        renderClone={null}
-        type="DEFAULT"
-      >
-        <Component />
-      </Connect(Droppable)>
-    </EuiFlexItem>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        )
-      </styled.span>
-    </Styled(EuiFlexItem)>
-  </EuiFlexGroup>
-  <EuiSpacer
-    size="xs"
+  <DataProvidersGroup
+    browserFields={Object {}}
+    dataProviders={
+      Array [
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 1",
+          "kqlQuery": "",
+          "name": "Provider 1",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 1",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 2",
+          "kqlQuery": "",
+          "name": "Provider 2",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 2",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 3",
+          "kqlQuery": "",
+          "name": "Provider 3",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 3",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 4",
+          "kqlQuery": "",
+          "name": "Provider 4",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 4",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 5",
+          "kqlQuery": "",
+          "name": "Provider 5",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 5",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 6",
+          "kqlQuery": "",
+          "name": "Provider 6",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 6",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 7",
+          "kqlQuery": "",
+          "name": "Provider 7",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 7",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 8",
+          "kqlQuery": "",
+          "name": "Provider 8",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 8",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 9",
+          "kqlQuery": "",
+          "name": "Provider 9",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 9",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 10",
+          "kqlQuery": "",
+          "name": "Provider 10",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 10",
+          },
+        },
+      ]
+    }
+    group={
+      Array [
+        Object {
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 1",
+          "kqlQuery": "",
+          "name": "Provider 1",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 1",
+          },
+        },
+      ]
+    }
+    groupIndex={0}
+    isLastGroup={false}
+    key="droppable-0"
+    timelineId="test"
   />
-  <EuiFlexGroup
-    alignItems="center"
-    gutterSize="none"
-  >
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.div
-        hideBadge={false}
-      >
-        <AndOrBadge
-          type="or"
-        />
-      </styled.div>
-    </Styled(EuiFlexItem)>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        (
-      </styled.span>
-    </Styled(EuiFlexItem)>
-    <EuiFlexItem
-      grow={false}
-    >
-      <Connect(Droppable)
-        direction="horizontal"
-        droppableId="droppableId.timelineProviders.foo.group.1"
-        getContainerForClone={[Function]}
-        ignoreContainerClipping={false}
-        isCombineEnabled={false}
-        isDropDisabled={false}
-        mode="standard"
-        renderClone={null}
-        type="DEFAULT"
-      >
-        <Component />
-      </Connect(Droppable)>
-    </EuiFlexItem>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        )
-      </styled.span>
-    </Styled(EuiFlexItem)>
-  </EuiFlexGroup>
-  <EuiSpacer
-    size="xs"
+  <DataProvidersGroup
+    browserFields={Object {}}
+    dataProviders={
+      Array [
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 1",
+          "kqlQuery": "",
+          "name": "Provider 1",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 1",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 2",
+          "kqlQuery": "",
+          "name": "Provider 2",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 2",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 3",
+          "kqlQuery": "",
+          "name": "Provider 3",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 3",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 4",
+          "kqlQuery": "",
+          "name": "Provider 4",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 4",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 5",
+          "kqlQuery": "",
+          "name": "Provider 5",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 5",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 6",
+          "kqlQuery": "",
+          "name": "Provider 6",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 6",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 7",
+          "kqlQuery": "",
+          "name": "Provider 7",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 7",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 8",
+          "kqlQuery": "",
+          "name": "Provider 8",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 8",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 9",
+          "kqlQuery": "",
+          "name": "Provider 9",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 9",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 10",
+          "kqlQuery": "",
+          "name": "Provider 10",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 10",
+          },
+        },
+      ]
+    }
+    group={
+      Array [
+        Object {
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 2",
+          "kqlQuery": "",
+          "name": "Provider 2",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 2",
+          },
+        },
+      ]
+    }
+    groupIndex={1}
+    isLastGroup={false}
+    key="droppable-1"
+    timelineId="test"
   />
-  <EuiFlexGroup
-    alignItems="center"
-    gutterSize="none"
-  >
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.div
-        hideBadge={false}
-      >
-        <AndOrBadge
-          type="or"
-        />
-      </styled.div>
-    </Styled(EuiFlexItem)>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        (
-      </styled.span>
-    </Styled(EuiFlexItem)>
-    <EuiFlexItem
-      grow={false}
-    >
-      <Connect(Droppable)
-        direction="horizontal"
-        droppableId="droppableId.timelineProviders.foo.group.2"
-        getContainerForClone={[Function]}
-        ignoreContainerClipping={false}
-        isCombineEnabled={false}
-        isDropDisabled={false}
-        mode="standard"
-        renderClone={null}
-        type="DEFAULT"
-      >
-        <Component />
-      </Connect(Droppable)>
-    </EuiFlexItem>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        )
-      </styled.span>
-    </Styled(EuiFlexItem)>
-  </EuiFlexGroup>
-  <EuiSpacer
-    size="xs"
+  <DataProvidersGroup
+    browserFields={Object {}}
+    dataProviders={
+      Array [
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 1",
+          "kqlQuery": "",
+          "name": "Provider 1",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 1",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 2",
+          "kqlQuery": "",
+          "name": "Provider 2",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 2",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 3",
+          "kqlQuery": "",
+          "name": "Provider 3",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 3",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 4",
+          "kqlQuery": "",
+          "name": "Provider 4",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 4",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 5",
+          "kqlQuery": "",
+          "name": "Provider 5",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 5",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 6",
+          "kqlQuery": "",
+          "name": "Provider 6",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 6",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 7",
+          "kqlQuery": "",
+          "name": "Provider 7",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 7",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 8",
+          "kqlQuery": "",
+          "name": "Provider 8",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 8",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 9",
+          "kqlQuery": "",
+          "name": "Provider 9",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 9",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 10",
+          "kqlQuery": "",
+          "name": "Provider 10",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 10",
+          },
+        },
+      ]
+    }
+    group={
+      Array [
+        Object {
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 3",
+          "kqlQuery": "",
+          "name": "Provider 3",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 3",
+          },
+        },
+      ]
+    }
+    groupIndex={2}
+    isLastGroup={false}
+    key="droppable-2"
+    timelineId="test"
   />
-  <EuiFlexGroup
-    alignItems="center"
-    gutterSize="none"
-  >
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.div
-        hideBadge={false}
-      >
-        <AndOrBadge
-          type="or"
-        />
-      </styled.div>
-    </Styled(EuiFlexItem)>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        (
-      </styled.span>
-    </Styled(EuiFlexItem)>
-    <EuiFlexItem
-      grow={false}
-    >
-      <Connect(Droppable)
-        direction="horizontal"
-        droppableId="droppableId.timelineProviders.foo.group.3"
-        getContainerForClone={[Function]}
-        ignoreContainerClipping={false}
-        isCombineEnabled={false}
-        isDropDisabled={false}
-        mode="standard"
-        renderClone={null}
-        type="DEFAULT"
-      >
-        <Component />
-      </Connect(Droppable)>
-    </EuiFlexItem>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        )
-      </styled.span>
-    </Styled(EuiFlexItem)>
-  </EuiFlexGroup>
-  <EuiSpacer
-    size="xs"
+  <DataProvidersGroup
+    browserFields={Object {}}
+    dataProviders={
+      Array [
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 1",
+          "kqlQuery": "",
+          "name": "Provider 1",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 1",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 2",
+          "kqlQuery": "",
+          "name": "Provider 2",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 2",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 3",
+          "kqlQuery": "",
+          "name": "Provider 3",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 3",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 4",
+          "kqlQuery": "",
+          "name": "Provider 4",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 4",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 5",
+          "kqlQuery": "",
+          "name": "Provider 5",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 5",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 6",
+          "kqlQuery": "",
+          "name": "Provider 6",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 6",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 7",
+          "kqlQuery": "",
+          "name": "Provider 7",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 7",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 8",
+          "kqlQuery": "",
+          "name": "Provider 8",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 8",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 9",
+          "kqlQuery": "",
+          "name": "Provider 9",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 9",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 10",
+          "kqlQuery": "",
+          "name": "Provider 10",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 10",
+          },
+        },
+      ]
+    }
+    group={
+      Array [
+        Object {
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 4",
+          "kqlQuery": "",
+          "name": "Provider 4",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 4",
+          },
+        },
+      ]
+    }
+    groupIndex={3}
+    isLastGroup={false}
+    key="droppable-3"
+    timelineId="test"
   />
-  <EuiFlexGroup
-    alignItems="center"
-    gutterSize="none"
-  >
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.div
-        hideBadge={false}
-      >
-        <AndOrBadge
-          type="or"
-        />
-      </styled.div>
-    </Styled(EuiFlexItem)>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        (
-      </styled.span>
-    </Styled(EuiFlexItem)>
-    <EuiFlexItem
-      grow={false}
-    >
-      <Connect(Droppable)
-        direction="horizontal"
-        droppableId="droppableId.timelineProviders.foo.group.4"
-        getContainerForClone={[Function]}
-        ignoreContainerClipping={false}
-        isCombineEnabled={false}
-        isDropDisabled={false}
-        mode="standard"
-        renderClone={null}
-        type="DEFAULT"
-      >
-        <Component />
-      </Connect(Droppable)>
-    </EuiFlexItem>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        )
-      </styled.span>
-    </Styled(EuiFlexItem)>
-  </EuiFlexGroup>
-  <EuiSpacer
-    size="xs"
+  <DataProvidersGroup
+    browserFields={Object {}}
+    dataProviders={
+      Array [
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 1",
+          "kqlQuery": "",
+          "name": "Provider 1",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 1",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 2",
+          "kqlQuery": "",
+          "name": "Provider 2",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 2",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 3",
+          "kqlQuery": "",
+          "name": "Provider 3",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 3",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 4",
+          "kqlQuery": "",
+          "name": "Provider 4",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 4",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 5",
+          "kqlQuery": "",
+          "name": "Provider 5",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 5",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 6",
+          "kqlQuery": "",
+          "name": "Provider 6",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 6",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 7",
+          "kqlQuery": "",
+          "name": "Provider 7",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 7",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 8",
+          "kqlQuery": "",
+          "name": "Provider 8",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 8",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 9",
+          "kqlQuery": "",
+          "name": "Provider 9",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 9",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 10",
+          "kqlQuery": "",
+          "name": "Provider 10",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 10",
+          },
+        },
+      ]
+    }
+    group={
+      Array [
+        Object {
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 5",
+          "kqlQuery": "",
+          "name": "Provider 5",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 5",
+          },
+        },
+      ]
+    }
+    groupIndex={4}
+    isLastGroup={false}
+    key="droppable-4"
+    timelineId="test"
   />
-  <EuiFlexGroup
-    alignItems="center"
-    gutterSize="none"
-  >
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.div
-        hideBadge={false}
-      >
-        <AndOrBadge
-          type="or"
-        />
-      </styled.div>
-    </Styled(EuiFlexItem)>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        (
-      </styled.span>
-    </Styled(EuiFlexItem)>
-    <EuiFlexItem
-      grow={false}
-    >
-      <Connect(Droppable)
-        direction="horizontal"
-        droppableId="droppableId.timelineProviders.foo.group.5"
-        getContainerForClone={[Function]}
-        ignoreContainerClipping={false}
-        isCombineEnabled={false}
-        isDropDisabled={false}
-        mode="standard"
-        renderClone={null}
-        type="DEFAULT"
-      >
-        <Component />
-      </Connect(Droppable)>
-    </EuiFlexItem>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        )
-      </styled.span>
-    </Styled(EuiFlexItem)>
-  </EuiFlexGroup>
-  <EuiSpacer
-    size="xs"
+  <DataProvidersGroup
+    browserFields={Object {}}
+    dataProviders={
+      Array [
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 1",
+          "kqlQuery": "",
+          "name": "Provider 1",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 1",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 2",
+          "kqlQuery": "",
+          "name": "Provider 2",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 2",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 3",
+          "kqlQuery": "",
+          "name": "Provider 3",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 3",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 4",
+          "kqlQuery": "",
+          "name": "Provider 4",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 4",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 5",
+          "kqlQuery": "",
+          "name": "Provider 5",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 5",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 6",
+          "kqlQuery": "",
+          "name": "Provider 6",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 6",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 7",
+          "kqlQuery": "",
+          "name": "Provider 7",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 7",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 8",
+          "kqlQuery": "",
+          "name": "Provider 8",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 8",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 9",
+          "kqlQuery": "",
+          "name": "Provider 9",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 9",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 10",
+          "kqlQuery": "",
+          "name": "Provider 10",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 10",
+          },
+        },
+      ]
+    }
+    group={
+      Array [
+        Object {
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 6",
+          "kqlQuery": "",
+          "name": "Provider 6",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 6",
+          },
+        },
+      ]
+    }
+    groupIndex={5}
+    isLastGroup={false}
+    key="droppable-5"
+    timelineId="test"
   />
-  <EuiFlexGroup
-    alignItems="center"
-    gutterSize="none"
-  >
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.div
-        hideBadge={false}
-      >
-        <AndOrBadge
-          type="or"
-        />
-      </styled.div>
-    </Styled(EuiFlexItem)>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        (
-      </styled.span>
-    </Styled(EuiFlexItem)>
-    <EuiFlexItem
-      grow={false}
-    >
-      <Connect(Droppable)
-        direction="horizontal"
-        droppableId="droppableId.timelineProviders.foo.group.6"
-        getContainerForClone={[Function]}
-        ignoreContainerClipping={false}
-        isCombineEnabled={false}
-        isDropDisabled={false}
-        mode="standard"
-        renderClone={null}
-        type="DEFAULT"
-      >
-        <Component />
-      </Connect(Droppable)>
-    </EuiFlexItem>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        )
-      </styled.span>
-    </Styled(EuiFlexItem)>
-  </EuiFlexGroup>
-  <EuiSpacer
-    size="xs"
+  <DataProvidersGroup
+    browserFields={Object {}}
+    dataProviders={
+      Array [
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 1",
+          "kqlQuery": "",
+          "name": "Provider 1",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 1",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 2",
+          "kqlQuery": "",
+          "name": "Provider 2",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 2",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 3",
+          "kqlQuery": "",
+          "name": "Provider 3",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 3",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 4",
+          "kqlQuery": "",
+          "name": "Provider 4",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 4",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 5",
+          "kqlQuery": "",
+          "name": "Provider 5",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 5",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 6",
+          "kqlQuery": "",
+          "name": "Provider 6",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 6",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 7",
+          "kqlQuery": "",
+          "name": "Provider 7",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 7",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 8",
+          "kqlQuery": "",
+          "name": "Provider 8",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 8",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 9",
+          "kqlQuery": "",
+          "name": "Provider 9",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 9",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 10",
+          "kqlQuery": "",
+          "name": "Provider 10",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 10",
+          },
+        },
+      ]
+    }
+    group={
+      Array [
+        Object {
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 7",
+          "kqlQuery": "",
+          "name": "Provider 7",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 7",
+          },
+        },
+      ]
+    }
+    groupIndex={6}
+    isLastGroup={false}
+    key="droppable-6"
+    timelineId="test"
   />
-  <EuiFlexGroup
-    alignItems="center"
-    gutterSize="none"
-  >
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.div
-        hideBadge={false}
-      >
-        <AndOrBadge
-          type="or"
-        />
-      </styled.div>
-    </Styled(EuiFlexItem)>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        (
-      </styled.span>
-    </Styled(EuiFlexItem)>
-    <EuiFlexItem
-      grow={false}
-    >
-      <Connect(Droppable)
-        direction="horizontal"
-        droppableId="droppableId.timelineProviders.foo.group.7"
-        getContainerForClone={[Function]}
-        ignoreContainerClipping={false}
-        isCombineEnabled={false}
-        isDropDisabled={false}
-        mode="standard"
-        renderClone={null}
-        type="DEFAULT"
-      >
-        <Component />
-      </Connect(Droppable)>
-    </EuiFlexItem>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        )
-      </styled.span>
-    </Styled(EuiFlexItem)>
-  </EuiFlexGroup>
-  <EuiSpacer
-    size="xs"
+  <DataProvidersGroup
+    browserFields={Object {}}
+    dataProviders={
+      Array [
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 1",
+          "kqlQuery": "",
+          "name": "Provider 1",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 1",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 2",
+          "kqlQuery": "",
+          "name": "Provider 2",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 2",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 3",
+          "kqlQuery": "",
+          "name": "Provider 3",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 3",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 4",
+          "kqlQuery": "",
+          "name": "Provider 4",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 4",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 5",
+          "kqlQuery": "",
+          "name": "Provider 5",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 5",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 6",
+          "kqlQuery": "",
+          "name": "Provider 6",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 6",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 7",
+          "kqlQuery": "",
+          "name": "Provider 7",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 7",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 8",
+          "kqlQuery": "",
+          "name": "Provider 8",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 8",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 9",
+          "kqlQuery": "",
+          "name": "Provider 9",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 9",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 10",
+          "kqlQuery": "",
+          "name": "Provider 10",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 10",
+          },
+        },
+      ]
+    }
+    group={
+      Array [
+        Object {
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 8",
+          "kqlQuery": "",
+          "name": "Provider 8",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 8",
+          },
+        },
+      ]
+    }
+    groupIndex={7}
+    isLastGroup={false}
+    key="droppable-7"
+    timelineId="test"
   />
-  <EuiFlexGroup
-    alignItems="center"
-    gutterSize="none"
-  >
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.div
-        hideBadge={false}
-      >
-        <AndOrBadge
-          type="or"
-        />
-      </styled.div>
-    </Styled(EuiFlexItem)>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        (
-      </styled.span>
-    </Styled(EuiFlexItem)>
-    <EuiFlexItem
-      grow={false}
-    >
-      <Connect(Droppable)
-        direction="horizontal"
-        droppableId="droppableId.timelineProviders.foo.group.8"
-        getContainerForClone={[Function]}
-        ignoreContainerClipping={false}
-        isCombineEnabled={false}
-        isDropDisabled={false}
-        mode="standard"
-        renderClone={null}
-        type="DEFAULT"
-      >
-        <Component />
-      </Connect(Droppable)>
-    </EuiFlexItem>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        )
-      </styled.span>
-    </Styled(EuiFlexItem)>
-  </EuiFlexGroup>
-  <EuiSpacer
-    size="xs"
+  <DataProvidersGroup
+    browserFields={Object {}}
+    dataProviders={
+      Array [
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 1",
+          "kqlQuery": "",
+          "name": "Provider 1",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 1",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 2",
+          "kqlQuery": "",
+          "name": "Provider 2",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 2",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 3",
+          "kqlQuery": "",
+          "name": "Provider 3",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 3",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 4",
+          "kqlQuery": "",
+          "name": "Provider 4",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 4",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 5",
+          "kqlQuery": "",
+          "name": "Provider 5",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 5",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 6",
+          "kqlQuery": "",
+          "name": "Provider 6",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 6",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 7",
+          "kqlQuery": "",
+          "name": "Provider 7",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 7",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 8",
+          "kqlQuery": "",
+          "name": "Provider 8",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 8",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 9",
+          "kqlQuery": "",
+          "name": "Provider 9",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 9",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 10",
+          "kqlQuery": "",
+          "name": "Provider 10",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 10",
+          },
+        },
+      ]
+    }
+    group={
+      Array [
+        Object {
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 9",
+          "kqlQuery": "",
+          "name": "Provider 9",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 9",
+          },
+        },
+      ]
+    }
+    groupIndex={8}
+    isLastGroup={false}
+    key="droppable-8"
+    timelineId="test"
   />
-  <EuiFlexGroup
-    alignItems="center"
-    gutterSize="none"
-  >
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.div
-        hideBadge={false}
-      >
-        <AndOrBadge
-          type="or"
-        />
-      </styled.div>
-    </Styled(EuiFlexItem)>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        (
-      </styled.span>
-    </Styled(EuiFlexItem)>
-    <EuiFlexItem
-      grow={false}
-    >
-      <Connect(Droppable)
-        direction="horizontal"
-        droppableId="droppableId.timelineProviders.foo.group.9"
-        getContainerForClone={[Function]}
-        ignoreContainerClipping={false}
-        isCombineEnabled={false}
-        isDropDisabled={false}
-        mode="standard"
-        renderClone={null}
-        type="DEFAULT"
-      >
-        <Component />
-      </Connect(Droppable)>
-    </EuiFlexItem>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        )
-      </styled.span>
-    </Styled(EuiFlexItem)>
-  </EuiFlexGroup>
-  <EuiSpacer
-    size="xs"
+  <DataProvidersGroup
+    browserFields={Object {}}
+    dataProviders={
+      Array [
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 1",
+          "kqlQuery": "",
+          "name": "Provider 1",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 1",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 2",
+          "kqlQuery": "",
+          "name": "Provider 2",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 2",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 3",
+          "kqlQuery": "",
+          "name": "Provider 3",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 3",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 4",
+          "kqlQuery": "",
+          "name": "Provider 4",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 4",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 5",
+          "kqlQuery": "",
+          "name": "Provider 5",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 5",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 6",
+          "kqlQuery": "",
+          "name": "Provider 6",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 6",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 7",
+          "kqlQuery": "",
+          "name": "Provider 7",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 7",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 8",
+          "kqlQuery": "",
+          "name": "Provider 8",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 8",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 9",
+          "kqlQuery": "",
+          "name": "Provider 9",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 9",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 10",
+          "kqlQuery": "",
+          "name": "Provider 10",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 10",
+          },
+        },
+      ]
+    }
+    group={
+      Array [
+        Object {
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 10",
+          "kqlQuery": "",
+          "name": "Provider 10",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 10",
+          },
+        },
+      ]
+    }
+    groupIndex={9}
+    isLastGroup={false}
+    key="droppable-9"
+    timelineId="test"
+  />
+  <DataProvidersGroup
+    browserFields={Object {}}
+    dataProviders={
+      Array [
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 1",
+          "kqlQuery": "",
+          "name": "Provider 1",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 1",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 2",
+          "kqlQuery": "",
+          "name": "Provider 2",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 2",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 3",
+          "kqlQuery": "",
+          "name": "Provider 3",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 3",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 4",
+          "kqlQuery": "",
+          "name": "Provider 4",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 4",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 5",
+          "kqlQuery": "",
+          "name": "Provider 5",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 5",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 6",
+          "kqlQuery": "",
+          "name": "Provider 6",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 6",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 7",
+          "kqlQuery": "",
+          "name": "Provider 7",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 7",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 8",
+          "kqlQuery": "",
+          "name": "Provider 8",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 8",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 9",
+          "kqlQuery": "",
+          "name": "Provider 9",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 9",
+          },
+        },
+        Object {
+          "and": Array [],
+          "enabled": true,
+          "excluded": false,
+          "id": "id-Provider 10",
+          "kqlQuery": "",
+          "name": "Provider 10",
+          "queryMatch": Object {
+            "field": "name",
+            "operator": ":",
+            "value": "Provider 10",
+          },
+        },
+      ]
+    }
+    group={Array []}
+    groupIndex={10}
+    isLastGroup={true}
+    key="droppable-10"
+    timelineId="test"
   />
-  <EuiFlexGroup
-    alignItems="center"
-    gutterSize="none"
-  >
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.div
-        hideBadge={false}
-      >
-        <AndOrBadge
-          type="or"
-        />
-      </styled.div>
-    </Styled(EuiFlexItem)>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        (
-      </styled.span>
-    </Styled(EuiFlexItem)>
-    <EuiFlexItem
-      grow={false}
-    >
-      <Connect(Droppable)
-        direction="horizontal"
-        droppableId="droppableId.timelineProviders.foo.group.10"
-        getContainerForClone={[Function]}
-        ignoreContainerClipping={false}
-        isCombineEnabled={false}
-        isDropDisabled={false}
-        mode="standard"
-        renderClone={null}
-        type="DEFAULT"
-      >
-        <Component />
-      </Connect(Droppable)>
-    </EuiFlexItem>
-    <Styled(EuiFlexItem)
-      grow={false}
-    >
-      <styled.span>
-        )
-      </styled.span>
-    </Styled(EuiFlexItem)>
-    <AddDataProviderPopover
-      browserFields={Object {}}
-      timelineId="foo"
-    />
-  </EuiFlexGroup>
 </div>
 `;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/data_providers.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/data_providers.test.tsx
index d48be25b08897..a7ae14dea510f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/data_providers.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/data_providers.test.tsx
@@ -41,11 +41,6 @@ describe('DataProviders', () => {
               data-test-subj="dataProviders-container"
               dataProviders={mockDataProviders}
               timelineId="foo"
-              onDataProviderEdited={jest.fn()}
-              onDataProviderRemoved={jest.fn()}
-              onToggleDataProviderEnabled={jest.fn()}
-              onToggleDataProviderExcluded={jest.fn()}
-              onToggleDataProviderType={jest.fn()}
             />
           </ManageGlobalTimeline>
         </TestProviders>
@@ -58,16 +53,7 @@ describe('DataProviders', () => {
 
       const wrapper = mount(
         <TestProviders>
-          <DataProviders
-            browserFields={{}}
-            timelineId="foo"
-            dataProviders={dataProviders}
-            onDataProviderEdited={jest.fn()}
-            onDataProviderRemoved={jest.fn()}
-            onToggleDataProviderEnabled={jest.fn()}
-            onToggleDataProviderExcluded={jest.fn()}
-            onToggleDataProviderType={jest.fn()}
-          />
+          <DataProviders browserFields={{}} timelineId="foo" dataProviders={dataProviders} />
         </TestProviders>
       );
 
@@ -77,16 +63,7 @@ describe('DataProviders', () => {
     test('it renders the data providers', () => {
       const wrapper = mount(
         <TestProviders>
-          <DataProviders
-            browserFields={{}}
-            timelineId="foo"
-            dataProviders={mockDataProviders}
-            onDataProviderEdited={jest.fn()}
-            onDataProviderRemoved={jest.fn()}
-            onToggleDataProviderEnabled={jest.fn()}
-            onToggleDataProviderExcluded={jest.fn()}
-            onToggleDataProviderType={jest.fn()}
-          />
+          <DataProviders browserFields={{}} timelineId="foo" dataProviders={mockDataProviders} />
         </TestProviders>
       );
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/index.tsx
index c9e06f89af41c..b892ca089eb4c 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/index.tsx
@@ -14,13 +14,6 @@ import {
   droppableTimelineProvidersPrefix,
   IS_DRAGGING_CLASS_NAME,
 } from '../../../../common/components/drag_and_drop/helpers';
-import {
-  OnDataProviderEdited,
-  OnDataProviderRemoved,
-  OnToggleDataProviderEnabled,
-  OnToggleDataProviderExcluded,
-  OnToggleDataProviderType,
-} from '../events';
 
 import { DataProvider } from './data_provider';
 import { Empty } from './empty';
@@ -31,11 +24,6 @@ interface Props {
   browserFields: BrowserFields;
   timelineId: string;
   dataProviders: DataProvider[];
-  onDataProviderEdited: OnDataProviderEdited;
-  onDataProviderRemoved: OnDataProviderRemoved;
-  onToggleDataProviderEnabled: OnToggleDataProviderEnabled;
-  onToggleDataProviderExcluded: OnToggleDataProviderExcluded;
-  onToggleDataProviderType: OnToggleDataProviderType;
 }
 
 const DropTargetDataProvidersContainer = styled.div`
@@ -91,48 +79,32 @@ const getDroppableId = (id: string): string => `${droppableTimelineProvidersPref
  * the user to drop anything with a facet count into
  * the data pro section.
  */
-export const DataProviders = React.memo<Props>(
-  ({
-    browserFields,
-    dataProviders,
+export const DataProviders = React.memo<Props>(({ browserFields, dataProviders, timelineId }) => {
+  const { getManageTimelineById } = useManageTimeline();
+  const isLoading = useMemo(() => getManageTimelineById(timelineId).isLoading, [
+    getManageTimelineById,
     timelineId,
-    onDataProviderEdited,
-    onDataProviderRemoved,
-    onToggleDataProviderEnabled,
-    onToggleDataProviderExcluded,
-    onToggleDataProviderType,
-  }) => {
-    const { getManageTimelineById } = useManageTimeline();
-    const isLoading = useMemo(() => getManageTimelineById(timelineId).isLoading, [
-      getManageTimelineById,
-      timelineId,
-    ]);
-    return (
-      <DropTargetDataProvidersContainer className="drop-target-data-providers-container">
-        <DropTargetDataProviders
-          className="drop-target-data-providers"
-          data-test-subj="dataProviders"
-        >
-          {dataProviders != null && dataProviders.length ? (
-            <Providers
-              browserFields={browserFields}
-              timelineId={timelineId}
-              dataProviders={dataProviders}
-              onDataProviderEdited={onDataProviderEdited}
-              onDataProviderRemoved={onDataProviderRemoved}
-              onToggleDataProviderEnabled={onToggleDataProviderEnabled}
-              onToggleDataProviderExcluded={onToggleDataProviderExcluded}
-              onToggleDataProviderType={onToggleDataProviderType}
-            />
-          ) : (
-            <DroppableWrapper isDropDisabled={isLoading} droppableId={getDroppableId(timelineId)}>
-              <Empty browserFields={browserFields} timelineId={timelineId} />
-            </DroppableWrapper>
-          )}
-        </DropTargetDataProviders>
-      </DropTargetDataProvidersContainer>
-    );
-  }
-);
+  ]);
+  return (
+    <DropTargetDataProvidersContainer className="drop-target-data-providers-container">
+      <DropTargetDataProviders
+        className="drop-target-data-providers"
+        data-test-subj="dataProviders"
+      >
+        {dataProviders != null && dataProviders.length ? (
+          <Providers
+            browserFields={browserFields}
+            timelineId={timelineId}
+            dataProviders={dataProviders}
+          />
+        ) : (
+          <DroppableWrapper isDropDisabled={isLoading} droppableId={getDroppableId(timelineId)}>
+            <Empty browserFields={browserFields} timelineId={timelineId} />
+          </DroppableWrapper>
+        )}
+      </DropTargetDataProviders>
+    </DropTargetDataProvidersContainer>
+  );
+});
 
 DataProviders.displayName = 'DataProviders';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/provider_badge.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/provider_badge.tsx
index bf2094e7659ee..b66a332fc977d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/provider_badge.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/provider_badge.tsx
@@ -91,7 +91,7 @@ const ConvertFieldBadge = styled(ProviderFieldBadge)`
   }
 `;
 
-const TemplateFieldBadge: React.FC<TemplateFieldBadgeProps> = ({ type, toggleType }) => {
+const TemplateFieldBadgeComponent: React.FC<TemplateFieldBadgeProps> = ({ type, toggleType }) => {
   if (type !== DataProviderType.template) {
     return (
       <ConvertFieldBadge onClick={toggleType}>{i18n.CONVERT_TO_TEMPLATE_FIELD}</ConvertFieldBadge>
@@ -101,6 +101,8 @@ const TemplateFieldBadge: React.FC<TemplateFieldBadgeProps> = ({ type, toggleTyp
   return <StyledTemplateFieldBadge>{i18n.TEMPLATE_FIELD_LABEL}</StyledTemplateFieldBadge>;
 };
 
+const TemplateFieldBadge = React.memo(TemplateFieldBadgeComponent);
+
 interface ProviderBadgeProps {
   deleteProvider: () => void;
   field: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/provider_item_badge.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/provider_item_badge.tsx
index 0093c43a17137..fc06d37b9663f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/provider_item_badge.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/provider_item_badge.tsx
@@ -117,21 +117,38 @@ export const ProviderItemBadge = React.memo<ProviderItemBadgeProps>(
       [unRegisterProvider]
     );
 
-    const button = (
-      <ProviderBadge
-        deleteProvider={!isLoading ? deleteProvider : noop}
-        field={field}
-        kqlQuery={kqlQuery}
-        isEnabled={isEnabled}
-        isExcluded={isExcluded}
-        providerId={providerId}
-        togglePopover={togglePopover}
-        toggleType={onToggleTypeProvider}
-        val={val}
-        operator={operator}
-        type={type}
-        timelineType={timelineType}
-      />
+    const button = useMemo(
+      () => (
+        <ProviderBadge
+          deleteProvider={!isLoading ? deleteProvider : noop}
+          field={field}
+          kqlQuery={kqlQuery}
+          isEnabled={isEnabled}
+          isExcluded={isExcluded}
+          providerId={providerId}
+          togglePopover={togglePopover}
+          toggleType={onToggleTypeProvider}
+          val={val}
+          operator={operator}
+          type={type}
+          timelineType={timelineType}
+        />
+      ),
+      [
+        deleteProvider,
+        field,
+        isEnabled,
+        isExcluded,
+        isLoading,
+        kqlQuery,
+        onToggleTypeProvider,
+        operator,
+        providerId,
+        timelineType,
+        togglePopover,
+        type,
+        val,
+      ]
     );
 
     return (
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.test.tsx
index 3f371349aa750..2df19605f813c 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.test.tsx
@@ -12,6 +12,7 @@ import { TestProviders } from '../../../../common/mock/test_providers';
 import { DroppableWrapper } from '../../../../common/components/drag_and_drop/droppable_wrapper';
 import { FilterManager } from '../../../../../../../../src/plugins/data/public';
 
+import { timelineActions } from '../../../store/timeline';
 import { mockDataProviders } from './mock/mock_data_providers';
 import { Providers } from './providers';
 import { DELETE_CLASS_NAME, ENABLE_CLASS_NAME, EXCLUDE_CLASS_NAME } from './provider_item_actions';
@@ -24,27 +25,24 @@ describe('Providers', () => {
   const isLoading: boolean = true;
   const mount = useMountAppended();
   const filterManager = new FilterManager(mockUiSettingsForFilterManager);
+  const mockOnDataProviderRemoved = jest.spyOn(timelineActions, 'removeProvider');
 
   const manageTimelineForTesting = {
-    foo: {
-      ...getTimelineDefaults('foo'),
+    test: {
+      ...getTimelineDefaults('test'),
       filterManager,
       isLoading,
     },
   };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   describe('rendering', () => {
     test('renders correctly against snapshot', () => {
       const wrapper = shallow(
-        <Providers
-          browserFields={{}}
-          dataProviders={mockDataProviders}
-          timelineId="foo"
-          onDataProviderEdited={jest.fn()}
-          onDataProviderRemoved={jest.fn()}
-          onToggleDataProviderEnabled={jest.fn()}
-          onToggleDataProviderExcluded={jest.fn()}
-          onToggleDataProviderType={jest.fn()}
-        />
+        <Providers browserFields={{}} dataProviders={mockDataProviders} timelineId="test" />
       );
       expect(wrapper).toMatchSnapshot();
     });
@@ -53,16 +51,7 @@ describe('Providers', () => {
       const wrapper = mount(
         <TestProviders>
           <DroppableWrapper droppableId="unitTest">
-            <Providers
-              browserFields={{}}
-              dataProviders={mockDataProviders}
-              timelineId="foo"
-              onDataProviderEdited={jest.fn()}
-              onDataProviderRemoved={jest.fn()}
-              onToggleDataProviderEnabled={jest.fn()}
-              onToggleDataProviderExcluded={jest.fn()}
-              onToggleDataProviderType={jest.fn()}
-            />
+            <Providers browserFields={{}} dataProviders={mockDataProviders} timelineId="test" />
           </DroppableWrapper>
         </TestProviders>
       );
@@ -77,20 +66,10 @@ describe('Providers', () => {
 
   describe('#onDataProviderRemoved', () => {
     test('it invokes the onDataProviderRemoved callback when the close button is clicked', () => {
-      const mockOnDataProviderRemoved = jest.fn();
       const wrapper = mount(
         <TestProviders>
           <DroppableWrapper droppableId="unitTest">
-            <Providers
-              browserFields={{}}
-              dataProviders={mockDataProviders}
-              timelineId="foo"
-              onDataProviderEdited={jest.fn()}
-              onDataProviderRemoved={mockOnDataProviderRemoved}
-              onToggleDataProviderEnabled={jest.fn()}
-              onToggleDataProviderExcluded={jest.fn()}
-              onToggleDataProviderType={jest.fn()}
-            />
+            <Providers browserFields={{}} dataProviders={mockDataProviders} timelineId="test" />
           </DroppableWrapper>
         </TestProviders>
       );
@@ -98,25 +77,15 @@ describe('Providers', () => {
         .find('[data-test-subj="providerBadge"] [data-euiicon-type]')
         .first()
         .simulate('click');
-      expect(mockOnDataProviderRemoved.mock.calls[0][0]).toEqual('id-Provider 1');
+      expect(mockOnDataProviderRemoved.mock.calls[0][0].providerId).toEqual('id-Provider 1');
     });
 
     test('while loading data, it does NOT invoke the onDataProviderRemoved callback when the close button is clicked', () => {
-      const mockOnDataProviderRemoved = jest.fn();
       const wrapper = mount(
         <TestProviders>
           <ManageGlobalTimeline manageTimelineForTesting={manageTimelineForTesting}>
             <DroppableWrapper droppableId="unitTest">
-              <Providers
-                browserFields={{}}
-                dataProviders={mockDataProviders}
-                timelineId="foo"
-                onDataProviderEdited={jest.fn()}
-                onDataProviderRemoved={mockOnDataProviderRemoved}
-                onToggleDataProviderEnabled={jest.fn()}
-                onToggleDataProviderExcluded={jest.fn()}
-                onToggleDataProviderType={jest.fn()}
-              />
+              <Providers browserFields={{}} dataProviders={mockDataProviders} timelineId="test" />
             </DroppableWrapper>
           </ManageGlobalTimeline>
         </TestProviders>
@@ -131,20 +100,10 @@ describe('Providers', () => {
     });
 
     test('it invokes the onDataProviderRemoved callback when you click on the option "Delete" in the provider menu', () => {
-      const mockOnDataProviderRemoved = jest.fn();
       const wrapper = mount(
         <TestProviders>
           <DroppableWrapper droppableId="unitTest">
-            <Providers
-              browserFields={{}}
-              dataProviders={mockDataProviders}
-              timelineId="foo"
-              onDataProviderEdited={jest.fn()}
-              onDataProviderRemoved={mockOnDataProviderRemoved}
-              onToggleDataProviderEnabled={jest.fn()}
-              onToggleDataProviderExcluded={jest.fn()}
-              onToggleDataProviderType={jest.fn()}
-            />
+            <Providers browserFields={{}} dataProviders={mockDataProviders} timelineId="test" />
           </DroppableWrapper>
         </TestProviders>
       );
@@ -156,25 +115,15 @@ describe('Providers', () => {
         .find(`[data-test-subj="providerActions"] .${DELETE_CLASS_NAME}`)
         .first()
         .simulate('click');
-      expect(mockOnDataProviderRemoved.mock.calls[0][0]).toEqual('id-Provider 1');
+      expect(mockOnDataProviderRemoved.mock.calls[0][0].providerId).toEqual('id-Provider 1');
     });
 
     test('while loading data, it does NOT invoke the onDataProviderRemoved callback when you click on the option "Delete" in the provider menu', () => {
-      const mockOnDataProviderRemoved = jest.fn();
       const wrapper = mount(
         <TestProviders>
           <ManageGlobalTimeline manageTimelineForTesting={manageTimelineForTesting}>
             <DroppableWrapper droppableId="unitTest">
-              <Providers
-                browserFields={{}}
-                dataProviders={mockDataProviders}
-                timelineId="foo"
-                onDataProviderEdited={jest.fn()}
-                onDataProviderRemoved={mockOnDataProviderRemoved}
-                onToggleDataProviderEnabled={jest.fn()}
-                onToggleDataProviderExcluded={jest.fn()}
-                onToggleDataProviderType={jest.fn()}
-              />
+              <Providers browserFields={{}} dataProviders={mockDataProviders} timelineId="test" />
             </DroppableWrapper>
           </ManageGlobalTimeline>
         </TestProviders>
@@ -194,20 +143,14 @@ describe('Providers', () => {
 
   describe('#onToggleDataProviderEnabled', () => {
     test('it invokes the onToggleDataProviderEnabled callback when you click on the option "Temporary disable" in the provider menu', () => {
-      const mockOnToggleDataProviderEnabled = jest.fn();
+      const mockOnToggleDataProviderEnabled = jest.spyOn(
+        timelineActions,
+        'updateDataProviderEnabled'
+      );
       const wrapper = mount(
         <TestProviders>
           <DroppableWrapper droppableId="unitTest">
-            <Providers
-              browserFields={{}}
-              dataProviders={mockDataProviders}
-              timelineId="foo"
-              onDataProviderEdited={jest.fn()}
-              onDataProviderRemoved={jest.fn()}
-              onToggleDataProviderEnabled={mockOnToggleDataProviderEnabled}
-              onToggleDataProviderExcluded={jest.fn()}
-              onToggleDataProviderType={jest.fn()}
-            />
+            <Providers browserFields={{}} dataProviders={mockDataProviders} timelineId="test" />
           </DroppableWrapper>
         </TestProviders>
       );
@@ -220,27 +163,23 @@ describe('Providers', () => {
         .first()
         .simulate('click');
       expect(mockOnToggleDataProviderEnabled.mock.calls[0][0]).toEqual({
+        andProviderId: undefined,
         enabled: false,
+        id: 'test',
         providerId: 'id-Provider 1',
       });
     });
 
     test('while loading data, it does NOT invoke the onToggleDataProviderEnabled callback when you click on the option "Temporary disable" in the provider menu', () => {
-      const mockOnToggleDataProviderEnabled = jest.fn();
+      const mockOnToggleDataProviderEnabled = jest.spyOn(
+        timelineActions,
+        'updateDataProviderEnabled'
+      );
       const wrapper = mount(
         <TestProviders>
           <ManageGlobalTimeline manageTimelineForTesting={manageTimelineForTesting}>
             <DroppableWrapper droppableId="unitTest">
-              <Providers
-                browserFields={{}}
-                dataProviders={mockDataProviders}
-                timelineId="foo"
-                onDataProviderEdited={jest.fn()}
-                onDataProviderRemoved={jest.fn()}
-                onToggleDataProviderEnabled={mockOnToggleDataProviderEnabled}
-                onToggleDataProviderExcluded={jest.fn()}
-                onToggleDataProviderType={jest.fn()}
-              />
+              <Providers browserFields={{}} dataProviders={mockDataProviders} timelineId="test" />
             </DroppableWrapper>
           </ManageGlobalTimeline>
         </TestProviders>
@@ -260,21 +199,15 @@ describe('Providers', () => {
 
   describe('#onToggleDataProviderExcluded', () => {
     test('it invokes the onToggleDataProviderExcluded callback when you click on the option "Exclude results" in the provider menu', () => {
-      const onToggleDataProviderExcluded = jest.fn();
+      const mockOnToggleDataProviderExcluded = jest.spyOn(
+        timelineActions,
+        'updateDataProviderExcluded'
+      );
 
       const wrapper = mount(
         <TestProviders>
           <DroppableWrapper droppableId="unitTest">
-            <Providers
-              browserFields={{}}
-              dataProviders={mockDataProviders}
-              timelineId="foo"
-              onDataProviderEdited={jest.fn()}
-              onDataProviderRemoved={jest.fn()}
-              onToggleDataProviderEnabled={jest.fn()}
-              onToggleDataProviderExcluded={onToggleDataProviderExcluded}
-              onToggleDataProviderType={jest.fn()}
-            />
+            <Providers browserFields={{}} dataProviders={mockDataProviders} timelineId="test" />
           </DroppableWrapper>
         </TestProviders>
       );
@@ -288,29 +221,25 @@ describe('Providers', () => {
         .first()
         .simulate('click');
 
-      expect(onToggleDataProviderExcluded.mock.calls[0][0]).toEqual({
+      expect(mockOnToggleDataProviderExcluded.mock.calls[0][0]).toEqual({
+        andProviderId: undefined,
         excluded: true,
+        id: 'test',
         providerId: 'id-Provider 1',
       });
     });
 
     test('while loading data, it does NOT invoke the onToggleDataProviderExcluded callback when you click on the option "Exclude results" in the provider menu', () => {
-      const onToggleDataProviderExcluded = jest.fn();
+      const mockOnToggleDataProviderExcluded = jest.spyOn(
+        timelineActions,
+        'updateDataProviderExcluded'
+      );
 
       const wrapper = mount(
         <TestProviders>
           <ManageGlobalTimeline manageTimelineForTesting={manageTimelineForTesting}>
             <DroppableWrapper droppableId="unitTest">
-              <Providers
-                browserFields={{}}
-                dataProviders={mockDataProviders}
-                timelineId="foo"
-                onDataProviderEdited={jest.fn()}
-                onDataProviderRemoved={jest.fn()}
-                onToggleDataProviderEnabled={jest.fn()}
-                onToggleDataProviderExcluded={onToggleDataProviderExcluded}
-                onToggleDataProviderType={jest.fn()}
-              />
+              <Providers browserFields={{}} dataProviders={mockDataProviders} timelineId="test" />
             </DroppableWrapper>
           </ManageGlobalTimeline>
         </TestProviders>
@@ -325,7 +254,7 @@ describe('Providers', () => {
         .first()
         .simulate('click');
 
-      expect(onToggleDataProviderExcluded).not.toBeCalled();
+      expect(mockOnToggleDataProviderExcluded).not.toBeCalled();
     });
   });
 
@@ -337,16 +266,7 @@ describe('Providers', () => {
       const wrapper = mount(
         <TestProviders>
           <DroppableWrapper droppableId="unitTest">
-            <Providers
-              browserFields={{}}
-              dataProviders={dataProviders}
-              timelineId="foo"
-              onDataProviderEdited={jest.fn()}
-              onDataProviderRemoved={jest.fn()}
-              onToggleDataProviderEnabled={jest.fn()}
-              onToggleDataProviderExcluded={jest.fn()}
-              onToggleDataProviderType={jest.fn()}
-            />
+            <Providers browserFields={{}} dataProviders={dataProviders} timelineId="test" />
           </DroppableWrapper>
         </TestProviders>
       );
@@ -364,21 +284,11 @@ describe('Providers', () => {
     test('it invokes the onDataProviderRemoved callback when you click on the close button is clicked', () => {
       const dataProviders = mockDataProviders.slice(0, 1);
       dataProviders[0].and = mockDataProviders.slice(1, 3);
-      const mockOnDataProviderRemoved = jest.fn();
 
       const wrapper = mount(
         <TestProviders>
           <DroppableWrapper droppableId="unitTest">
-            <Providers
-              browserFields={{}}
-              dataProviders={mockDataProviders}
-              timelineId="foo"
-              onDataProviderEdited={jest.fn()}
-              onDataProviderRemoved={mockOnDataProviderRemoved}
-              onToggleDataProviderEnabled={jest.fn()}
-              onToggleDataProviderExcluded={jest.fn()}
-              onToggleDataProviderType={jest.fn()}
-            />
+            <Providers browserFields={{}} dataProviders={mockDataProviders} timelineId="test" />
           </DroppableWrapper>
         </TestProviders>
       );
@@ -392,28 +302,22 @@ describe('Providers', () => {
 
       wrapper.update();
 
-      expect(mockOnDataProviderRemoved.mock.calls[0]).toEqual(['id-Provider 1', 'id-Provider 2']);
+      expect(mockOnDataProviderRemoved.mock.calls[0][0]).toEqual({
+        andProviderId: 'id-Provider 2',
+        id: 'test',
+        providerId: 'id-Provider 1',
+      });
     });
 
     test('while loading data, it does NOT invoke the onDataProviderRemoved callback when you click on the close button is clicked', () => {
       const dataProviders = mockDataProviders.slice(0, 1);
       dataProviders[0].and = mockDataProviders.slice(1, 3);
-      const mockOnDataProviderRemoved = jest.fn();
 
       const wrapper = mount(
         <TestProviders>
           <ManageGlobalTimeline manageTimelineForTesting={manageTimelineForTesting}>
             <DroppableWrapper droppableId="unitTest">
-              <Providers
-                browserFields={{}}
-                dataProviders={mockDataProviders}
-                timelineId="foo"
-                onDataProviderEdited={jest.fn()}
-                onDataProviderRemoved={mockOnDataProviderRemoved}
-                onToggleDataProviderEnabled={jest.fn()}
-                onToggleDataProviderExcluded={jest.fn()}
-                onToggleDataProviderType={jest.fn()}
-              />
+              <Providers browserFields={{}} dataProviders={mockDataProviders} timelineId="test" />
             </DroppableWrapper>
           </ManageGlobalTimeline>
         </TestProviders>
@@ -434,21 +338,15 @@ describe('Providers', () => {
     test('it invokes the onToggleDataProviderEnabled callback when you click on the option "Temporary disable" in the provider menu', () => {
       const dataProviders = mockDataProviders.slice(0, 1);
       dataProviders[0].and = mockDataProviders.slice(1, 3);
-      const mockOnToggleDataProviderEnabled = jest.fn();
+      const mockOnToggleDataProviderEnabled = jest.spyOn(
+        timelineActions,
+        'updateDataProviderEnabled'
+      );
 
       const wrapper = mount(
         <TestProviders>
           <DroppableWrapper droppableId="unitTest">
-            <Providers
-              browserFields={{}}
-              dataProviders={dataProviders}
-              timelineId="foo"
-              onDataProviderEdited={jest.fn()}
-              onDataProviderRemoved={jest.fn()}
-              onToggleDataProviderEnabled={mockOnToggleDataProviderEnabled}
-              onToggleDataProviderExcluded={jest.fn()}
-              onToggleDataProviderType={jest.fn()}
-            />
+            <Providers browserFields={{}} dataProviders={dataProviders} timelineId="test" />
           </DroppableWrapper>
         </TestProviders>
       );
@@ -470,6 +368,7 @@ describe('Providers', () => {
       expect(mockOnToggleDataProviderEnabled.mock.calls[0][0]).toEqual({
         andProviderId: 'id-Provider 2',
         enabled: false,
+        id: 'test',
         providerId: 'id-Provider 1',
       });
     });
@@ -477,22 +376,16 @@ describe('Providers', () => {
     test('while loading data, it does NOT invoke the onToggleDataProviderEnabled callback when you click on the option "Temporary disable" in the provider menu', () => {
       const dataProviders = mockDataProviders.slice(0, 1);
       dataProviders[0].and = mockDataProviders.slice(1, 3);
-      const mockOnToggleDataProviderEnabled = jest.fn();
+      const mockOnToggleDataProviderEnabled = jest.spyOn(
+        timelineActions,
+        'updateDataProviderEnabled'
+      );
 
       const wrapper = mount(
         <TestProviders>
           <ManageGlobalTimeline manageTimelineForTesting={manageTimelineForTesting}>
             <DroppableWrapper droppableId="unitTest">
-              <Providers
-                browserFields={{}}
-                dataProviders={dataProviders}
-                timelineId="foo"
-                onDataProviderEdited={jest.fn()}
-                onDataProviderRemoved={jest.fn()}
-                onToggleDataProviderEnabled={mockOnToggleDataProviderEnabled}
-                onToggleDataProviderExcluded={jest.fn()}
-                onToggleDataProviderType={jest.fn()}
-              />
+              <Providers browserFields={{}} dataProviders={dataProviders} timelineId="test" />
             </DroppableWrapper>
           </ManageGlobalTimeline>
         </TestProviders>
@@ -518,21 +411,15 @@ describe('Providers', () => {
     test('it invokes the onToggleDataProviderExcluded callback when you click on the option "Exclude results" in the provider menu', () => {
       const dataProviders = mockDataProviders.slice(0, 1);
       dataProviders[0].and = mockDataProviders.slice(1, 3);
-      const mockOnToggleDataProviderExcluded = jest.fn();
+      const mockOnToggleDataProviderExcluded = jest.spyOn(
+        timelineActions,
+        'updateDataProviderExcluded'
+      );
 
       const wrapper = mount(
         <TestProviders>
           <DroppableWrapper droppableId="unitTest">
-            <Providers
-              browserFields={{}}
-              dataProviders={dataProviders}
-              timelineId="foo"
-              onDataProviderEdited={jest.fn()}
-              onDataProviderRemoved={jest.fn()}
-              onToggleDataProviderEnabled={jest.fn()}
-              onToggleDataProviderExcluded={mockOnToggleDataProviderExcluded}
-              onToggleDataProviderType={jest.fn()}
-            />
+            <Providers browserFields={{}} dataProviders={dataProviders} timelineId="test" />
           </DroppableWrapper>
         </TestProviders>
       );
@@ -554,6 +441,7 @@ describe('Providers', () => {
       expect(mockOnToggleDataProviderExcluded.mock.calls[0][0]).toEqual({
         andProviderId: 'id-Provider 2',
         excluded: true,
+        id: 'test',
         providerId: 'id-Provider 1',
       });
     });
@@ -561,22 +449,16 @@ describe('Providers', () => {
     test('while loading data, it does NOT invoke the onToggleDataProviderExcluded callback when you click on the option "Exclude results" in the provider menu', () => {
       const dataProviders = mockDataProviders.slice(0, 1);
       dataProviders[0].and = mockDataProviders.slice(1, 3);
-      const mockOnToggleDataProviderExcluded = jest.fn();
+      const mockOnToggleDataProviderExcluded = jest.spyOn(
+        timelineActions,
+        'updateDataProviderExcluded'
+      );
 
       const wrapper = mount(
         <TestProviders>
           <ManageGlobalTimeline manageTimelineForTesting={manageTimelineForTesting}>
             <DroppableWrapper droppableId="unitTest">
-              <Providers
-                browserFields={{}}
-                dataProviders={dataProviders}
-                timelineId="foo"
-                onDataProviderEdited={jest.fn()}
-                onDataProviderRemoved={jest.fn()}
-                onToggleDataProviderEnabled={jest.fn()}
-                onToggleDataProviderExcluded={mockOnToggleDataProviderExcluded}
-                onToggleDataProviderType={jest.fn()}
-              />
+              <Providers browserFields={{}} dataProviders={dataProviders} timelineId="test" />
             </DroppableWrapper>
           </ManageGlobalTimeline>
         </TestProviders>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.tsx
index 1142bbc214d74..4b6f3c6701794 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.tsx
@@ -6,9 +6,12 @@
 
 import { EuiFlexGroup, EuiFlexItem, EuiFormHelpText, EuiSpacer } from '@elastic/eui';
 import { rgba } from 'polished';
-import React, { Fragment, useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { Draggable, DraggingStyle, Droppable, NotDraggingStyle } from 'react-beautiful-dnd';
-import styled, { css } from 'styled-components';
+import styled from 'styled-components';
+import { useDispatch } from 'react-redux';
+
+import { timelineActions } from '../../../store/timeline';
 
 import { AndOrBadge } from '../../../../common/components/and_or_badge';
 import { AddDataProviderPopover } from './add_data_provider_popover';
@@ -18,13 +21,6 @@ import {
   IS_DRAGGING_CLASS_NAME,
   getTimelineProviderDraggableId,
 } from '../../../../common/components/drag_and_drop/helpers';
-import {
-  OnDataProviderEdited,
-  OnDataProviderRemoved,
-  OnToggleDataProviderEnabled,
-  OnToggleDataProviderExcluded,
-  OnToggleDataProviderType,
-} from '../events';
 
 import { DataProvider, DataProviderType, DataProvidersAnd, IS_OPERATOR } from './data_provider';
 import { EMPTY_GROUP, flattenIntoAndGroups } from './helpers';
@@ -36,11 +32,6 @@ interface Props {
   browserFields: BrowserFields;
   timelineId: string;
   dataProviders: DataProvider[];
-  onDataProviderEdited: OnDataProviderEdited;
-  onDataProviderRemoved: OnDataProviderRemoved;
-  onToggleDataProviderEnabled: OnToggleDataProviderEnabled;
-  onToggleDataProviderExcluded: OnToggleDataProviderExcluded;
-  onToggleDataProviderType: OnToggleDataProviderType;
 }
 
 /**
@@ -74,12 +65,10 @@ const DroppableContainer = styled.div`
 `;
 
 const Parens = styled.span`
-  ${({ theme }) => css`
-    color: ${theme.eui.euiColorMediumShade};
-    font-size: 32px;
-    padding: 2px;
-    user-select: none;
-  `}
+  color: ${({ theme }) => theme.eui.euiColorMediumShade};
+  font-size: 32px;
+  padding: 2px;
+  user-select: none;
 `;
 
 const AndOrBadgeContainer = styled.div<{ hideBadge: boolean }>`
@@ -123,182 +112,269 @@ const getDataProviderValue = (dataProvider: DataProvidersAnd) =>
  * 2) temporarily disabling a data provider
  * 3) applying boolean negation to the data provider
  */
-export const Providers = React.memo<Props>(
-  ({
-    browserFields,
-    timelineId,
-    dataProviders,
-    onDataProviderEdited,
-    onDataProviderRemoved,
-    onToggleDataProviderEnabled,
-    onToggleDataProviderExcluded,
-    onToggleDataProviderType,
-  }) => {
-    // Transform the dataProviders into flattened groups, and append an empty group
-    const dataProviderGroups: DataProvidersAnd[][] = useMemo(
-      () => [...flattenIntoAndGroups(dataProviders), ...EMPTY_GROUP],
-      [dataProviders]
+export const Providers = React.memo<Props>(({ browserFields, timelineId, dataProviders }) => {
+  // Transform the dataProviders into flattened groups, and append an empty group
+  const dataProviderGroups: DataProvidersAnd[][] = useMemo(
+    () => [...flattenIntoAndGroups(dataProviders), ...EMPTY_GROUP],
+    [dataProviders]
+  );
+
+  const content = useMemo(
+    () =>
+      dataProviderGroups.map((group, groupIndex) => (
+        <DataProvidersGroup
+          key={`droppable-${groupIndex}`}
+          group={group}
+          groupIndex={groupIndex}
+          isLastGroup={groupIndex === dataProviderGroups.length - 1}
+          browserFields={browserFields}
+          timelineId={timelineId}
+          dataProviders={dataProviders}
+        />
+      )),
+    [browserFields, dataProviderGroups, dataProviders, timelineId]
+  );
+
+  return <div>{content}</div>;
+});
+
+Providers.displayName = 'Providers';
+
+interface DataProvidersGroupItem extends Omit<Props, 'dataProviders'> {
+  index: number;
+  dataProvider: DataProvidersAnd;
+  group: DataProvidersAnd[];
+  groupIndex: number;
+}
+
+export const DataProvidersGroupItem = React.memo<DataProvidersGroupItem>(
+  ({ browserFields, group, groupIndex, dataProvider, index, timelineId }) => {
+    const dispatch = useDispatch();
+    const draggableId = useMemo(
+      () =>
+        getTimelineProviderDraggableId({
+          dataProviderId: dataProvider.id,
+          groupIndex,
+          timelineId,
+        }),
+      [dataProvider.id, groupIndex, timelineId]
+    );
+
+    const handleDeleteProvider = useCallback(() => {
+      const payload = {
+        id: timelineId,
+        providerId: index > 0 ? group[0].id : dataProvider.id,
+        andProviderId: index > 0 ? dataProvider.id : undefined,
+      };
+
+      dispatch(timelineActions.removeProvider(payload));
+    }, [dataProvider.id, dispatch, group, index, timelineId]);
+
+    const handleToggleEnabledProvider = useCallback(() => {
+      const payload = {
+        id: timelineId,
+        providerId: index > 0 ? group[0].id : dataProvider.id,
+        enabled: !dataProvider.enabled,
+        andProviderId: index > 0 ? dataProvider.id : undefined,
+      };
+
+      dispatch(timelineActions.updateDataProviderEnabled(payload));
+    }, [dataProvider.enabled, dataProvider.id, dispatch, group, index, timelineId]);
+
+    const handleToggleExcludedProvider = useCallback(() => {
+      const payload = {
+        id: timelineId,
+        providerId: index > 0 ? group[0].id : dataProvider.id,
+        excluded: !dataProvider.excluded,
+        andProviderId: index > 0 ? dataProvider.id : undefined,
+      };
+
+      dispatch(timelineActions.updateDataProviderExcluded(payload));
+    }, [dataProvider.excluded, dataProvider.id, dispatch, group, index, timelineId]);
+
+    const handleToggleTypeProvider = useCallback(() => {
+      const payload = {
+        id: timelineId,
+        providerId: index > 0 ? group[0].id : dataProvider.id,
+        type:
+          dataProvider.type === DataProviderType.template
+            ? DataProviderType.default
+            : DataProviderType.template,
+        andProviderId: index > 0 ? dataProvider.id : undefined,
+      };
+
+      dispatch(timelineActions.updateDataProviderType(payload));
+    }, [dataProvider.id, dataProvider.type, dispatch, group, index, timelineId]);
+
+    const handleDataProviderEdited = useCallback(
+      ({ andProviderId, excluded, field, operator, providerId, value }) =>
+        dispatch(
+          timelineActions.dataProviderEdited({
+            andProviderId,
+            excluded,
+            field,
+            id: timelineId,
+            operator,
+            providerId,
+            value,
+          })
+        ),
+      [dispatch, timelineId]
+    );
+
+    const DraggableContent = useCallback(
+      (provided, snapshot) => (
+        <div
+          ref={provided.innerRef}
+          {...provided.draggableProps}
+          {...provided.dragHandleProps}
+          style={getItemStyle(provided.draggableProps.style)}
+          data-test-subj="providerContainer"
+        >
+          <EuiFlexGroup alignItems="center" gutterSize="none">
+            <EuiFlexItem grow={false}>
+              <ProviderItemBadge
+                andProviderId={index > 0 ? dataProvider.id : undefined}
+                browserFields={browserFields}
+                deleteProvider={handleDeleteProvider}
+                field={
+                  index > 0
+                    ? dataProvider.queryMatch.displayField ?? dataProvider.queryMatch.field
+                    : group[0].queryMatch.displayField ?? group[0].queryMatch.field
+                }
+                kqlQuery={index > 0 ? dataProvider.kqlQuery : group[0].kqlQuery}
+                isEnabled={index > 0 ? dataProvider.enabled : group[0].enabled}
+                isExcluded={index > 0 ? dataProvider.excluded : group[0].excluded}
+                onDataProviderEdited={handleDataProviderEdited}
+                operator={
+                  index > 0
+                    ? dataProvider.queryMatch.operator ?? IS_OPERATOR
+                    : group[0].queryMatch.operator ?? IS_OPERATOR
+                }
+                register={dataProvider}
+                providerId={index > 0 ? group[0].id : dataProvider.id}
+                timelineId={timelineId}
+                toggleEnabledProvider={handleToggleEnabledProvider}
+                toggleExcludedProvider={handleToggleExcludedProvider}
+                toggleTypeProvider={handleToggleTypeProvider}
+                val={getDataProviderValue(dataProvider)}
+                type={dataProvider.type}
+              />
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              {!snapshot.isDragging &&
+                (index < group.length - 1 ? (
+                  <AndOrBadge type="and" />
+                ) : (
+                  <LastAndOrBadgeInGroup>
+                    <AndOrBadge type="and" />
+                  </LastAndOrBadgeInGroup>
+                ))}
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </div>
+      ),
+      [
+        browserFields,
+        dataProvider,
+        group,
+        handleDataProviderEdited,
+        handleDeleteProvider,
+        handleToggleEnabledProvider,
+        handleToggleExcludedProvider,
+        handleToggleTypeProvider,
+        index,
+        timelineId,
+      ]
     );
 
     return (
-      <div>
-        {dataProviderGroups.map((group, groupIndex) => (
-          <Fragment key={`droppable-${groupIndex}`}>
-            {groupIndex !== 0 && <EuiSpacer size="xs" />}
-
-            <EuiFlexGroup alignItems="center" gutterSize="none">
-              <OrFlexItem grow={false}>
-                <AndOrBadgeContainer hideBadge={groupIndex === 0}>
-                  <AndOrBadge type="or" />
-                </AndOrBadgeContainer>
-              </OrFlexItem>
-              <ParensContainer grow={false}>
-                <Parens>{'('}</Parens>
-              </ParensContainer>
-              <EuiFlexItem grow={false}>
-                <Droppable
-                  droppableId={getTimelineProviderDroppableId({ groupIndex, timelineId })}
-                  direction="horizontal"
-                >
-                  {(droppableProvided) => (
-                    <DroppableContainer
-                      className={
-                        groupIndex === dataProviderGroups.length - 1
-                          ? EMPTY_PROVIDERS_GROUP_CLASS_NAME
-                          : ''
-                      }
-                      ref={droppableProvided.innerRef}
-                      style={listStyle}
-                      {...droppableProvided.droppableProps}
-                    >
-                      {group.map((dataProvider, index) => (
-                        <Draggable
-                          disableInteractiveElementBlocking={true}
-                          draggableId={getTimelineProviderDraggableId({
-                            dataProviderId: dataProvider.id,
-                            groupIndex,
-                            timelineId,
-                          })}
-                          index={index}
-                          key={dataProvider.id}
-                        >
-                          {(provided, snapshot) => (
-                            <div
-                              ref={provided.innerRef}
-                              {...provided.draggableProps}
-                              {...provided.dragHandleProps}
-                              style={getItemStyle(provided.draggableProps.style)}
-                              data-test-subj="providerContainer"
-                            >
-                              <EuiFlexGroup alignItems="center" gutterSize="none">
-                                <EuiFlexItem grow={false}>
-                                  <ProviderItemBadge
-                                    andProviderId={index > 0 ? dataProvider.id : undefined}
-                                    browserFields={browserFields}
-                                    deleteProvider={() =>
-                                      index > 0
-                                        ? onDataProviderRemoved(group[0].id, dataProvider.id)
-                                        : onDataProviderRemoved(dataProvider.id)
-                                    }
-                                    field={
-                                      index > 0
-                                        ? dataProvider.queryMatch.displayField ??
-                                          dataProvider.queryMatch.field
-                                        : group[0].queryMatch.displayField ??
-                                          group[0].queryMatch.field
-                                    }
-                                    kqlQuery={index > 0 ? dataProvider.kqlQuery : group[0].kqlQuery}
-                                    isEnabled={index > 0 ? dataProvider.enabled : group[0].enabled}
-                                    isExcluded={
-                                      index > 0 ? dataProvider.excluded : group[0].excluded
-                                    }
-                                    onDataProviderEdited={onDataProviderEdited}
-                                    operator={
-                                      index > 0
-                                        ? dataProvider.queryMatch.operator ?? IS_OPERATOR
-                                        : group[0].queryMatch.operator ?? IS_OPERATOR
-                                    }
-                                    register={dataProvider}
-                                    providerId={index > 0 ? group[0].id : dataProvider.id}
-                                    timelineId={timelineId}
-                                    toggleEnabledProvider={() =>
-                                      index > 0
-                                        ? onToggleDataProviderEnabled({
-                                            providerId: group[0].id,
-                                            enabled: !dataProvider.enabled,
-                                            andProviderId: dataProvider.id,
-                                          })
-                                        : onToggleDataProviderEnabled({
-                                            providerId: dataProvider.id,
-                                            enabled: !dataProvider.enabled,
-                                          })
-                                    }
-                                    toggleExcludedProvider={() =>
-                                      index > 0
-                                        ? onToggleDataProviderExcluded({
-                                            providerId: group[0].id,
-                                            excluded: !dataProvider.excluded,
-                                            andProviderId: dataProvider.id,
-                                          })
-                                        : onToggleDataProviderExcluded({
-                                            providerId: dataProvider.id,
-                                            excluded: !dataProvider.excluded,
-                                          })
-                                    }
-                                    toggleTypeProvider={() =>
-                                      index > 0
-                                        ? onToggleDataProviderType({
-                                            providerId: group[0].id,
-                                            type:
-                                              dataProvider.type === DataProviderType.template
-                                                ? DataProviderType.default
-                                                : DataProviderType.template,
-                                            andProviderId: dataProvider.id,
-                                          })
-                                        : onToggleDataProviderType({
-                                            providerId: dataProvider.id,
-                                            type:
-                                              dataProvider.type === DataProviderType.template
-                                                ? DataProviderType.default
-                                                : DataProviderType.template,
-                                          })
-                                    }
-                                    val={getDataProviderValue(dataProvider)}
-                                    type={dataProvider.type}
-                                  />
-                                </EuiFlexItem>
-                                <EuiFlexItem grow={false}>
-                                  {!snapshot.isDragging &&
-                                    (index < group.length - 1 ? (
-                                      <AndOrBadge type="and" />
-                                    ) : (
-                                      <LastAndOrBadgeInGroup>
-                                        <AndOrBadge type="and" />
-                                      </LastAndOrBadgeInGroup>
-                                    ))}
-                                </EuiFlexItem>
-                              </EuiFlexGroup>
-                            </div>
-                          )}
-                        </Draggable>
-                      ))}
-                      {droppableProvided.placeholder}
-                    </DroppableContainer>
-                  )}
-                </Droppable>
-              </EuiFlexItem>
-              <ParensContainer grow={false}>
-                <Parens>{')'}</Parens>
-              </ParensContainer>
-              {groupIndex === dataProviderGroups.length - 1 && (
-                <AddDataProviderPopover browserFields={browserFields} timelineId={timelineId} />
-              )}
-            </EuiFlexGroup>
-          </Fragment>
-        ))}
-      </div>
+      <Draggable
+        disableInteractiveElementBlocking={true}
+        draggableId={draggableId}
+        index={index}
+        key={dataProvider.id}
+      >
+        {DraggableContent}
+      </Draggable>
     );
   }
 );
 
-Providers.displayName = 'Providers';
+DataProvidersGroupItem.displayName = 'DataProvidersGroupItem';
+
+interface DataProvidersGroup extends Props {
+  group: DataProvidersAnd[];
+  groupIndex: number;
+  isLastGroup: boolean;
+}
+
+const DataProvidersGroup = React.memo<DataProvidersGroup>(
+  ({ browserFields, timelineId, group, groupIndex, isLastGroup }) => {
+    const droppableId = useMemo(() => getTimelineProviderDroppableId({ groupIndex, timelineId }), [
+      groupIndex,
+      timelineId,
+    ]);
+
+    const GroupDataProviders = useMemo(
+      () =>
+        group.map((dataProvider, index) => (
+          <DataProvidersGroupItem
+            key={dataProvider.id}
+            browserFields={browserFields}
+            dataProvider={dataProvider}
+            index={index}
+            timelineId={timelineId}
+            group={group}
+            groupIndex={groupIndex}
+          />
+        )),
+      [browserFields, group, groupIndex, timelineId]
+    );
+
+    const DroppableContent = useCallback(
+      (droppableProvided) => (
+        <DroppableContainer
+          className={isLastGroup ? EMPTY_PROVIDERS_GROUP_CLASS_NAME : ''}
+          ref={droppableProvided.innerRef}
+          style={listStyle}
+          {...droppableProvided.droppableProps}
+        >
+          {GroupDataProviders}
+          {droppableProvided.placeholder}
+        </DroppableContainer>
+      ),
+      [GroupDataProviders, isLastGroup]
+    );
+
+    return (
+      <>
+        {groupIndex !== 0 && <EuiSpacer size="xs" />}
+
+        <EuiFlexGroup alignItems="center" gutterSize="none">
+          <OrFlexItem grow={false}>
+            <AndOrBadgeContainer hideBadge={groupIndex === 0}>
+              <AndOrBadge type="or" />
+            </AndOrBadgeContainer>
+          </OrFlexItem>
+          <ParensContainer grow={false}>
+            <Parens>{'('}</Parens>
+          </ParensContainer>
+          <EuiFlexItem grow={false}>
+            <Droppable droppableId={droppableId} direction="horizontal">
+              {DroppableContent}
+            </Droppable>
+          </EuiFlexItem>
+          <ParensContainer grow={false}>
+            <Parens>{')'}</Parens>
+          </ParensContainer>
+          {isLastGroup && (
+            <AddDataProviderPopover browserFields={browserFields} timelineId={timelineId} />
+          )}
+        </EuiFlexGroup>
+      </>
+    );
+  }
+);
+
+DataProvidersGroup.displayName = 'DataProvidersGroup';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/events.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/events.ts
index f894ac4e73939..8ab3a71604bf1 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/events.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/events.ts
@@ -7,33 +7,8 @@
 import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model';
 import { ColumnId } from './body/column_id';
 import { SortDirection } from './body/sort';
-import { DataProvider, DataProviderType, QueryOperator } from './data_providers/data_provider';
+import { DataProvider, QueryOperator } from './data_providers/data_provider';
 
-/** Invoked when a user clicks the close button to remove a data provider */
-export type OnDataProviderRemoved = (providerId: string, andProviderId?: string) => void;
-
-/** Invoked when a user temporarily disables or re-enables a data provider */
-export type OnToggleDataProviderEnabled = (toggled: {
-  providerId: string;
-  enabled: boolean;
-  andProviderId?: string;
-}) => void;
-
-/** Invoked when a user toggles negation ("boolean NOT") of a data provider */
-export type OnToggleDataProviderExcluded = (excluded: {
-  providerId: string;
-  excluded: boolean;
-  andProviderId?: string;
-}) => void;
-
-/** Invoked when a user toggles type (can "default" or "template") of a data provider */
-export type OnToggleDataProviderType = (type: {
-  providerId: string;
-  type: DataProviderType;
-  andProviderId?: string;
-}) => void;
-
-/** Invoked when a user edits the properties of a data provider */
 export type OnDataProviderEdited = ({
   andProviderId,
   excluded,
@@ -54,9 +29,6 @@ export type OnDataProviderEdited = ({
   type: DataProvider['type'];
 }) => void;
 
-/** Invoked when a user change the kql query of our data provider */
-export type OnChangeDataProviderKqlQuery = (edit: { providerId: string; kqlQuery: string }) => void;
-
 /** Invoked when a user selects a new minimap time range */
 export type OnRangeSelected = (range: string) => void;
 
@@ -76,8 +48,6 @@ export type OnChangeItemsPerPage = (itemsPerPage: number) => void;
 /** Invoked when a user clicks to load more item */
 export type OnChangePage = (nextPage: number) => void;
 
-export type OnChangeDroppableAndProvider = (providerId: string) => void;
-
 /** Invoked when a user pins an event */
 export type OnPinEvent = (eventId: string) => void;
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/__snapshots__/index.test.tsx.snap
index f81934f9a1d91..5b14edf818fdc 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/__snapshots__/index.test.tsx.snap
@@ -77,7 +77,7 @@ exports[`Footer Timeline Component rendering it renders the default timeline foo
         data-test-subj="paging-control"
         isLoading={false}
         onPageClick={[Function]}
-        totalPages={2}
+        totalPages={5}
       />
     </EuiFlexItem>
     <EuiFlexItem
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.test.tsx
index f823b717e7f4c..8ce109409c5fd 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.test.tsx
@@ -15,8 +15,9 @@ describe('Footer Timeline Component', () => {
   const loadMore = jest.fn();
   const onChangeItemsPerPage = jest.fn();
   const updatedAt = 1546878704036;
-  const totalCount = 15546;
+  const serverSideEventCount = 15546;
   const itemsCount = 2;
+  const totalCount = 10;
 
   describe('rendering', () => {
     test('it renders the default timeline footer', () => {
@@ -33,8 +34,8 @@ describe('Footer Timeline Component', () => {
           itemsPerPageOptions={[1, 5, 10, 20]}
           onChangeItemsPerPage={onChangeItemsPerPage}
           onChangePage={loadMore}
-          serverSideEventCount={totalCount}
-          totalPages={2}
+          serverSideEventCount={serverSideEventCount}
+          totalCount={totalCount}
         />
       );
 
@@ -55,8 +56,8 @@ describe('Footer Timeline Component', () => {
           itemsPerPageOptions={[1, 5, 10, 20]}
           onChangeItemsPerPage={onChangeItemsPerPage}
           onChangePage={loadMore}
-          serverSideEventCount={totalCount}
-          totalPages={2}
+          serverSideEventCount={serverSideEventCount}
+          totalCount={totalCount}
         />
       );
 
@@ -78,8 +79,8 @@ describe('Footer Timeline Component', () => {
             itemsPerPageOptions={[1, 5, 10, 20]}
             onChangeItemsPerPage={onChangeItemsPerPage}
             onChangePage={loadMore}
-            serverSideEventCount={totalCount}
-            totalPages={2}
+            serverSideEventCount={serverSideEventCount}
+            totalCount={totalCount}
           />
         </TestProviders>
       );
@@ -129,8 +130,8 @@ describe('Footer Timeline Component', () => {
           itemsPerPageOptions={[1, 5, 10, 20]}
           onChangeItemsPerPage={onChangeItemsPerPage}
           onChangePage={loadMore}
-          serverSideEventCount={totalCount}
-          totalPages={2}
+          serverSideEventCount={serverSideEventCount}
+          totalCount={totalCount}
         />
       );
 
@@ -152,8 +153,8 @@ describe('Footer Timeline Component', () => {
             itemsPerPageOptions={[1, 5, 10, 20]}
             onChangeItemsPerPage={onChangeItemsPerPage}
             onChangePage={loadMore}
-            serverSideEventCount={totalCount}
-            totalPages={2}
+            serverSideEventCount={serverSideEventCount}
+            totalCount={totalCount}
           />
         </TestProviders>
       );
@@ -179,8 +180,8 @@ describe('Footer Timeline Component', () => {
             itemsPerPageOptions={[1, 5, 10, 20]}
             onChangeItemsPerPage={onChangeItemsPerPage}
             onChangePage={loadMore}
-            serverSideEventCount={totalCount}
-            totalPages={2}
+            serverSideEventCount={serverSideEventCount}
+            totalCount={totalCount}
           />
         </TestProviders>
       );
@@ -204,8 +205,8 @@ describe('Footer Timeline Component', () => {
             itemsPerPageOptions={[1, 5, 10, 20]}
             onChangeItemsPerPage={onChangeItemsPerPage}
             onChangePage={loadMore}
-            serverSideEventCount={totalCount}
-            totalPages={2}
+            serverSideEventCount={serverSideEventCount}
+            totalCount={totalCount}
           />
         </TestProviders>
       );
@@ -231,8 +232,8 @@ describe('Footer Timeline Component', () => {
             itemsPerPageOptions={[1, 5, 10, 20]}
             onChangeItemsPerPage={onChangeItemsPerPage}
             onChangePage={loadMore}
-            serverSideEventCount={totalCount}
-            totalPages={2}
+            serverSideEventCount={serverSideEventCount}
+            totalCount={totalCount}
           />
         </TestProviders>
       );
@@ -256,8 +257,8 @@ describe('Footer Timeline Component', () => {
             itemsPerPageOptions={[1, 5, 10, 20]}
             onChangeItemsPerPage={onChangeItemsPerPage}
             onChangePage={loadMore}
-            serverSideEventCount={totalCount}
-            totalPages={2}
+            serverSideEventCount={serverSideEventCount}
+            totalCount={totalCount}
           />
         </TestProviders>
       );
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.tsx
index 7174e9b2121e5..7c10168da3c62 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.tsx
@@ -174,30 +174,36 @@ export const EventsCount = React.memo(EventsCountComponent);
 
 EventsCount.displayName = 'EventsCount';
 
-export const PagingControlComponent = ({
-  activePage,
-  isLoading,
-  onPageClick,
-  totalPages,
-}: {
+interface PagingControlProps {
   activePage: number;
   isLoading: boolean;
   onPageClick: OnChangePage;
   totalPages: number;
-}) => (
-  <>
-    {isLoading ? (
-      `${i18n.LOADING}...`
-    ) : (
-      <EuiPagination
-        data-test-subj="timeline-pagination"
-        pageCount={totalPages}
-        activePage={activePage}
-        onPageClick={onPageClick}
-      />
-    )}
-  </>
-);
+}
+
+export const PagingControlComponent: React.FC<PagingControlProps> = ({
+  activePage,
+  isLoading,
+  onPageClick,
+  totalPages,
+}) => {
+  if (isLoading) {
+    return <>{`${i18n.LOADING}...`}</>;
+  }
+
+  if (!totalPages) {
+    return null;
+  }
+
+  return (
+    <EuiPagination
+      data-test-subj="timeline-pagination"
+      pageCount={totalPages}
+      activePage={activePage}
+      onPageClick={onPageClick}
+    />
+  );
+};
 
 PagingControlComponent.displayName = 'PagingControlComponent';
 
@@ -217,7 +223,7 @@ interface FooterProps {
   onChangeItemsPerPage: OnChangeItemsPerPage;
   onChangePage: OnChangePage;
   serverSideEventCount: number;
-  totalPages: number;
+  totalCount: number;
 }
 
 /** Renders a loading indicator and paging controls */
@@ -234,7 +240,7 @@ export const FooterComponent = ({
   onChangeItemsPerPage,
   onChangePage,
   serverSideEventCount,
-  totalPages,
+  totalCount,
 }: FooterProps) => {
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
   const [paginationLoading, setPaginationLoading] = useState(false);
@@ -259,6 +265,30 @@ export const FooterComponent = ({
   ]);
   const closePopover = useCallback(() => setIsPopoverOpen(false), [setIsPopoverOpen]);
 
+  const rowItems = useMemo(
+    () =>
+      itemsPerPageOptions &&
+      itemsPerPageOptions.map((item) => (
+        <EuiContextMenuItem
+          key={item}
+          icon={itemsPerPage === item ? 'check' : 'empty'}
+          data-test-subj={`items-per-page-option-${item}`}
+          onClick={() => {
+            closePopover();
+            onChangeItemsPerPage(item);
+          }}
+        >
+          {`${item} ${i18n.ROWS}`}
+        </EuiContextMenuItem>
+      )),
+    [closePopover, itemsPerPage, itemsPerPageOptions, onChangeItemsPerPage]
+  );
+
+  const totalPages = useMemo(() => Math.ceil(totalCount / itemsPerPage), [
+    itemsPerPage,
+    totalCount,
+  ]);
+
   useEffect(() => {
     if (paginationLoading && !isLoading) {
       setPaginationLoading(false);
@@ -279,22 +309,6 @@ export const FooterComponent = ({
     );
   }
 
-  const rowItems =
-    itemsPerPageOptions &&
-    itemsPerPageOptions.map((item) => (
-      <EuiContextMenuItem
-        key={item}
-        icon={itemsPerPage === item ? 'check' : 'empty'}
-        data-test-subj={`items-per-page-option-${item}`}
-        onClick={() => {
-          closePopover();
-          onChangeItemsPerPage(item);
-        }}
-      >
-        {`${item} ${i18n.ROWS}`}
-      </EuiContextMenuItem>
-    ));
-
   return (
     <FooterContainer
       data-test-subj="timeline-footer"
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/__snapshots__/index.test.tsx.snap
index f94c30c5a102d..66758268fb39e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/__snapshots__/index.test.tsx.snap
@@ -138,11 +138,6 @@ exports[`Header rendering renders correctly against snapshot 1`] = `
         },
       ]
     }
-    onDataProviderEdited={[MockFunction]}
-    onDataProviderRemoved={[MockFunction]}
-    onToggleDataProviderEnabled={[MockFunction]}
-    onToggleDataProviderExcluded={[MockFunction]}
-    onToggleDataProviderType={[MockFunction]}
     timelineId="foo"
   />
   <Connect(StatefulSearchOrFilterComponent)
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx
index e50a6ed1e45fe..22d28737e5d61 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.tsx
@@ -11,13 +11,6 @@ import deepEqual from 'fast-deep-equal';
 
 import { DataProviders } from '../data_providers';
 import { DataProvider } from '../data_providers/data_provider';
-import {
-  OnDataProviderEdited,
-  OnDataProviderRemoved,
-  OnToggleDataProviderEnabled,
-  OnToggleDataProviderExcluded,
-  OnToggleDataProviderType,
-} from '../events';
 import { StatefulSearchOrFilter } from '../search_or_filter';
 import { BrowserFields } from '../../../../common/containers/source';
 
@@ -33,11 +26,6 @@ interface Props {
   filterManager: FilterManager;
   graphEventId?: string;
   indexPattern: IIndexPattern;
-  onDataProviderEdited: OnDataProviderEdited;
-  onDataProviderRemoved: OnDataProviderRemoved;
-  onToggleDataProviderEnabled: OnToggleDataProviderEnabled;
-  onToggleDataProviderExcluded: OnToggleDataProviderExcluded;
-  onToggleDataProviderType: OnToggleDataProviderType;
   show: boolean;
   showCallOutUnauthorizedMsg: boolean;
   status: TimelineStatusLiteralWithNull;
@@ -50,11 +38,6 @@ const TimelineHeaderComponent: React.FC<Props> = ({
   dataProviders,
   filterManager,
   graphEventId,
-  onDataProviderEdited,
-  onDataProviderRemoved,
-  onToggleDataProviderEnabled,
-  onToggleDataProviderExcluded,
-  onToggleDataProviderType,
   show,
   showCallOutUnauthorizedMsg,
   status,
@@ -85,11 +68,6 @@ const TimelineHeaderComponent: React.FC<Props> = ({
           browserFields={browserFields}
           timelineId={timelineId}
           dataProviders={dataProviders}
-          onDataProviderEdited={onDataProviderEdited}
-          onDataProviderRemoved={onDataProviderRemoved}
-          onToggleDataProviderEnabled={onToggleDataProviderEnabled}
-          onToggleDataProviderExcluded={onToggleDataProviderExcluded}
-          onToggleDataProviderType={onToggleDataProviderType}
         />
 
         <StatefulSearchOrFilter
@@ -111,11 +89,6 @@ export const TimelineHeader = React.memo(
     deepEqual(prevProps.dataProviders, nextProps.dataProviders) &&
     prevProps.filterManager === nextProps.filterManager &&
     prevProps.graphEventId === nextProps.graphEventId &&
-    prevProps.onDataProviderEdited === nextProps.onDataProviderEdited &&
-    prevProps.onDataProviderRemoved === nextProps.onDataProviderRemoved &&
-    prevProps.onToggleDataProviderEnabled === nextProps.onToggleDataProviderEnabled &&
-    prevProps.onToggleDataProviderExcluded === nextProps.onToggleDataProviderExcluded &&
-    prevProps.onToggleDataProviderType === nextProps.onToggleDataProviderType &&
     prevProps.show === nextProps.show &&
     prevProps.showCallOutUnauthorizedMsg === nextProps.showCallOutUnauthorizedMsg &&
     prevProps.status === nextProps.status &&
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
index ccdb0793bc03f..0c7b1e0cdecd5 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
@@ -14,14 +14,7 @@ import { timelineActions, timelineSelectors } from '../../store/timeline';
 import { ColumnHeaderOptions, TimelineModel } from '../../../timelines/store/timeline/model';
 import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
 import { defaultHeaders } from './body/column_headers/default_headers';
-import {
-  OnChangeItemsPerPage,
-  OnDataProviderRemoved,
-  OnDataProviderEdited,
-  OnToggleDataProviderEnabled,
-  OnToggleDataProviderExcluded,
-  OnToggleDataProviderType,
-} from './events';
+import { OnChangeItemsPerPage } from './events';
 import { Timeline } from './timeline';
 import { useSourcererScope } from '../../../common/containers/sourcerer';
 import { SourcererScopeName } from '../../../common/store/sourcerer/model';
@@ -51,18 +44,13 @@ const StatefulTimelineComponent = React.memo<Props>(
     kqlMode,
     kqlQueryExpression,
     onClose,
-    onDataProviderEdited,
     removeColumn,
-    removeProvider,
     show,
     showCallOutUnauthorizedMsg,
     sort,
     start,
     status,
     timelineType,
-    updateDataProviderEnabled,
-    updateDataProviderExcluded,
-    updateDataProviderType,
     updateItemsPerPage,
     upsertColumn,
     usersViewing,
@@ -75,59 +63,6 @@ const StatefulTimelineComponent = React.memo<Props>(
       selectedPatterns,
     } = useSourcererScope(SourcererScopeName.timeline);
 
-    const onDataProviderRemoved: OnDataProviderRemoved = useCallback(
-      (providerId: string, andProviderId?: string) =>
-        removeProvider!({ id, providerId, andProviderId }),
-      [id, removeProvider]
-    );
-
-    const onToggleDataProviderEnabled: OnToggleDataProviderEnabled = useCallback(
-      ({ providerId, enabled, andProviderId }) =>
-        updateDataProviderEnabled!({
-          id,
-          enabled,
-          providerId,
-          andProviderId,
-        }),
-      [id, updateDataProviderEnabled]
-    );
-
-    const onToggleDataProviderExcluded: OnToggleDataProviderExcluded = useCallback(
-      ({ providerId, excluded, andProviderId }) =>
-        updateDataProviderExcluded!({
-          id,
-          excluded,
-          providerId,
-          andProviderId,
-        }),
-      [id, updateDataProviderExcluded]
-    );
-
-    const onToggleDataProviderType: OnToggleDataProviderType = useCallback(
-      ({ providerId, type, andProviderId }) =>
-        updateDataProviderType!({
-          id,
-          type,
-          providerId,
-          andProviderId,
-        }),
-      [id, updateDataProviderType]
-    );
-
-    const onDataProviderEditedLocal: OnDataProviderEdited = useCallback(
-      ({ andProviderId, excluded, field, operator, providerId, value }) =>
-        onDataProviderEdited!({
-          andProviderId,
-          excluded,
-          field,
-          id,
-          operator,
-          providerId,
-          value,
-        }),
-      [id, onDataProviderEdited]
-    );
-
     const onChangeItemsPerPage: OnChangeItemsPerPage = useCallback(
       (itemsChangedPerPage) => updateItemsPerPage!({ id, itemsPerPage: itemsChangedPerPage }),
       [id, updateItemsPerPage]
@@ -183,11 +118,6 @@ const StatefulTimelineComponent = React.memo<Props>(
         loadingSourcerer={loading}
         onChangeItemsPerPage={onChangeItemsPerPage}
         onClose={onClose}
-        onDataProviderEdited={onDataProviderEditedLocal}
-        onDataProviderRemoved={onDataProviderRemoved}
-        onToggleDataProviderEnabled={onToggleDataProviderEnabled}
-        onToggleDataProviderExcluded={onToggleDataProviderExcluded}
-        onToggleDataProviderType={onToggleDataProviderType}
         show={show!}
         showCallOutUnauthorizedMsg={showCallOutUnauthorizedMsg}
         sort={sort!}
@@ -287,14 +217,8 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = {
   addProvider: timelineActions.addProvider,
   createTimeline: timelineActions.createTimeline,
-  onDataProviderEdited: timelineActions.dataProviderEdited,
   removeColumn: timelineActions.removeColumn,
-  removeProvider: timelineActions.removeProvider,
   updateColumns: timelineActions.updateColumns,
-  updateDataProviderEnabled: timelineActions.updateDataProviderEnabled,
-  updateDataProviderExcluded: timelineActions.updateDataProviderExcluded,
-  updateDataProviderKqlQuery: timelineActions.updateDataProviderKqlQuery,
-  updateDataProviderType: timelineActions.updateDataProviderType,
   updateHighlightedDropAndProviderId: timelineActions.updateHighlightedDropAndProviderId,
   updateItemsPerPage: timelineActions.updateItemsPerPage,
   updateItemsPerPageOptions: timelineActions.updateItemsPerPageOptions,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
index 43ab8ab203e11..a28f4240d3a2f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
@@ -73,23 +73,31 @@ export const StarIcon = React.memo<{
   isFavorite: boolean;
   timelineId: string;
   updateIsFavorite: UpdateIsFavorite;
-}>(({ isFavorite, timelineId: id, updateIsFavorite }) => (
-  // TODO: 1 error is: Visible, non-interactive elements with click handlers must have at least one keyboard listener
-  // TODO: 2 error is: Elements with the 'button' interactive role must be focusable
-  // TODO: Investigate this error
-  // eslint-disable-next-line
-  <div role="button" onClick={() => updateIsFavorite({ id, isFavorite: !isFavorite })}>
-    {isFavorite ? (
-      <EuiToolTip data-test-subj="timeline-favorite-filled-star-tool-tip" content={i18n.FAVORITE}>
-        <StyledStar data-test-subj="timeline-favorite-filled-star" type="starFilled" size="l" />
-      </EuiToolTip>
-    ) : (
-      <EuiToolTip content={i18n.NOT_A_FAVORITE}>
-        <StyledStar data-test-subj="timeline-favorite-empty-star" type="starEmpty" size="l" />
-      </EuiToolTip>
-    )}
-  </div>
-));
+}>(({ isFavorite, timelineId: id, updateIsFavorite }) => {
+  const handleClick = useCallback(() => updateIsFavorite({ id, isFavorite: !isFavorite }), [
+    id,
+    isFavorite,
+    updateIsFavorite,
+  ]);
+
+  return (
+    // TODO: 1 error is: Visible, non-interactive elements with click handlers must have at least one keyboard listener
+    // TODO: 2 error is: Elements with the 'button' interactive role must be focusable
+    // TODO: Investigate this error
+    // eslint-disable-next-line
+  <div role="button" onClick={handleClick}>
+      {isFavorite ? (
+        <EuiToolTip data-test-subj="timeline-favorite-filled-star-tool-tip" content={i18n.FAVORITE}>
+          <StyledStar data-test-subj="timeline-favorite-filled-star" type="starFilled" size="l" />
+        </EuiToolTip>
+      ) : (
+        <EuiToolTip content={i18n.NOT_A_FAVORITE}>
+          <StyledStar data-test-subj="timeline-favorite-empty-star" type="starEmpty" size="l" />
+        </EuiToolTip>
+      )}
+    </div>
+  );
+});
 StarIcon.displayName = 'StarIcon';
 
 interface DescriptionProps {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.test.tsx
index bde1e7bf5829a..630a71693d182 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.test.tsx
@@ -19,11 +19,6 @@ import {
 import '../../../common/mock/match_media';
 import { TestProviders } from '../../../common/mock/test_providers';
 
-import {
-  DELETE_CLASS_NAME,
-  ENABLE_CLASS_NAME,
-  EXCLUDE_CLASS_NAME,
-} from './data_providers/provider_item_actions';
 import { TimelineComponent, Props as TimelineComponentProps } from './timeline';
 import { Sort } from './body/sort';
 import { mockDataProviders } from './data_providers/mock/mock_data_providers';
@@ -115,11 +110,6 @@ describe('Timeline', () => {
       loadingSourcerer: false,
       onChangeItemsPerPage: jest.fn(),
       onClose: jest.fn(),
-      onDataProviderEdited: jest.fn(),
-      onDataProviderRemoved: jest.fn(),
-      onToggleDataProviderEnabled: jest.fn(),
-      onToggleDataProviderExcluded: jest.fn(),
-      onToggleDataProviderType: jest.fn(),
       show: true,
       showCallOutUnauthorizedMsg: false,
       sort,
@@ -238,204 +228,4 @@ describe('Timeline', () => {
       });
     });
   });
-
-  describe('event wire up', () => {
-    describe('onDataProviderRemoved', () => {
-      test('it invokes the onDataProviderRemoved callback when the delete button on a provider is clicked', () => {
-        const wrapper = mount(
-          <TestProviders>
-            <TimelineComponent {...props} />
-          </TestProviders>
-        );
-
-        wrapper
-          .find('[data-test-subj="providerBadge"] [data-euiicon-type]')
-          .first()
-          .simulate('click');
-
-        expect((props.onDataProviderRemoved as jest.Mock).mock.calls[0][0]).toEqual(
-          'id-Provider 1'
-        );
-      });
-
-      test('it invokes the onDataProviderRemoved callback when you click on the option "Delete" in the provider menu', () => {
-        const wrapper = mount(
-          <TestProviders>
-            <TimelineComponent {...props} />
-          </TestProviders>
-        );
-        wrapper.find('button[data-test-subj="providerBadge"]').first().simulate('click');
-
-        wrapper.update();
-
-        wrapper
-          .find(`[data-test-subj="providerActions"] .${DELETE_CLASS_NAME}`)
-          .first()
-          .simulate('click');
-
-        expect((props.onDataProviderRemoved as jest.Mock).mock.calls[0][0]).toEqual(
-          'id-Provider 1'
-        );
-      });
-    });
-
-    describe('onToggleDataProviderEnabled', () => {
-      test('it invokes the onToggleDataProviderEnabled callback when you click on the option "Temporary disable" in the provider menu', () => {
-        const wrapper = mount(
-          <TestProviders>
-            <TimelineComponent {...props} />
-          </TestProviders>
-        );
-
-        wrapper.find('button[data-test-subj="providerBadge"]').first().simulate('click');
-
-        wrapper.update();
-
-        wrapper
-          .find(`[data-test-subj="providerActions"] .${ENABLE_CLASS_NAME}`)
-          .first()
-          .simulate('click');
-
-        expect((props.onToggleDataProviderEnabled as jest.Mock).mock.calls[0][0]).toEqual({
-          providerId: 'id-Provider 1',
-          enabled: false,
-        });
-      });
-    });
-
-    describe('onToggleDataProviderExcluded', () => {
-      test('it invokes the onToggleDataProviderExcluded callback when you click on the option "Exclude results" in the provider menu', () => {
-        const wrapper = mount(
-          <TestProviders>
-            <TimelineComponent {...props} />
-          </TestProviders>
-        );
-
-        wrapper
-          .find('[data-test-subj="providerBadge"]')
-          .first()
-          .find('button')
-          .first()
-          .simulate('click');
-
-        wrapper.update();
-
-        wrapper
-          .find(`[data-test-subj="providerActions"] .${EXCLUDE_CLASS_NAME}`)
-          .first()
-          .simulate('click');
-
-        expect((props.onToggleDataProviderExcluded as jest.Mock).mock.calls[0][0]).toEqual({
-          providerId: 'id-Provider 1',
-          excluded: true,
-        });
-      });
-    });
-
-    describe('#ProviderWithAndProvider', () => {
-      const dataProviders = mockDataProviders.slice(0, 1);
-      dataProviders[0].and = mockDataProviders.slice(1, 3);
-
-      test('Rendering And Provider', () => {
-        const wrapper = mount(
-          <TestProviders>
-            <TimelineComponent {...props} dataProviders={dataProviders} />
-          </TestProviders>
-        );
-
-        const andProviderBadges = wrapper.find(
-          '[data-test-subj="providerBadge"] .euiBadge__content span.field-value'
-        );
-
-        const andProviderBadgesText = andProviderBadges.map((node) => node.text()).join(' ');
-        expect(andProviderBadges.length).toEqual(3);
-        expect(andProviderBadgesText).toEqual(
-          'name: "Provider 1" name: "Provider 2" name: "Provider 3"'
-        );
-      });
-
-      test('it invokes the onDataProviderRemoved callback when you click on the option "Delete" in the accordion menu', () => {
-        const wrapper = mount(
-          <TestProviders>
-            <TimelineComponent {...props} dataProviders={dataProviders} />
-          </TestProviders>
-        );
-
-        wrapper
-          .find('[data-test-subj="providerBadge"]')
-          .at(3)
-          .find('button')
-          .first()
-          .simulate('click');
-
-        wrapper.update();
-
-        wrapper
-          .find(`[data-test-subj="providerActions"] .${DELETE_CLASS_NAME}`)
-          .first()
-          .simulate('click');
-
-        expect((props.onDataProviderRemoved as jest.Mock).mock.calls[0]).toEqual([
-          'id-Provider 1',
-          'id-Provider 2',
-        ]);
-      });
-
-      test('it invokes the onToggleDataProviderEnabled callback when you click on the option "Temporary disable" in the accordion menu', () => {
-        const wrapper = mount(
-          <TestProviders>
-            <TimelineComponent {...props} dataProviders={dataProviders} />
-          </TestProviders>
-        );
-
-        wrapper
-          .find('[data-test-subj="providerBadge"]')
-          .at(3)
-          .find('button')
-          .first()
-          .simulate('click');
-
-        wrapper.update();
-
-        wrapper
-          .find(`[data-test-subj="providerActions"] .${ENABLE_CLASS_NAME}`)
-          .first()
-          .simulate('click');
-
-        expect((props.onToggleDataProviderEnabled as jest.Mock).mock.calls[0][0]).toEqual({
-          andProviderId: 'id-Provider 2',
-          enabled: false,
-          providerId: 'id-Provider 1',
-        });
-      });
-
-      test('it invokes the onToggleDataProviderExcluded callback when you click on the option "Exclude results" in the accordion menu', () => {
-        const wrapper = mount(
-          <TestProviders>
-            <TimelineComponent {...props} dataProviders={dataProviders} />
-          </TestProviders>
-        );
-
-        wrapper
-          .find('[data-test-subj="providerBadge"]')
-          .at(3)
-          .find('button')
-          .first()
-          .simulate('click');
-
-        wrapper.update();
-
-        wrapper
-          .find(`[data-test-subj="providerActions"] .${EXCLUDE_CLASS_NAME}`)
-          .first()
-          .simulate('click');
-
-        expect((props.onToggleDataProviderExcluded as jest.Mock).mock.calls[0][0]).toEqual({
-          andProviderId: 'id-Provider 2',
-          excluded: true,
-          providerId: 'id-Provider 1',
-        });
-      });
-    });
-  });
 });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.tsx
index d1a25e6f3e1a4..1097d58b227a8 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.tsx
@@ -19,14 +19,7 @@ import { defaultHeaders } from './body/column_headers/default_headers';
 import { Sort } from './body/sort';
 import { StatefulBody } from './body/stateful_body';
 import { DataProvider } from './data_providers/data_provider';
-import {
-  OnChangeItemsPerPage,
-  OnDataProviderRemoved,
-  OnDataProviderEdited,
-  OnToggleDataProviderEnabled,
-  OnToggleDataProviderExcluded,
-  OnToggleDataProviderType,
-} from './events';
+import { OnChangeItemsPerPage } from './events';
 import { TimelineKqlFetch } from './fetch_kql_timeline';
 import { Footer, footerHeight } from './footer';
 import { TimelineHeader } from './header';
@@ -113,11 +106,6 @@ export interface Props {
   loadingSourcerer: boolean;
   onChangeItemsPerPage: OnChangeItemsPerPage;
   onClose: () => void;
-  onDataProviderEdited: OnDataProviderEdited;
-  onDataProviderRemoved: OnDataProviderRemoved;
-  onToggleDataProviderEnabled: OnToggleDataProviderEnabled;
-  onToggleDataProviderExcluded: OnToggleDataProviderExcluded;
-  onToggleDataProviderType: OnToggleDataProviderType;
   show: boolean;
   showCallOutUnauthorizedMsg: boolean;
   sort: Sort;
@@ -149,11 +137,6 @@ export const TimelineComponent: React.FC<Props> = ({
   kqlQueryExpression,
   onChangeItemsPerPage,
   onClose,
-  onDataProviderEdited,
-  onDataProviderRemoved,
-  onToggleDataProviderEnabled,
-  onToggleDataProviderExcluded,
-  onToggleDataProviderType,
   show,
   showCallOutUnauthorizedMsg,
   start,
@@ -270,11 +253,6 @@ export const TimelineComponent: React.FC<Props> = ({
             dataProviders={dataProviders}
             filterManager={filterManager}
             graphEventId={graphEventId}
-            onDataProviderEdited={onDataProviderEdited}
-            onDataProviderRemoved={onDataProviderRemoved}
-            onToggleDataProviderEnabled={onToggleDataProviderEnabled}
-            onToggleDataProviderExcluded={onToggleDataProviderExcluded}
-            onToggleDataProviderType={onToggleDataProviderType}
             show={show}
             showCallOutUnauthorizedMsg={showCallOutUnauthorizedMsg}
             timelineId={id}
@@ -324,7 +302,7 @@ export const TimelineComponent: React.FC<Props> = ({
                   onChangeItemsPerPage={onChangeItemsPerPage}
                   onChangePage={loadPage}
                   serverSideEventCount={totalCount}
-                  totalPages={pageInfo.totalPages}
+                  totalCount={pageInfo.fakeTotalCount}
                 />
               </StyledEuiFlyoutFooter>
             )
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/index.tsx b/x-pack/plugins/security_solution/public/timelines/containers/index.tsx
index 54db52b985c31..53944fd29a687 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/containers/index.tsx
@@ -15,11 +15,13 @@ import { inputsModel } from '../../common/store';
 import { useKibana } from '../../common/lib/kibana';
 import { createFilter } from '../../common/containers/helpers';
 import { DocValueFields } from '../../common/containers/query_template';
+import { generateTablePaginationOptions } from '../../common/components/paginated_table/helpers';
 import { timelineActions } from '../../timelines/store/timeline';
 import { detectionsTimelineIds, skipQueryForDetectionsPage } from './helpers';
 import { getInspectResponse } from '../../helpers';
 import {
   Direction,
+  PageInfoPaginated,
   TimelineEventsQueries,
   TimelineEventsAllStrategyResponse,
   TimelineEventsAllRequestOptions,
@@ -35,10 +37,7 @@ export interface TimelineArgs {
   id: string;
   inspect: InspectResponse;
   loadPage: LoadPage;
-  pageInfo: {
-    activePage: number;
-    totalPages: number;
-  };
+  pageInfo: PageInfoPaginated;
   refetch: inputsModel.Refetch;
   totalCount: number;
   updatedAt: number;
@@ -97,10 +96,7 @@ export const useTimelineEvents = ({
             from: startDate,
             to: endDate,
           },
-          pagination: {
-            activePage,
-            querySize: limit,
-          },
+          pagination: generateTablePaginationOptions(activePage, limit),
           sort,
           defaultIndex: indexNames,
           docValueFields: docValueFields ?? [],
@@ -134,7 +130,8 @@ export const useTimelineEvents = ({
     totalCount: -1,
     pageInfo: {
       activePage: 0,
-      totalPages: 0,
+      fakeTotalCount: 0,
+      showMorePagesIndicator: false,
     },
     events: [],
     loadPage: wrappedLoadPage,
@@ -218,10 +215,7 @@ export const useTimelineEvents = ({
         defaultIndex: indexNames,
         docValueFields: docValueFields ?? [],
         filterQuery: createFilter(filterQuery),
-        pagination: {
-          activePage,
-          querySize: limit,
-        },
+        pagination: generateTablePaginationOptions(activePage, limit),
         timerange: {
           interval: '12h',
           from: startDate,
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/epic_local_storage.test.tsx b/x-pack/plugins/security_solution/public/timelines/store/timeline/epic_local_storage.test.tsx
index 1f79b26394a69..1992b1f88f064 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/epic_local_storage.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/epic_local_storage.test.tsx
@@ -96,11 +96,6 @@ describe('epicLocalStorage', () => {
       loadingSourcerer: false,
       onChangeItemsPerPage: jest.fn(),
       onClose: jest.fn(),
-      onDataProviderEdited: jest.fn(),
-      onDataProviderRemoved: jest.fn(),
-      onToggleDataProviderEnabled: jest.fn(),
-      onToggleDataProviderExcluded: jest.fn(),
-      onToggleDataProviderType: jest.fn(),
       show: true,
       showCallOutUnauthorizedMsg: false,
       start: startDate,
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts
index fc178df86362b..30d0796443ab5 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts
@@ -1209,17 +1209,20 @@ export const updateTimelinePerPageOptions = ({
 
 const removeAndProvider = (andProviderId: string, providerId: string, timeline: TimelineModel) => {
   const providerIndex = timeline.dataProviders.findIndex((p) => p.id === providerId);
-  const providerAndIndex = timeline.dataProviders[providerIndex].and.findIndex(
+  const providerAndIndex = timeline.dataProviders[providerIndex]?.and.findIndex(
     (p) => p.id === andProviderId
   );
+
   return [
     ...timeline.dataProviders.slice(0, providerIndex),
     {
       ...timeline.dataProviders[providerIndex],
-      and: [
-        ...timeline.dataProviders[providerIndex].and.slice(0, providerAndIndex),
-        ...timeline.dataProviders[providerIndex].and.slice(providerAndIndex + 1),
-      ],
+      and: timeline.dataProviders[providerIndex]?.and
+        ? [
+            ...timeline.dataProviders[providerIndex]?.and.slice(0, providerAndIndex),
+            ...timeline.dataProviders[providerIndex]?.and.slice(providerAndIndex + 1),
+          ]
+        : [],
     },
     ...timeline.dataProviders.slice(providerIndex + 1),
   ];
@@ -1229,7 +1232,7 @@ const removeProvider = (providerId: string, timeline: TimelineModel) => {
   const providerIndex = timeline.dataProviders.findIndex((p) => p.id === providerId);
   return [
     ...timeline.dataProviders.slice(0, providerIndex),
-    ...(timeline.dataProviders[providerIndex].and.length
+    ...(timeline.dataProviders[providerIndex]?.and.length
       ? [
           {
             ...timeline.dataProviders[providerIndex].and.slice(0, 1)[0],
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/trusted_apps.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/trusted_apps.test.ts
index 98c9b79f32d6b..9e9a35ea35318 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/trusted_apps.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/trusted_apps.test.ts
@@ -240,7 +240,7 @@ describe('when invoking endpoint trusted apps route handlers', () => {
       os: 'windows',
       entries: [
         {
-          field: 'process.path.text',
+          field: 'process.executable.text',
           type: 'match',
           operator: 'included',
           value: 'c:/programs files/Anti-Virus',
@@ -293,7 +293,7 @@ describe('when invoking endpoint trusted apps route handlers', () => {
         description: 'this one is ok',
         entries: [
           {
-            field: 'process.path.text',
+            field: 'process.executable.text',
             operator: 'included',
             type: 'match',
             value: 'c:/programs files/Anti-Virus',
@@ -320,7 +320,7 @@ describe('when invoking endpoint trusted apps route handlers', () => {
             description: 'this one is ok',
             entries: [
               {
-                field: 'process.path.text',
+                field: 'process.executable.text',
                 operator: 'included',
                 type: 'match',
                 value: 'c:/programs files/Anti-Virus',
@@ -357,7 +357,7 @@ describe('when invoking endpoint trusted apps route handlers', () => {
     it('should trim condition entry values', async () => {
       const newTrustedApp = createNewTrustedAppBody();
       newTrustedApp.entries.push({
-        field: 'process.path.text',
+        field: 'process.executable.text',
         value: '\n    some value \r\n ',
         operator: 'included',
         type: 'match',
@@ -366,13 +366,13 @@ describe('when invoking endpoint trusted apps route handlers', () => {
       await routeHandler(context, request, response);
       expect(exceptionsListClient.createExceptionListItem.mock.calls[0][0].entries).toEqual([
         {
-          field: 'process.path.text',
+          field: 'process.executable.text',
           operator: 'included',
           type: 'match',
           value: 'c:/programs files/Anti-Virus',
         },
         {
-          field: 'process.path.text',
+          field: 'process.executable.text',
           value: 'some value',
           operator: 'included',
           type: 'match',
@@ -392,7 +392,7 @@ describe('when invoking endpoint trusted apps route handlers', () => {
       await routeHandler(context, request, response);
       expect(exceptionsListClient.createExceptionListItem.mock.calls[0][0].entries).toEqual([
         {
-          field: 'process.path.text',
+          field: 'process.executable.text',
           operator: 'included',
           type: 'match',
           value: 'c:/programs files/Anti-Virus',
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.test.ts
index 2f7dd22c0c78e..75a7de8cd2c44 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.test.ts
@@ -11,8 +11,15 @@ import {
   sampleIdGuid,
   sampleDocWithAncestors,
   sampleRuleSO,
+  sampleDocNoSortIdNoVersion,
 } from './__mocks__/es_results';
-import { buildBulkBody, buildSignalFromSequence, buildSignalFromEvent } from './build_bulk_body';
+import {
+  buildBulkBody,
+  buildSignalFromSequence,
+  buildSignalFromEvent,
+  objectPairIntersection,
+  objectArrayIntersection,
+} from './build_bulk_body';
 import { SignalHit } from './types';
 import { getListArrayMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
 
@@ -438,13 +445,20 @@ describe('buildBulkBody', () => {
 
 describe('buildSignalFromSequence', () => {
   test('builds a basic signal from a sequence of building blocks', () => {
-    const blocks = [sampleDocWithAncestors().hits.hits[0], sampleDocWithAncestors().hits.hits[0]];
+    const block1 = sampleDocWithAncestors().hits.hits[0];
+    block1._source.new_key = 'new_key_value';
+    block1._source.new_key2 = 'new_key2_value';
+    const block2 = sampleDocWithAncestors().hits.hits[0];
+    block2._source.new_key = 'new_key_value';
+    const blocks = [block1, block2];
     const ruleSO = sampleRuleSO();
     const signal = buildSignalFromSequence(blocks, ruleSO);
     // Timestamp will potentially always be different so remove it for the test
     // @ts-expect-error
     delete signal['@timestamp'];
-    const expected: Omit<SignalHit, '@timestamp'> = {
+    const expected: Omit<SignalHit, '@timestamp'> & { someKey: string; new_key: string } = {
+      someKey: 'someValue',
+      new_key: 'new_key_value',
       event: {
         kind: 'signal',
       },
@@ -539,6 +553,96 @@ describe('buildSignalFromSequence', () => {
     };
     expect(signal).toEqual(expected);
   });
+
+  test('builds a basic signal if there is no overlap between source events', () => {
+    const block1 = sampleDocNoSortIdNoVersion();
+    const block2 = sampleDocNoSortIdNoVersion();
+    block2._source['@timestamp'] = '2021-05-20T22:28:46+0000';
+    block2._source.someKey = 'someOtherValue';
+    const ruleSO = sampleRuleSO();
+    const signal = buildSignalFromSequence([block1, block2], ruleSO);
+    // Timestamp will potentially always be different so remove it for the test
+    // @ts-expect-error
+    delete signal['@timestamp'];
+    const expected: Omit<SignalHit, '@timestamp'> = {
+      event: {
+        kind: 'signal',
+      },
+      signal: {
+        parents: [
+          {
+            id: sampleIdGuid,
+            type: 'event',
+            index: 'myFakeSignalIndex',
+            depth: 0,
+          },
+          {
+            id: sampleIdGuid,
+            type: 'event',
+            index: 'myFakeSignalIndex',
+            depth: 0,
+          },
+        ],
+        ancestors: [
+          {
+            id: sampleIdGuid,
+            type: 'event',
+            index: 'myFakeSignalIndex',
+            depth: 0,
+          },
+          {
+            id: sampleIdGuid,
+            type: 'event',
+            index: 'myFakeSignalIndex',
+            depth: 0,
+          },
+        ],
+        status: 'open',
+        rule: {
+          actions: [],
+          author: ['Elastic'],
+          building_block_type: 'default',
+          id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+          rule_id: 'rule-1',
+          false_positives: [],
+          max_signals: 10000,
+          risk_score: 50,
+          risk_score_mapping: [],
+          output_index: '.siem-signals',
+          description: 'Detecting root and admin users',
+          from: 'now-6m',
+          immutable: false,
+          index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
+          interval: '5m',
+          language: 'kuery',
+          license: 'Elastic License',
+          name: 'rule-name',
+          query: 'user.name: root or user.name: admin',
+          references: ['http://google.com'],
+          severity: 'high',
+          severity_mapping: [],
+          tags: ['some fake tag 1', 'some fake tag 2'],
+          threat: [],
+          type: 'query',
+          to: 'now',
+          note: '',
+          enabled: true,
+          created_by: 'sample user',
+          updated_by: 'sample user',
+          version: 1,
+          updated_at: ruleSO.updated_at ?? '',
+          created_at: ruleSO.attributes.createdAt,
+          throttle: 'no_actions',
+          exceptions_list: getListArrayMock(),
+        },
+        depth: 1,
+        group: {
+          id: '269c1f5754bff92fb8040283b687258e99b03e8b2ab1262cc20c82442e5de5ea',
+        },
+      },
+    };
+    expect(signal).toEqual(expected);
+  });
 });
 
 describe('buildSignalFromEvent', () => {
@@ -632,3 +736,341 @@ describe('buildSignalFromEvent', () => {
     expect(signal).toEqual(expected);
   });
 });
+
+describe('recursive intersection between objects', () => {
+  test('should treat numbers and strings as unequal', () => {
+    const a = {
+      field1: 1,
+      field2: 1,
+    };
+    const b = {
+      field1: 1,
+      field2: '1',
+    };
+    const intersection = objectPairIntersection(a, b);
+    const expected = {
+      field1: 1,
+    };
+    expect(intersection).toEqual(expected);
+  });
+
+  test('should strip unequal numbers and strings', () => {
+    const a = {
+      field1: 1,
+      field2: 1,
+      field3: 'abcd',
+      field4: 'abcd',
+    };
+    const b = {
+      field1: 1,
+      field2: 100,
+      field3: 'abcd',
+      field4: 'wxyz',
+    };
+    const intersection = objectPairIntersection(a, b);
+    const expected = {
+      field1: 1,
+      field3: 'abcd',
+    };
+    expect(intersection).toEqual(expected);
+  });
+
+  test('should handle null values', () => {
+    const a = {
+      field1: 1,
+      field2: '1',
+      field3: null,
+    };
+    const b = {
+      field1: null,
+      field2: null,
+      field3: null,
+    };
+    const intersection = objectPairIntersection(a, b);
+    const expected = {
+      field3: null,
+    };
+    expect(intersection).toEqual(expected);
+  });
+
+  test('should handle explicit undefined values and return undefined if left with only undefined fields', () => {
+    const a = {
+      field1: 1,
+      field2: '1',
+      field3: undefined,
+    };
+    const b = {
+      field1: undefined,
+      field2: undefined,
+      field3: undefined,
+    };
+    const intersection = objectPairIntersection(a, b);
+    const expected = undefined;
+    expect(intersection).toEqual(expected);
+  });
+
+  test('should strip arrays out regardless of whether they are equal', () => {
+    const a = {
+      array_field1: [1, 2],
+      array_field2: [1, 2],
+    };
+    const b = {
+      array_field1: [1, 2],
+      array_field2: [3, 4],
+    };
+    const intersection = objectPairIntersection(a, b);
+    const expected = undefined;
+    expect(intersection).toEqual(expected);
+  });
+
+  test('should strip fields that are not in both objects', () => {
+    const a = {
+      field1: 1,
+    };
+    const b = {
+      field2: 1,
+    };
+    const intersection = objectPairIntersection(a, b);
+    const expected = undefined;
+    expect(intersection).toEqual(expected);
+  });
+
+  test('should work on objects within objects', () => {
+    const a = {
+      container_field: {
+        field1: 1,
+        field2: 1,
+        field3: 10,
+        field5: 1,
+        field6: null,
+        array_field: [1, 2],
+        nested_container_field: {
+          field1: 1,
+          field2: 1,
+        },
+        nested_container_field2: {
+          field1: undefined,
+        },
+      },
+      container_field_without_intersection: {
+        sub_field1: 1,
+      },
+    };
+    const b = {
+      container_field: {
+        field1: 1,
+        field2: 2,
+        field4: 10,
+        field5: '1',
+        field6: null,
+        array_field: [1, 2],
+        nested_container_field: {
+          field1: 1,
+          field2: 2,
+        },
+        nested_container_field2: {
+          field1: undefined,
+        },
+      },
+      container_field_without_intersection: {
+        sub_field2: 1,
+      },
+    };
+    const intersection = objectPairIntersection(a, b);
+    const expected = {
+      container_field: {
+        field1: 1,
+        field6: null,
+        nested_container_field: {
+          field1: 1,
+        },
+      },
+    };
+    expect(intersection).toEqual(expected);
+  });
+
+  test('should work on objects with a variety of fields', () => {
+    const a = {
+      field1: 1,
+      field2: 1,
+      field3: 10,
+      field5: 1,
+      field6: null,
+      array_field: [1, 2],
+      container_field: {
+        sub_field1: 1,
+        sub_field2: 1,
+        sub_field3: 10,
+      },
+      container_field_without_intersection: {
+        sub_field1: 1,
+      },
+    };
+    const b = {
+      field1: 1,
+      field2: 2,
+      field4: 10,
+      field5: '1',
+      field6: null,
+      array_field: [1, 2],
+      container_field: {
+        sub_field1: 1,
+        sub_field2: 2,
+        sub_field4: 10,
+      },
+      container_field_without_intersection: {
+        sub_field2: 1,
+      },
+    };
+    const intersection = objectPairIntersection(a, b);
+    const expected = {
+      field1: 1,
+      field6: null,
+      container_field: {
+        sub_field1: 1,
+      },
+    };
+    expect(intersection).toEqual(expected);
+  });
+});
+
+describe('objectArrayIntersection', () => {
+  test('should return undefined if the array is empty', () => {
+    const intersection = objectArrayIntersection([]);
+    const expected = undefined;
+    expect(intersection).toEqual(expected);
+  });
+  test('should return the initial object if there is only 1', () => {
+    const a = {
+      field1: 1,
+      field2: 1,
+      field3: 10,
+      field5: 1,
+      field6: null,
+      array_field: [1, 2],
+      container_field: {
+        sub_field1: 1,
+        sub_field2: 1,
+        sub_field3: 10,
+      },
+      container_field_without_intersection: {
+        sub_field1: 1,
+      },
+    };
+    const intersection = objectArrayIntersection([a]);
+    const expected = {
+      field1: 1,
+      field2: 1,
+      field3: 10,
+      field5: 1,
+      field6: null,
+      array_field: [1, 2],
+      container_field: {
+        sub_field1: 1,
+        sub_field2: 1,
+        sub_field3: 10,
+      },
+      container_field_without_intersection: {
+        sub_field1: 1,
+      },
+    };
+    expect(intersection).toEqual(expected);
+  });
+  test('should work with exactly 2 objects', () => {
+    const a = {
+      field1: 1,
+      field2: 1,
+      field3: 10,
+      field5: 1,
+      field6: null,
+      array_field: [1, 2],
+      container_field: {
+        sub_field1: 1,
+        sub_field2: 1,
+        sub_field3: 10,
+      },
+      container_field_without_intersection: {
+        sub_field1: 1,
+      },
+    };
+    const b = {
+      field1: 1,
+      field2: 2,
+      field4: 10,
+      field5: '1',
+      field6: null,
+      array_field: [1, 2],
+      container_field: {
+        sub_field1: 1,
+        sub_field2: 2,
+        sub_field4: 10,
+      },
+      container_field_without_intersection: {
+        sub_field2: 1,
+      },
+    };
+    const intersection = objectArrayIntersection([a, b]);
+    const expected = {
+      field1: 1,
+      field6: null,
+      container_field: {
+        sub_field1: 1,
+      },
+    };
+    expect(intersection).toEqual(expected);
+  });
+
+  test('should work with 3 or more objects', () => {
+    const a = {
+      field1: 1,
+      field2: 1,
+      field3: 10,
+      field5: 1,
+      field6: null,
+      array_field: [1, 2],
+      container_field: {
+        sub_field1: 1,
+        sub_field2: 1,
+        sub_field3: 10,
+      },
+      container_field_without_intersection: {
+        sub_field1: 1,
+      },
+    };
+    const b = {
+      field1: 1,
+      field2: 2,
+      field4: 10,
+      field5: '1',
+      field6: null,
+      array_field: [1, 2],
+      container_field: {
+        sub_field1: 1,
+        sub_field2: 2,
+        sub_field4: 10,
+      },
+      container_field_without_intersection: {
+        sub_field2: 1,
+      },
+    };
+    const c = {
+      field1: 1,
+      field2: 2,
+      field4: 10,
+      field5: '1',
+      array_field: [1, 2],
+      container_field: {
+        sub_field2: 2,
+        sub_field4: 10,
+      },
+      container_field_without_intersection: {
+        sub_field2: 1,
+      },
+    };
+    const intersection = objectArrayIntersection([a, b, c]);
+    const expected = {
+      field1: 1,
+    };
+    expect(intersection).toEqual(expected);
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.ts
index f8632a85c77e9..8e9571fe8a445 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.ts
@@ -129,7 +129,9 @@ export const buildSignalFromSequence = (
 ): SignalHit => {
   const rule = buildRuleWithoutOverrides(ruleSO);
   const signal: Signal = buildSignal(events, rule);
+  const mergedEvents = objectArrayIntersection(events.map((event) => event._source));
   return {
+    ...mergedEvents,
     '@timestamp': new Date().toISOString(),
     event: {
       kind: 'signal',
@@ -167,3 +169,54 @@ export const buildSignalFromEvent = (
   };
   return signalHit;
 };
+
+export const objectArrayIntersection = (objects: object[]) => {
+  if (objects.length === 0) {
+    return undefined;
+  } else if (objects.length === 1) {
+    return objects[0];
+  } else {
+    return objects
+      .slice(1)
+      .reduce(
+        (acc: object | undefined, obj): object | undefined => objectPairIntersection(acc, obj),
+        objects[0]
+      );
+  }
+};
+
+export const objectPairIntersection = (a: object | undefined, b: object | undefined) => {
+  if (a === undefined || b === undefined) {
+    return undefined;
+  }
+  const intersection: Record<string, unknown> = {};
+  Object.entries(a).forEach(([key, aVal]) => {
+    if (key in b) {
+      const bVal = (b as Record<string, unknown>)[key];
+      if (
+        typeof aVal === 'object' &&
+        !(aVal instanceof Array) &&
+        aVal !== null &&
+        typeof bVal === 'object' &&
+        !(bVal instanceof Array) &&
+        bVal !== null
+      ) {
+        intersection[key] = objectPairIntersection(aVal, bVal);
+      } else if (aVal === bVal) {
+        intersection[key] = aVal;
+      }
+    }
+  });
+  // Count up the number of entries that are NOT undefined in the intersection
+  // If there are no keys OR all entries are undefined, return undefined
+  if (
+    Object.values(intersection).reduce(
+      (acc: number, value) => (value !== undefined ? acc + 1 : acc),
+      0
+    ) === 0
+  ) {
+    return undefined;
+  } else {
+    return intersection;
+  }
+};
diff --git a/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/all/index.ts b/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/all/index.ts
index 12729eb88a666..6b28fc2598d41 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/all/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/all/index.ts
@@ -42,17 +42,19 @@ export const timelineEventsAll: SecuritySolutionTimelineFactory<TimelineEventsQu
       ...fieldRequested,
       ...reduceFields(TIMELINE_EVENTS_FIELDS, eventFieldsMap),
     ]);
-    const { activePage, querySize } = options.pagination;
+    const { activePage, cursorStart, fakePossibleCount, querySize } = options.pagination;
 
     const totalCount = getOr(0, 'hits.total.value', response.rawResponse);
     const hits = response.rawResponse.hits.hits;
-    const edges: TimelineEdges[] = hits.map((hit) =>
+    const edges: TimelineEdges[] = hits.splice(cursorStart, querySize - cursorStart).map((hit) =>
       // @ts-expect-error
       formatTimelineData(options.fieldRequested, TIMELINE_EVENTS_FIELDS, hit, eventFieldsMap)
     );
     const inspect = {
       dsl: [inspectStringifyObject(buildTimelineEventsAllQuery(queryOptions))],
     };
+    const fakeTotalCount = fakePossibleCount <= totalCount ? fakePossibleCount : totalCount;
+    const showMorePagesIndicator = totalCount > fakeTotalCount;
 
     return {
       ...response,
@@ -61,7 +63,8 @@ export const timelineEventsAll: SecuritySolutionTimelineFactory<TimelineEventsQu
       totalCount,
       pageInfo: {
         activePage: activePage ?? 0,
-        totalPages: Math.ceil(totalCount / querySize),
+        fakeTotalCount,
+        showMorePagesIndicator,
       },
     };
   },
diff --git a/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx b/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx
index 911a6b78a4944..95295b8e64732 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx
@@ -58,7 +58,7 @@ export class CustomizeSpace extends Component<Props, State> {
     };
 
     return (
-      <SectionPanel collapsible={false} title={panelTitle} description={panelTitle}>
+      <SectionPanel title={panelTitle} description={panelTitle}>
         <EuiDescribedFormGroup
           title={
             <EuiTitle size="xs">
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
index ee1eb7c5e9aba..063a34091c4e7 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
+++ b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
@@ -2,10 +2,8 @@
 
 exports[`EnabledFeatures renders as expected 1`] = `
 <SectionPanel
-  collapsible={false}
   data-test-subj="enabled-features-panel"
   description="Customize visible features"
-  initiallyCollapsed={false}
   title={
     <span>
       <FormattedMessage
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
index 5e7629c29bbdd..7d8516f396e79 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
@@ -34,8 +34,6 @@ export class EnabledFeatures extends Component<Props, {}> {
 
     return (
       <SectionPanel
-        collapsible={false}
-        initiallyCollapsed={false}
         title={this.getPanelTitle()}
         description={description}
         data-test-subj="enabled-features-panel"
diff --git a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.scss b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.scss
index 4f73349edac20..35b9dc1d45661 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.scss
+++ b/x-pack/plugins/spaces/public/management/edit_space/enabled_features/feature_table.scss
@@ -1,4 +1,4 @@
 .spcFeatureTableAccordionContent {
   // Align accordion content with the feature category logo in the accordion's buttonContent
   padding-left: $euiSizeXL;
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/spaces/public/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap b/x-pack/plugins/spaces/public/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
index 8d54413cda28c..b9d054d6309d0 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
+++ b/x-pack/plugins/spaces/public/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
@@ -24,17 +24,6 @@ exports[`it renders without blowing up 1`] = `
         </h2>
       </EuiTitle>
     </EuiFlexItem>
-    <EuiFlexItem
-      grow={false}
-    >
-      <EuiLink
-        aria-label="hide desc"
-        data-test-subj="show-hide-section-link"
-        onClick={[Function]}
-      >
-        hide
-      </EuiLink>
-    </EuiFlexItem>
   </EuiFlexGroup>
   <EuiSpacer />
   <p>
diff --git a/x-pack/plugins/spaces/public/management/edit_space/section_panel/section_panel.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/section_panel/section_panel.test.tsx
index 0b8085ff1ad16..576881398a63c 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/section_panel/section_panel.test.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/section_panel/section_panel.test.tsx
@@ -4,14 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiLink } from '@elastic/eui';
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { SectionPanel } from './section_panel';
 
 test('it renders without blowing up', () => {
   const wrapper = shallowWithIntl(
-    <SectionPanel collapsible iconType="logoElasticsearch" title="Elasticsearch" description="desc">
+    <SectionPanel iconType="logoElasticsearch" title="Elasticsearch" description="desc">
       <p>child</p>
     </SectionPanel>
   );
@@ -19,9 +18,9 @@ test('it renders without blowing up', () => {
   expect(wrapper).toMatchSnapshot();
 });
 
-test('it renders children by default', () => {
+test('it renders children', () => {
   const wrapper = mountWithIntl(
-    <SectionPanel collapsible iconType="logoElasticsearch" title="Elasticsearch" description="desc">
+    <SectionPanel iconType="logoElasticsearch" title="Elasticsearch" description="desc">
       <p className="child">child 1</p>
       <p className="child">child 2</p>
     </SectionPanel>
@@ -30,19 +29,3 @@ test('it renders children by default', () => {
   expect(wrapper.find(SectionPanel)).toHaveLength(1);
   expect(wrapper.find('.child')).toHaveLength(2);
 });
-
-test('it hides children when the "hide" link is clicked', () => {
-  const wrapper = mountWithIntl(
-    <SectionPanel collapsible iconType="logoElasticsearch" title="Elasticsearch" description="desc">
-      <p className="child">child 1</p>
-      <p className="child">child 2</p>
-    </SectionPanel>
-  );
-
-  expect(wrapper.find(SectionPanel)).toHaveLength(1);
-  expect(wrapper.find('.child')).toHaveLength(2);
-
-  wrapper.find(EuiLink).simulate('click');
-
-  expect(wrapper.find('.child')).toHaveLength(0);
-});
diff --git a/x-pack/plugins/spaces/public/management/edit_space/section_panel/section_panel.tsx b/x-pack/plugins/spaces/public/management/edit_space/section_panel/section_panel.tsx
index a6d25511acba6..492932aa95741 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/section_panel/section_panel.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/section_panel/section_panel.tsx
@@ -8,39 +8,20 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiIcon,
-  EuiLink,
   EuiPanel,
   EuiSpacer,
   EuiTitle,
   IconType,
 } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
 import React, { Component, Fragment, ReactNode } from 'react';
 
 interface Props {
   iconType?: IconType;
   title: string | ReactNode;
   description: string;
-  collapsible: boolean;
-  initiallyCollapsed?: boolean;
 }
 
-interface State {
-  collapsed: boolean;
-}
-
-export class SectionPanel extends Component<Props, State> {
-  public state = {
-    collapsed: false,
-  };
-
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      collapsed: props.initiallyCollapsed || false,
-    };
-  }
-
+export class SectionPanel extends Component<Props, {}> {
   public render() {
     return (
       <EuiPanel>
@@ -51,30 +32,6 @@ export class SectionPanel extends Component<Props, State> {
   }
 
   public getTitle = () => {
-    const showLinkText = i18n.translate('xpack.spaces.management.collapsiblePanel.showLinkText', {
-      defaultMessage: 'show',
-    });
-
-    const hideLinkText = i18n.translate('xpack.spaces.management.collapsiblePanel.hideLinkText', {
-      defaultMessage: 'hide',
-    });
-
-    const showLinkDescription = i18n.translate(
-      'xpack.spaces.management.collapsiblePanel.showLinkDescription',
-      {
-        defaultMessage: 'show {title}',
-        values: { title: this.props.description },
-      }
-    );
-
-    const hideLinkDescription = i18n.translate(
-      'xpack.spaces.management.collapsiblePanel.hideLinkDescription',
-      {
-        defaultMessage: 'hide {title}',
-        values: { title: this.props.description },
-      }
-    );
-
     return (
       <EuiFlexGroup alignItems={'baseline'} gutterSize="s" responsive={false}>
         <EuiFlexItem grow={false}>
@@ -93,26 +50,11 @@ export class SectionPanel extends Component<Props, State> {
             </h2>
           </EuiTitle>
         </EuiFlexItem>
-        {this.props.collapsible && (
-          <EuiFlexItem grow={false}>
-            <EuiLink
-              data-test-subj="show-hide-section-link"
-              onClick={this.toggleCollapsed}
-              aria-label={this.state.collapsed ? showLinkDescription : hideLinkDescription}
-            >
-              {this.state.collapsed ? showLinkText : hideLinkText}
-            </EuiLink>
-          </EuiFlexItem>
-        )}
       </EuiFlexGroup>
     );
   };
 
   public getForm = () => {
-    if (this.state.collapsed) {
-      return null;
-    }
-
     return (
       <Fragment>
         <EuiSpacer />
@@ -120,10 +62,4 @@ export class SectionPanel extends Component<Props, State> {
       </Fragment>
     );
   };
-
-  public toggleCollapsed = () => {
-    this.setState({
-      collapsed: !this.state.collapsed,
-    });
-  };
 }
diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
index b08585066f100..bdafbfd8ec967 100644
--- a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
+++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
@@ -1,5 +1,83 @@
 {
   "properties": {
+    "actions": {
+      "properties": {
+        "count_total": {
+          "type": "long"
+        },
+        "count_active_total": {
+          "type": "long"
+        },
+        "count_by_type": {
+          "properties": {
+            "DYNAMIC_KEY": {
+              "type": "long"
+            },
+            "__email": {
+              "type": "long"
+            },
+            "__index": {
+              "type": "long"
+            },
+            "__pagerduty": {
+              "type": "long"
+            },
+            "__server-log": {
+              "type": "long"
+            },
+            "__slack": {
+              "type": "long"
+            },
+            "__webhook": {
+              "type": "long"
+            },
+            "__servicenow": {
+              "type": "long"
+            },
+            "__jira": {
+              "type": "long"
+            },
+            "__resilient": {
+              "type": "long"
+            }
+          }
+        },
+        "count_active_by_type": {
+          "properties": {
+            "DYNAMIC_KEY": {
+              "type": "long"
+            },
+            "__email": {
+              "type": "long"
+            },
+            "__index": {
+              "type": "long"
+            },
+            "__pagerduty": {
+              "type": "long"
+            },
+            "__server-log": {
+              "type": "long"
+            },
+            "__slack": {
+              "type": "long"
+            },
+            "__webhook": {
+              "type": "long"
+            },
+            "__servicenow": {
+              "type": "long"
+            },
+            "__jira": {
+              "type": "long"
+            },
+            "__resilient": {
+              "type": "long"
+            }
+          }
+        }
+      }
+    },
     "canvas": {
       "properties": {
         "workpads": {
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index bd9a66b48f633..f144cbd3873f7 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -2962,7 +2962,6 @@
     "telemetry.provideUsageStatisticsAriaName": "使用統計を提供",
     "telemetry.provideUsageStatisticsTitle": "使用統計を提供",
     "telemetry.readOurUsageDataPrivacyStatementLinkText": "プライバシーポリシー",
-    "telemetry.seeExampleOfWhatWeCollectLinkText": "収集されるデータの例を見る",
     "telemetry.telemetryBannerDescription": "Elastic Stackの改善にご協力ください使用状況データの収集は現在無効です。使用状況データの収集を有効にすると、製品とサービスを管理して改善することができます。詳細については、{privacyStatementLink}をご覧ください。",
     "telemetry.telemetryConfigAndLinkDescription": "使用状況データの収集を有効にすると、製品とサービスを管理して改善することができます。詳細については、{privacyStatementLink}をご覧ください。",
     "telemetry.telemetryConfigDescription": "基本的な機能の利用状況に関する統計情報を提供して、Elastic Stack の改善にご協力ください。このデータは Elastic 社外と共有されません。",
@@ -14303,8 +14302,6 @@
     "xpack.security.management.editRole.elasticSearchPrivileges.manageRoleActionsDescription": "このロールがクラスターに対して実行できる操作を管理します。 ",
     "xpack.security.management.editRole.elasticSearchPrivileges.runAsPrivilegesTitle": "権限として実行",
     "xpack.security.management.editRole.featureTable.customizeSubFeaturePrivilegesSwitchLabel": "サブ機能権限をカスタマイズする",
-    "xpack.security.management.editRole.featureTable.enabledRoleFeaturesEnabledColumnTitle": "権限",
-    "xpack.security.management.editRole.featureTable.enabledRoleFeaturesFeatureColumnTitle": "機能",
     "xpack.security.management.editRole.featureTable.privilegeCustomizationTooltip": "機能でサブ機能の権限がカスタマイズされています。この行を展開すると詳細が表示されます。",
     "xpack.security.management.editRole.indexPrivilegeForm.deleteSpacePrivilegeAriaLabel": "インデックスの権限を削除",
     "xpack.security.management.editRole.indexPrivilegeForm.grantedDocumentsQueryFormRowLabel": "提供されたドキュメントのクエリ",
@@ -14346,35 +14343,24 @@
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.howToViewAllAvailableSpacesDescription": "利用可能なすべてのスペースを表示する権限がありません。",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.insufficientPrivilegesDescription": "権限が不十分です",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.kibanaAdminTitle": "kibana_admin",
-    "xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDetails": "選択されたスペースの全機能への完全アクセスを許可します。",
-    "xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDisplay": "すべて",
-    "xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDropdownDisplay": "すべて",
     "xpack.security.management.editRole.spacePrivilegeForm.cancelButton": "キャンセル",
     "xpack.security.management.editRole.spacePrivilegeForm.customizeFeaturePrivilegeDescription": "機能ごとに権限のレベルを上げます。機能によってはスペースごとに非表示になっているか、グローバルスペース権限による影響を受けているものもあります。",
     "xpack.security.management.editRole.spacePrivilegeForm.customizeFeaturePrivileges": "機能ごとにカスタマイズ",
-    "xpack.security.management.editRole.spacePrivilegeForm.customPrivilegeDetails": "選択されたスペースの機能ごとにアクセスをカスタマイズします",
-    "xpack.security.management.editRole.spacePrivilegeForm.customPrivilegeDisplay": "カスタム",
-    "xpack.security.management.editRole.spacePrivilegeForm.customPrivilegeDropdownDisplay": "カスタム",
     "xpack.security.management.editRole.spacePrivilegeForm.featurePrivilegeSummaryDescription": "機能によってはスペースごとに非表示になっているか、グローバルスペース権限による影響を受けているものもあります。",
     "xpack.security.management.editRole.spacePrivilegeForm.globalPrivilegeNotice": "これらの権限はすべての現在および未来のスペースに適用されます。",
     "xpack.security.management.editRole.spacePrivilegeForm.globalPrivilegeWarning": "グローバル権限の作成は他のスペース権限に影響を与える可能性があります。",
     "xpack.security.management.editRole.spacePrivilegeForm.modalTitle": "スペース権限",
     "xpack.security.management.editRole.spacePrivilegeForm.privilegeSelectorFormLabel": "権限",
-    "xpack.security.management.editRole.spacePrivilegeForm.readPrivilegeDetails": "選択されたスペースの全機能への読み込み専用アクセスを許可します。",
-    "xpack.security.management.editRole.spacePrivilegeForm.readPrivilegeDisplay": "読み込み",
-    "xpack.security.management.editRole.spacePrivilegeForm.readPrivilegeDropdownDisplay": "読み込み",
     "xpack.security.management.editRole.spacePrivilegeForm.spaceSelectorFormLabel": "スペース",
     "xpack.security.management.editRole.spacePrivilegeForm.summaryOfFeaturePrivileges": "機能権限のサマリー",
     "xpack.security.management.editRole.spacePrivilegeForm.supersededWarning": "宣言された権限は、構成済みグローバル権限よりも許容度が低くなります。権限サマリーを表示すると有効な権限がわかります。",
     "xpack.security.management.editRole.spacePrivilegeForm.supersededWarningTitle": "グローバル権限に置き換え",
     "xpack.security.management.editRole.spacePrivilegeMatrix.globalSpaceName": "グローバル",
-    "xpack.security.management.editRole.spacePrivilegeMatrix.showAllSpacesLink": "(すべてのスペース)",
     "xpack.security.management.editRole.spacePrivilegeMatrix.showNMoreSpacesLink": "他 {count} 件",
     "xpack.security.management.editRole.spacePrivilegeSection.addSpacePrivilegeButton": "スペース権限を追加",
     "xpack.security.management.editRole.spacePrivilegeSection.noAccessToKibanaTitle": "このロールは Kibana へのアクセスを許可しません",
     "xpack.security.management.editRole.spacePrivilegeTable.deletePrivilegesLabel": "次のスペースの権限を削除: {spaceNames}",
     "xpack.security.management.editRole.spacePrivilegeTable.editPrivilegesLabel": "次のスペースの権限を編集: {spaceNames}",
-    "xpack.security.management.editRole.spacePrivilegeTable.showAllSpacesLink": "スペースを表示",
     "xpack.security.management.editRole.spacePrivilegeTable.showLessSpacesLink": "縮小表示",
     "xpack.security.management.editRole.spacePrivilegeTable.showNMoreSpacesLink": "他 {count} 件",
     "xpack.security.management.editRole.spacePrivilegeTable.supersededPrivilegeWarning": "権限は、構成されたグローバル権限に置き換わります。権限サマリーを表示すると有効な権限がわかります。",
@@ -17361,10 +17347,6 @@
     "xpack.spaces.management.advancedSettingsSubtitle.applyingSettingsOnPageToSpaceDescription": "このページの設定は、別途指定されていない限り {spaceName}’スペースに適用されます。’",
     "xpack.spaces.management.advancedSettingsTitle.settingsTitle": "設定",
     "xpack.spaces.management.breadcrumb": "スペース",
-    "xpack.spaces.management.collapsiblePanel.hideLinkDescription": "{title} を非表示",
-    "xpack.spaces.management.collapsiblePanel.hideLinkText": "非表示",
-    "xpack.spaces.management.collapsiblePanel.showLinkDescription": "{title} を表示",
-    "xpack.spaces.management.collapsiblePanel.showLinkText": "表示",
     "xpack.spaces.management.confirmAlterActiveSpaceModal.cancelButton": "キャンセル",
     "xpack.spaces.management.confirmAlterActiveSpaceModal.reloadWarningMessage": "このスペースで表示される機能を更新しました。保存後にページが更新されます。",
     "xpack.spaces.management.confirmAlterActiveSpaceModal.title": "スペースの更新の確認",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 3ce9278234005..c4a599fa35e7f 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -2963,7 +2963,6 @@
     "telemetry.provideUsageStatisticsAriaName": "提供使用情况统计",
     "telemetry.provideUsageStatisticsTitle": "提供使用情况统计",
     "telemetry.readOurUsageDataPrivacyStatementLinkText": "隐私声明",
-    "telemetry.seeExampleOfWhatWeCollectLinkText": "查看我们收集的内容示例",
     "telemetry.telemetryBannerDescription": "想帮助我们改进 Elastic Stack？数据使用情况收集当前已禁用。启用数据使用情况收集可帮助我们管理并改善产品和服务。有关详情，请参阅我们的{privacyStatementLink}。",
     "telemetry.telemetryConfigAndLinkDescription": "启用使用情况数据收集可帮助我们管理并改善产品和服务。有关更多详情，请参阅我们的{privacyStatementLink}。",
     "telemetry.telemetryConfigDescription": "通过提供基本功能的使用情况统计信息，来帮助我们改进 Elastic Stack。我们不会在 Elastic 之外共享此数据。",
@@ -14312,8 +14311,6 @@
     "xpack.security.management.editRole.elasticSearchPrivileges.manageRoleActionsDescription": "管理此角色可以对您的集群执行的操作。 ",
     "xpack.security.management.editRole.elasticSearchPrivileges.runAsPrivilegesTitle": "运行身份权限",
     "xpack.security.management.editRole.featureTable.customizeSubFeaturePrivilegesSwitchLabel": "定制子功能权限",
-    "xpack.security.management.editRole.featureTable.enabledRoleFeaturesEnabledColumnTitle": "权限",
-    "xpack.security.management.editRole.featureTable.enabledRoleFeaturesFeatureColumnTitle": "功能",
     "xpack.security.management.editRole.featureTable.privilegeCustomizationTooltip": "功能已定制子功能权限。展开此行以了解更多信息。",
     "xpack.security.management.editRole.indexPrivilegeForm.deleteSpacePrivilegeAriaLabel": "删除索引权限",
     "xpack.security.management.editRole.indexPrivilegeForm.grantedDocumentsQueryFormRowLabel": "已授权文档查询",
@@ -14355,35 +14352,24 @@
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.howToViewAllAvailableSpacesDescription": "您无权查看所有可用工作区。",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.insufficientPrivilegesDescription": "权限不足",
     "xpack.security.management.editRole.spaceAwarePrivilegeForm.kibanaAdminTitle": "kibana_admin",
-    "xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDetails": "授予对选定工作区所有功能的完全访问权限。",
-    "xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDisplay": "全部",
-    "xpack.security.management.editRole.spacePrivilegeForm.allPrivilegeDropdownDisplay": "全部",
     "xpack.security.management.editRole.spacePrivilegeForm.cancelButton": "取消",
     "xpack.security.management.editRole.spacePrivilegeForm.customizeFeaturePrivilegeDescription": "按功能提高权限级别。某些功能可能被工作区隐藏或受全局工作区权限影响。",
     "xpack.security.management.editRole.spacePrivilegeForm.customizeFeaturePrivileges": "按功能定制",
-    "xpack.security.management.editRole.spacePrivilegeForm.customPrivilegeDetails": "在选定工作区中按功能定制访问权限。",
-    "xpack.security.management.editRole.spacePrivilegeForm.customPrivilegeDisplay": "定制",
-    "xpack.security.management.editRole.spacePrivilegeForm.customPrivilegeDropdownDisplay": "定制",
     "xpack.security.management.editRole.spacePrivilegeForm.featurePrivilegeSummaryDescription": "某些功能可能被工作区隐藏或受全局工作区权限影响。",
     "xpack.security.management.editRole.spacePrivilegeForm.globalPrivilegeNotice": "这些权限将应用到所有当前和未来工作区。",
     "xpack.security.management.editRole.spacePrivilegeForm.globalPrivilegeWarning": "创建全局权限可能会影响您的其他工作区权限。",
     "xpack.security.management.editRole.spacePrivilegeForm.modalTitle": "工作区权限",
     "xpack.security.management.editRole.spacePrivilegeForm.privilegeSelectorFormLabel": "权限",
-    "xpack.security.management.editRole.spacePrivilegeForm.readPrivilegeDetails": "授予对选定工作区所有功能的只读访问权限。",
-    "xpack.security.management.editRole.spacePrivilegeForm.readPrivilegeDisplay": "读取",
-    "xpack.security.management.editRole.spacePrivilegeForm.readPrivilegeDropdownDisplay": "读取",
     "xpack.security.management.editRole.spacePrivilegeForm.spaceSelectorFormLabel": "工作区",
     "xpack.security.management.editRole.spacePrivilegeForm.summaryOfFeaturePrivileges": "功能权限的摘要",
     "xpack.security.management.editRole.spacePrivilegeForm.supersededWarning": "声明的权限相对配置的全局权限有较小的宽容度。查看权限摘要以查看有效的权限。",
     "xpack.security.management.editRole.spacePrivilegeForm.supersededWarningTitle": "已由全局权限取代",
     "xpack.security.management.editRole.spacePrivilegeMatrix.globalSpaceName": "全局",
-    "xpack.security.management.editRole.spacePrivilegeMatrix.showAllSpacesLink": "（所有工作区）",
     "xpack.security.management.editRole.spacePrivilegeMatrix.showNMoreSpacesLink": "另外 {count} 个",
     "xpack.security.management.editRole.spacePrivilegeSection.addSpacePrivilegeButton": "添加工作区权限",
     "xpack.security.management.editRole.spacePrivilegeSection.noAccessToKibanaTitle": "此角色未授予对 Kibana 的访问权限",
     "xpack.security.management.editRole.spacePrivilegeTable.deletePrivilegesLabel": "删除以下工作区的权限：{spaceNames}。",
     "xpack.security.management.editRole.spacePrivilegeTable.editPrivilegesLabel": "编辑以下工作区的权限：{spaceNames}。",
-    "xpack.security.management.editRole.spacePrivilegeTable.showAllSpacesLink": "显示工作区",
     "xpack.security.management.editRole.spacePrivilegeTable.showLessSpacesLink": "显示更少",
     "xpack.security.management.editRole.spacePrivilegeTable.showNMoreSpacesLink": "另外 {count} 个",
     "xpack.security.management.editRole.spacePrivilegeTable.supersededPrivilegeWarning": "权限已由配置的全局权限取代。查看权限摘要以查看有效的权限。",
@@ -17371,10 +17357,6 @@
     "xpack.spaces.management.advancedSettingsSubtitle.applyingSettingsOnPageToSpaceDescription": "除非已指定，否则此页面上的设置适用于 {spaceName} 空间。",
     "xpack.spaces.management.advancedSettingsTitle.settingsTitle": "设置",
     "xpack.spaces.management.breadcrumb": "工作区",
-    "xpack.spaces.management.collapsiblePanel.hideLinkDescription": "隐藏 {title}",
-    "xpack.spaces.management.collapsiblePanel.hideLinkText": "隐藏",
-    "xpack.spaces.management.collapsiblePanel.showLinkDescription": "显示 {title}",
-    "xpack.spaces.management.collapsiblePanel.showLinkText": "显示",
     "xpack.spaces.management.confirmAlterActiveSpaceModal.cancelButton": "取消",
     "xpack.spaces.management.confirmAlterActiveSpaceModal.reloadWarningMessage": "您已更新此工作区中的可见功能。保存后，您的页面将重新加载。",
     "xpack.spaces.management.confirmAlterActiveSpaceModal.title": "确认更新工作区",
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.tsx
index 39800865ed761..32f16760dd461 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import React, { Fragment } from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiSelect } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiSelect, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { ActionParamsProps } from '../../../../types';
 import { PagerDutyActionParams } from '.././types';
@@ -143,6 +143,29 @@ const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDuty
           </EuiFormRow>
         </EuiFlexItem>
       </EuiFlexGroup>
+      <EuiSpacer size="m" />
+      <EuiFormRow
+        id="pagerDutySummary"
+        fullWidth
+        error={errors.summary}
+        isInvalid={errors.summary.length > 0 && summary !== undefined}
+        label={i18n.translate(
+          'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.summaryFieldLabel',
+          {
+            defaultMessage: 'Summary',
+          }
+        )}
+      >
+        <TextFieldWithMessageVariables
+          index={index}
+          editAction={editAction}
+          messageVariables={messageVariables}
+          paramsProperty={'summary'}
+          inputTargetValue={summary}
+          errors={errors.summary as string[]}
+        />
+      </EuiFormRow>
+      <EuiSpacer size="m" />
       <EuiFlexGroup>
         <EuiFlexItem>
           <EuiFormRow
@@ -197,6 +220,7 @@ const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDuty
           </EuiFormRow>
         </EuiFlexItem>
       </EuiFlexGroup>
+      <EuiSpacer size="m" />
       <EuiFormRow
         fullWidth
         label={i18n.translate(
@@ -248,27 +272,6 @@ const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDuty
           inputTargetValue={source}
         />
       </EuiFormRow>
-      <EuiFormRow
-        id="pagerDutySummary"
-        fullWidth
-        error={errors.summary}
-        isInvalid={errors.summary.length > 0 && summary !== undefined}
-        label={i18n.translate(
-          'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.summaryFieldLabel',
-          {
-            defaultMessage: 'Summary',
-          }
-        )}
-      >
-        <TextFieldWithMessageVariables
-          index={index}
-          editAction={editAction}
-          messageVariables={messageVariables}
-          paramsProperty={'summary'}
-          inputTargetValue={summary}
-          errors={errors.summary as string[]}
-        />
-      </EuiFormRow>
       <EuiFormRow
         id="pagerDutyClass"
         fullWidth
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/execution_status.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/execution_status.ts
index ac63fe8faadc7..1c2e51637fb41 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/execution_status.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/execution_status.ts
@@ -19,7 +19,8 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 export default function executionStatusAlertTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
-  describe('executionStatus', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/79249
+  describe.skip('executionStatus', () => {
     const objectRemover = new ObjectRemover(supertest);
 
     after(async () => await objectRemover.removeAll());
diff --git a/x-pack/test/apm_api_integration/basic/tests/feature_controls.ts b/x-pack/test/apm_api_integration/basic/tests/feature_controls.ts
index e0e13b7b7fb98..a2223e5560288 100644
--- a/x-pack/test/apm_api_integration/basic/tests/feature_controls.ts
+++ b/x-pack/test/apm_api_integration/basic/tests/feature_controls.ts
@@ -107,21 +107,21 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
     },
     {
       req: {
-        url: `/api/apm/services/foo/transaction_groups/charts?start=${start}&end=${end}&transactionType=bar&uiFilters=%7B%7D`,
+        url: `/api/apm/services/foo/transaction_groups/charts?start=${start}&end=${end}&transactionType=bar&uiFilters=%7B%22environment%22%3A%22testing%22%7D`,
       },
       expectForbidden: expect404,
       expectResponse: expect200,
     },
     {
       req: {
-        url: `/api/apm/services/foo/transaction_groups/charts?start=${start}&end=${end}&uiFilters=%7B%7D`,
+        url: `/api/apm/services/foo/transaction_groups/charts?start=${start}&end=${end}&uiFilters=%7B%22environment%22%3A%22testing%22%7D`,
       },
       expectForbidden: expect404,
       expectResponse: expect200,
     },
     {
       req: {
-        url: `/api/apm/services/foo/transaction_groups/charts?start=${start}&end=${end}&transactionType=bar&transactionName=baz&uiFilters=%7B%7D`,
+        url: `/api/apm/services/foo/transaction_groups/charts?start=${start}&end=${end}&transactionType=bar&transactionName=baz&uiFilters=%7B%22environment%22%3A%22testing%22%7D`,
       },
       expectForbidden: expect404,
       expectResponse: expect200,
diff --git a/x-pack/test/apm_api_integration/basic/tests/transaction_groups/transaction_charts.ts b/x-pack/test/apm_api_integration/basic/tests/transaction_groups/transaction_charts.ts
index c9581079b9952..d7d6d613281ef 100644
--- a/x-pack/test/apm_api_integration/basic/tests/transaction_groups/transaction_charts.ts
+++ b/x-pack/test/apm_api_integration/basic/tests/transaction_groups/transaction_charts.ts
@@ -19,7 +19,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
   // url parameters
   const start = encodeURIComponent(metadata.start);
   const end = encodeURIComponent(metadata.end);
-  const uiFilters = encodeURIComponent(JSON.stringify({}));
+  const uiFilters = encodeURIComponent(JSON.stringify({ environment: 'testing' }));
 
   describe('Transaction charts', () => {
     describe('when data is not loaded ', () => {
diff --git a/x-pack/test/apm_api_integration/trial/tests/index.ts b/x-pack/test/apm_api_integration/trial/tests/index.ts
index a6a031def34ea..e609279366390 100644
--- a/x-pack/test/apm_api_integration/trial/tests/index.ts
+++ b/x-pack/test/apm_api_integration/trial/tests/index.ts
@@ -16,6 +16,7 @@ export default function observabilityApiIntegrationTests({ loadTestFile }: FtrPr
     describe('Services', function () {
       loadTestFile(require.resolve('./services/annotations'));
       loadTestFile(require.resolve('./services/top_services.ts'));
+      loadTestFile(require.resolve('./services/transaction_groups_charts'));
     });
 
     describe('Settings', function () {
diff --git a/x-pack/test/apm_api_integration/trial/tests/services/__snapshots__/transaction_groups_charts.snap b/x-pack/test/apm_api_integration/trial/tests/services/__snapshots__/transaction_groups_charts.snap
new file mode 100644
index 0000000000000..8169e73202fbc
--- /dev/null
+++ b/x-pack/test/apm_api_integration/trial/tests/services/__snapshots__/transaction_groups_charts.snap
@@ -0,0 +1,43 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`APM Transaction Overview when data is loaded and fetching transaction groups charts with uiFilters when not defined environments selected should return the correct anomaly boundaries 1`] = `Array []`;
+
+exports[`APM Transaction Overview when data is loaded and fetching transaction groups charts with uiFilters with environment selected and empty kuery filter should return a non-empty anomaly series 1`] = `
+Array [
+  Object {
+    "x": 1601389800000,
+    "y": 1206111.33487531,
+    "y0": 10555.1290143587,
+  },
+  Object {
+    "x": 1601390700000,
+    "y": 1223987.49321778,
+    "y0": 10177.4677901726,
+  },
+  Object {
+    "x": 1601391600000,
+    "y": 1223987.49321778,
+    "y0": 10177.4677901726,
+  },
+]
+`;
+
+exports[`APM Transaction Overview when data is loaded and fetching transaction groups charts with uiFilters with environment selected in uiFilters should return a non-empty anomaly series 1`] = `
+Array [
+  Object {
+    "x": 1601389800000,
+    "y": 1206111.33487531,
+    "y0": 10555.1290143587,
+  },
+  Object {
+    "x": 1601390700000,
+    "y": 1223987.49321778,
+    "y0": 10177.4677901726,
+  },
+  Object {
+    "x": 1601391600000,
+    "y": 1223987.49321778,
+    "y0": 10177.4677901726,
+  },
+]
+`;
diff --git a/x-pack/test/apm_api_integration/trial/tests/services/transaction_groups_charts.ts b/x-pack/test/apm_api_integration/trial/tests/services/transaction_groups_charts.ts
new file mode 100644
index 0000000000000..c35dfcc3817a4
--- /dev/null
+++ b/x-pack/test/apm_api_integration/trial/tests/services/transaction_groups_charts.ts
@@ -0,0 +1,161 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { expectSnapshot } from '../../../common/match_snapshot';
+import { PromiseReturnType } from '../../../../../plugins/apm/typings/common';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import archives_metadata from '../../../common/archives_metadata';
+
+export default function ApiTest({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  const archiveName = 'apm_8.0.0';
+
+  const range = archives_metadata[archiveName];
+
+  // url parameters
+  const start = encodeURIComponent(range.start);
+  const end = encodeURIComponent(range.end);
+  const transactionType = 'request';
+
+  describe('APM Transaction Overview', () => {
+    describe('when data is loaded', () => {
+      before(() => esArchiver.load(archiveName));
+      after(() => esArchiver.unload(archiveName));
+
+      describe('and fetching transaction groups charts with uiFilters', () => {
+        const serviceName = 'opbeans-java';
+        let response: PromiseReturnType<typeof supertest.get>;
+
+        describe('without environment', () => {
+          const uiFilters = encodeURIComponent(JSON.stringify({}));
+          before(async () => {
+            response = await supertest.get(
+              `/api/apm/services/${serviceName}/transaction_groups/charts?start=${start}&end=${end}&transactionType=${transactionType}&uiFilters=${uiFilters}`
+            );
+          });
+          it('should return an error response', () => {
+            expect(response.status).to.eql(400);
+          });
+        });
+
+        describe('without uiFilters', () => {
+          before(async () => {
+            response = await supertest.get(
+              `/api/apm/services/${serviceName}/transaction_groups/charts?start=${start}&end=${end}&transactionType=${transactionType}`
+            );
+          });
+          it('should return an error response', () => {
+            expect(response.status).to.eql(400);
+          });
+        });
+
+        describe('with environment selected in uiFilters', () => {
+          const uiFilters = encodeURIComponent(JSON.stringify({ environment: 'production' }));
+          before(async () => {
+            response = await supertest.get(
+              `/api/apm/services/${serviceName}/transaction_groups/charts?start=${start}&end=${end}&transactionType=${transactionType}&uiFilters=${uiFilters}`
+            );
+          });
+
+          it('should have a successful response', () => {
+            expect(response.status).to.eql(200);
+          });
+
+          it('should return the ML job id for anomalies of the selected environment', () => {
+            expect(response.body).to.have.property('anomalyTimeseries');
+            expect(response.body.anomalyTimeseries).to.have.property('jobId');
+            expectSnapshot(response.body.anomalyTimeseries.jobId).toMatchInline(
+              `"apm-production-229a-high_mean_transaction_duration"`
+            );
+          });
+
+          it('should return a non-empty anomaly series', () => {
+            expect(response.body).to.have.property('anomalyTimeseries');
+            expect(response.body.anomalyTimeseries.anomalyBoundaries?.length).to.be.greaterThan(0);
+            expectSnapshot(response.body.anomalyTimeseries.anomalyBoundaries).toMatch();
+          });
+        });
+
+        describe('when not defined environments selected', () => {
+          const uiFilters = encodeURIComponent(
+            JSON.stringify({ environment: 'ENVIRONMENT_NOT_DEFINED' })
+          );
+          before(async () => {
+            response = await supertest.get(
+              `/api/apm/services/${serviceName}/transaction_groups/charts?start=${start}&end=${end}&transactionType=${transactionType}&uiFilters=${uiFilters}`
+            );
+          });
+
+          it('should have a successful response', () => {
+            expect(response.status).to.eql(200);
+          });
+
+          it('should return the ML job id for anomalies with no defined environment', () => {
+            expect(response.body).to.have.property('anomalyTimeseries');
+            expect(response.body.anomalyTimeseries).to.have.property('jobId');
+            expectSnapshot(response.body.anomalyTimeseries.jobId).toMatchInline(
+              `"apm-environment_not_defined-7ed6-high_mean_transaction_duration"`
+            );
+          });
+
+          it('should return the correct anomaly boundaries', () => {
+            expect(response.body).to.have.property('anomalyTimeseries');
+            expectSnapshot(response.body.anomalyTimeseries.anomalyBoundaries).toMatch();
+          });
+        });
+
+        describe('with all environments selected', () => {
+          const uiFilters = encodeURIComponent(JSON.stringify({ environment: 'ENVIRONMENT_ALL' }));
+          before(async () => {
+            response = await supertest.get(
+              `/api/apm/services/${serviceName}/transaction_groups/charts?start=${start}&end=${end}&transactionType=${transactionType}&uiFilters=${uiFilters}`
+            );
+          });
+
+          it('should have a successful response', () => {
+            expect(response.status).to.eql(200);
+          });
+
+          it('should not return anomaly timeseries data', () => {
+            expect(response.body).to.not.have.property('anomalyTimeseries');
+          });
+        });
+
+        describe('with environment selected and empty kuery filter', () => {
+          const uiFilters = encodeURIComponent(
+            JSON.stringify({ kuery: '', environment: 'production' })
+          );
+          before(async () => {
+            response = await supertest.get(
+              `/api/apm/services/${serviceName}/transaction_groups/charts?start=${start}&end=${end}&transactionType=${transactionType}&uiFilters=${uiFilters}`
+            );
+          });
+
+          it('should have a successful response', () => {
+            expect(response.status).to.eql(200);
+          });
+
+          it('should return the ML job id for anomalies of the selected environment', () => {
+            expect(response.body).to.have.property('anomalyTimeseries');
+            expect(response.body.anomalyTimeseries).to.have.property('jobId');
+            expectSnapshot(response.body.anomalyTimeseries.jobId).toMatchInline(
+              `"apm-production-229a-high_mean_transaction_duration"`
+            );
+          });
+
+          it('should return a non-empty anomaly series', () => {
+            expect(response.body).to.have.property('anomalyTimeseries');
+            expect(response.body.anomalyTimeseries.anomalyBoundaries?.length).to.be.greaterThan(0);
+            expectSnapshot(response.body.anomalyTimeseries.anomalyBoundaries).toMatch();
+          });
+        });
+      });
+    });
+  });
+}
diff --git a/x-pack/test/functional/page_objects/security_page.ts b/x-pack/test/functional/page_objects/security_page.ts
index 3ce8a0e681d69..77457ad94cf88 100644
--- a/x-pack/test/functional/page_objects/security_page.ts
+++ b/x-pack/test/functional/page_objects/security_page.ts
@@ -429,10 +429,7 @@ export function SecurityPageProvider({ getService, getPageObjects }: FtrProvider
           const globalSpaceOption = await find.byCssSelector(`#spaceOption_\\*`);
           await globalSpaceOption.click();
 
-          await testSubjects.click('basePrivilegeComboBox');
-
-          const privilegeOption = await find.byCssSelector(`#basePrivilege_${privilegeName}`);
-          await privilegeOption.click();
+          await testSubjects.click(`basePrivilege_${privilegeName}`);
 
           await testSubjects.click('createSpacePrivilegeButton');
         }