diff --git a/src/plugins/wizard/public/application/components/top_nav.tsx b/src/plugins/wizard/public/application/components/top_nav.tsx
index 299425e5b1d..b1427e01523 100644
--- a/src/plugins/wizard/public/application/components/top_nav.tsx
+++ b/src/plugins/wizard/public/application/components/top_nav.tsx
@@ -58,10 +58,10 @@ export const TopNav = () => {
         appName={PLUGIN_ID}
         config={config}
         setMenuMountPoint={setHeaderActionMenu}
-        showSearchBar={true}
-        useDefaultBehaviors={true}
-        screenTitle="Test"
         indexPatterns={indexPattern ? [indexPattern] : []}
+        showSearchBar
+        showSaveQuery
+        useDefaultBehaviors
       />
     </div>
   );
diff --git a/src/plugins/wizard/public/application/components/workspace.tsx b/src/plugins/wizard/public/application/components/workspace.tsx
index 4d30dbb7646..17565a1d000 100644
--- a/src/plugins/wizard/public/application/components/workspace.tsx
+++ b/src/plugins/wizard/public/application/components/workspace.tsx
@@ -14,8 +14,9 @@ import {
   EuiPanel,
   EuiPopover,
 } from '@elastic/eui';
-import React, { FC, useState, useMemo, useEffect, Fragment } from 'react';
+import React, { FC, useState, useMemo, useEffect, useLayoutEffect } from 'react';
 import { useOpenSearchDashboards } from '../../../../opensearch_dashboards_react/public';
+import { IExpressionLoaderParams } from '../../../../expressions/public';
 import { WizardServices } from '../../types';
 import { validateSchemaState } from '../utils/validate_schema_state';
 import { useTypedDispatch, useTypedSelector } from '../utils/state_management';
@@ -32,10 +33,16 @@ export const Workspace: FC = ({ children }) => {
     services: {
       expressions: { ReactExpressionRenderer },
       notifications: { toasts },
+      data,
     },
   } = useOpenSearchDashboards<WizardServices>();
   const { toExpression, ui } = useVisualizationType();
   const [expression, setExpression] = useState<string>();
+  const [searchContext, setSearchContext] = useState<IExpressionLoaderParams['searchContext']>({
+    query: data.query.queryString.getQuery(),
+    filters: data.query.filterManager.getFilters(),
+    timeRange: data.query.timefilter.timefilter.getTime(),
+  });
   const rootState = useTypedSelector((state) => state);
 
   useEffect(() => {
@@ -57,6 +64,20 @@ export const Workspace: FC = ({ children }) => {
     loadExpression();
   }, [rootState, toExpression, toasts, ui.containerConfig.data.schemas]);
 
+  useLayoutEffect(() => {
+    const subscription = data.query.state$.subscribe(({ state }) => {
+      setSearchContext({
+        query: state.query,
+        timeRange: state.time,
+        filters: state.filters,
+      });
+    });
+
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [data.query.state$]);
+
   return (
     <section className="wizWorkspace">
       <EuiFlexGroup className="wizCanvasControls">
@@ -66,13 +87,13 @@ export const Workspace: FC = ({ children }) => {
       </EuiFlexGroup>
       <EuiPanel className="wizCanvas">
         {expression ? (
-          <ReactExpressionRenderer expression={expression} />
+          <ReactExpressionRenderer expression={expression} searchContext={searchContext} />
         ) : (
           <EuiFlexItem className="wizWorkspace__empty">
             <EuiEmptyPrompt
               title={<h2>Drop some fields here to start</h2>}
               body={
-                <Fragment>
+                <>
                   <p>Drag a field directly to the canvas or axis to generate a visualization.</p>
                   <span className="wizWorkspace__container">
                     <EuiIcon className="wizWorkspace__fieldSvg" type={fields_bg} size="original" />
@@ -82,7 +103,7 @@ export const Workspace: FC = ({ children }) => {
                       size="original"
                     />
                   </span>
-                </Fragment>
+                </>
               }
             />
           </EuiFlexItem>
diff --git a/src/plugins/wizard/public/visualizations/metric/to_expression.ts b/src/plugins/wizard/public/visualizations/metric/to_expression.ts
index 5b787ef5d26..7b8d7b802e5 100644
--- a/src/plugins/wizard/public/visualizations/metric/to_expression.ts
+++ b/src/plugins/wizard/public/visualizations/metric/to_expression.ts
@@ -171,5 +171,5 @@ export const toExpression = async ({ style: styleState, visualization }: MetricR
 
   const ast = buildExpression([opensearchaggs, metricVis]);
 
-  return ast.toString();
+  return `opensearchDashboards | opensearch_dashboards_context | ${ast.toString()}`;
 };