diff --git a/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx b/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
index 3d34f016c6591..bcdeaa6d5ac23 100644
--- a/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
+++ b/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
@@ -151,23 +151,10 @@ export async function inspectSearchParams(
   const mockSetup = {
     start: 1528113600000,
     end: 1528977600000,
-    client: {
-      search: spy
-    } as any,
-    internalClient: {
-      search: spy
-    } as any,
-    config: new Proxy(
-      {},
-      {
-        get: () => 'myIndex'
-      }
-    ) as APMConfig,
-    uiFiltersES: [
-      {
-        term: { 'service.environment': 'prod' }
-      }
-    ],
+    client: { search: spy } as any,
+    internalClient: { search: spy } as any,
+    config: new Proxy({}, { get: () => 'myIndex' }) as APMConfig,
+    uiFiltersES: [{ term: { 'my.custom.ui.filter': 'foo-bar' } }],
     indices: {
       'apm_oss.sourcemapIndices': 'myIndex',
       'apm_oss.errorIndices': 'myIndex',
diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap
index a2629366dd6d9..b9ac9d5431700 100644
--- a/x-pack/legacy/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap
@@ -32,7 +32,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
@@ -119,7 +119,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
@@ -194,7 +194,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__snapshots__/queries.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__snapshots__/queries.test.ts.snap
index 0065c28f60d2d..b71b2d697126a 100644
--- a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__snapshots__/queries.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__snapshots__/queries.test.ts.snap
@@ -40,7 +40,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
@@ -92,7 +92,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/get_error_group.ts b/x-pack/legacy/plugins/apm/server/lib/errors/get_error_group.ts
index 8d19455651be3..5d45002b9f3ce 100644
--- a/x-pack/legacy/plugins/apm/server/lib/errors/get_error_group.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/errors/get_error_group.ts
@@ -64,7 +64,7 @@ export async function getErrorGroup({
 
   let transaction;
   if (transactionId && traceId) {
-    transaction = await getTransaction(transactionId, traceId, setup);
+    transaction = await getTransaction({ transactionId, traceId, setup });
   }
 
   return {
diff --git a/x-pack/legacy/plugins/apm/server/lib/metrics/__snapshots__/queries.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/metrics/__snapshots__/queries.test.ts.snap
index 0b1fe575f7254..d8119ac96a536 100644
--- a/x-pack/legacy/plugins/apm/server/lib/metrics/__snapshots__/queries.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/server/lib/metrics/__snapshots__/queries.test.ts.snap
@@ -87,7 +87,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
@@ -176,7 +176,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
@@ -272,7 +272,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
@@ -371,7 +371,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
@@ -455,7 +455,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
@@ -565,7 +565,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
@@ -660,7 +660,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
@@ -762,7 +762,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
@@ -867,7 +867,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
@@ -957,7 +957,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
@@ -1056,7 +1056,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
@@ -1140,7 +1140,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
@@ -1231,7 +1231,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
@@ -1325,7 +1325,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
@@ -1404,7 +1404,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
diff --git a/x-pack/legacy/plugins/apm/server/lib/service_nodes/__snapshots__/queries.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/service_nodes/__snapshots__/queries.test.ts.snap
index ce07759669d6b..3935ecda42db9 100644
--- a/x-pack/legacy/plugins/apm/server/lib/service_nodes/__snapshots__/queries.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/server/lib/service_nodes/__snapshots__/queries.test.ts.snap
@@ -51,7 +51,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
@@ -120,7 +120,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
@@ -190,7 +190,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
diff --git a/x-pack/legacy/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap
index bbf2a6882c3c7..3f8d6b22cd000 100644
--- a/x-pack/legacy/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap
@@ -169,7 +169,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
diff --git a/x-pack/legacy/plugins/apm/server/lib/transaction_groups/__snapshots__/queries.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/transaction_groups/__snapshots__/queries.test.ts.snap
index 58fbe664cccab..1096c1638f3f2 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transaction_groups/__snapshots__/queries.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/server/lib/transaction_groups/__snapshots__/queries.test.ts.snap
@@ -80,7 +80,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
@@ -194,7 +194,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/__snapshots__/queries.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/transactions/__snapshots__/queries.test.ts.snap
index 3d485e39dbbbf..49e0e0669c241 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/__snapshots__/queries.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/__snapshots__/queries.test.ts.snap
@@ -30,11 +30,6 @@ Object {
               },
             },
           },
-          Object {
-            "term": Object {
-              "service.environment": "prod",
-            },
-          },
         ],
       },
     },
@@ -167,7 +162,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
@@ -302,7 +297,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
@@ -399,7 +394,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
@@ -491,7 +486,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
@@ -588,7 +583,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
           Object {
@@ -654,7 +649,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/get_transaction/index.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/get_transaction/index.ts
index b5d7747c23a2c..e7ba453357a8a 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/get_transaction/index.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/get_transaction/index.ts
@@ -18,12 +18,16 @@ import {
 } from '../../helpers/setup_request';
 import { ProcessorEvent } from '../../../../common/processor_event';
 
-export async function getTransaction(
-  transactionId: string,
-  traceId: string,
-  setup: Setup & SetupTimeRange & SetupUIFilters
-) {
-  const { start, end, uiFiltersES, client, indices } = setup;
+export async function getTransaction({
+  transactionId,
+  traceId,
+  setup
+}: {
+  transactionId: string;
+  traceId: string;
+  setup: Setup & SetupTimeRange & SetupUIFilters;
+}) {
+  const { start, end, client, indices } = setup;
 
   const params = {
     index: indices['apm_oss.transactionIndices'],
@@ -35,8 +39,7 @@ export async function getTransaction(
             { term: { [PROCESSOR_EVENT]: ProcessorEvent.transaction } },
             { term: { [TRANSACTION_ID]: transactionId } },
             { term: { [TRACE_ID]: traceId } },
-            { range: rangeFilter(start, end) },
-            ...uiFiltersES
+            { range: rangeFilter(start, end) }
           ]
         }
       }
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/queries.test.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/queries.test.ts
index 13cb1328fdd01..a9e4204fde1ad 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/queries.test.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/queries.test.ts
@@ -99,7 +99,7 @@ describe('transaction queries', () => {
 
   it('fetches a transaction', async () => {
     mock = await inspectSearchParams(setup =>
-      getTransaction('foo', 'bar', setup)
+      getTransaction({ transactionId: 'foo', traceId: 'bar', setup })
     );
 
     expect(mock.params).toMatchSnapshot();
diff --git a/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap
index 4b5b34e8af1d2..e6b6a9a52adfe 100644
--- a/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap
@@ -48,7 +48,7 @@ Object {
           },
           Object {
             "term": Object {
-              "service.environment": "prod",
+              "my.custom.ui.filter": "foo-bar",
             },
           },
         ],