diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3.tsx
index dba9b4ce9d2c..cdc38eed6bb3 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3.tsx
@@ -38,8 +38,10 @@ import {
   baseContext,
   browse2Context,
   Browse3WeaveflowRouteContextProvider,
-  PATH_PARAM,
+  DESCENDENT_CALL_ID_PARAM,
+  HIDE_TRACETREE_PARAM,
   PEEK_PARAM,
+  SHOW_FEEDBACK_PARAM,
   useClosePeek,
   usePeekLocation,
   useWeaveflowCurrentRouteContext,
@@ -613,53 +615,135 @@ const useParamsDecoded = <T extends object>() => {
   }, [params]);
 };
 
-// TODO(tim/weaveflow_improved_nav): Generalize this
-const CallPageBinding = () => {
-  useCallPeekRedirect();
+const getOptionalBoolean = (
+  dict: Record<string, string>,
+  key: string
+): boolean | undefined => {
+  const value = dict[key];
+  if (value == null) {
+    return undefined;
+  }
+  return value === '1';
+};
+
+const getOptionalString = (
+  dict: Record<string, string>,
+  key: string
+): string | undefined => {
+  const value = dict[key];
+  if (value == null) {
+    return undefined;
+  }
+  return value;
+};
+
+const useURLBackedCallPageState = () => {
   const params = useParamsDecoded<Browse3TabItemParams>();
   const query = useURLSearchParamsDict();
   const history = useHistory();
   const currentRouter = useWeaveflowCurrentRouteContext();
-
-  const [callId, setCallIdDirect] = useState(params.itemName);
+  const [rootCallId, setRootCallId] = useState(params.itemName);
   useEffect(() => {
-    setCallIdDirect(params.itemName);
+    setRootCallId(params.itemName);
   }, [params.itemName]);
 
+  const [descendentCallId, setDescendentCallId] = useState<string | undefined>(
+    getOptionalString(query, DESCENDENT_CALL_ID_PARAM)
+  );
+  useEffect(() => {
+    setDescendentCallId(getOptionalString(query, DESCENDENT_CALL_ID_PARAM));
+  }, [query]);
+
+  const [showFeedback, setShowFeedback] = useState<boolean | undefined>(
+    getOptionalBoolean(query, SHOW_FEEDBACK_PARAM)
+  );
+  useEffect(() => {
+    setShowFeedback(getOptionalBoolean(query, SHOW_FEEDBACK_PARAM));
+  }, [query]);
+
+  const [hideTracetree, setHideTracetree] = useState<boolean | undefined>(
+    getOptionalBoolean(query, HIDE_TRACETREE_PARAM)
+  );
+  useEffect(() => {
+    setHideTracetree(getOptionalBoolean(query, HIDE_TRACETREE_PARAM));
+  }, [query]);
+
   const debouncedHistoryPush = useMemo(() => {
     return debounce((path: string) => {
-      history.push(path);
-    }, 1000);
+      if (history.location.pathname !== path) {
+        history.push(path);
+      }
+    }, 500);
   }, [history]);
 
-  const setCallId = useCallback(
-    (newCallId: string) => {
-      setCallIdDirect(newCallId);
+  useEffect(() => {
+    debouncedHistoryPush(
+      currentRouter.callUIUrl(
+        params.entity,
+        params.project,
+        '',
+        rootCallId,
+        descendentCallId,
+        hideTracetree,
+        showFeedback
+      )
+    );
+    return () => {
+      debouncedHistoryPush.cancel();
+    };
+  }, [
+    currentRouter,
+    debouncedHistoryPush,
+    params.entity,
+    params.project,
+    rootCallId,
+    descendentCallId,
+    showFeedback,
+    hideTracetree,
+  ]);
+
+  return {
+    entity: params.entity,
+    project: params.project,
+    rootCallId,
+    descendentCallId,
+    showFeedback,
+    hideTracetree,
+    setRootCallId,
+    setDescendentCallId,
+    setShowFeedback,
+    setHideTracetree,
+  };
+};
 
-      // TODO: Handle this navigation more gracefully - ideally
-      // we implement a generalized state management system for
-      // navigating between different views
-      debouncedHistoryPush(
-        currentRouter.callUIUrl(
-          params.entity,
-          params.project,
-          '',
-          newCallId,
-          '',
-          true
-        )
-      );
-    },
-    [currentRouter, debouncedHistoryPush, params.entity, params.project]
-  );
+// TODO(tim/weaveflow_improved_nav): Generalize this
+const CallPageBinding = () => {
+  useCallPeekRedirect();
+  const {
+    entity,
+    project,
+    rootCallId,
+    descendentCallId,
+    showFeedback,
+    hideTracetree,
+    setRootCallId,
+    setDescendentCallId,
+    setShowFeedback,
+    setHideTracetree,
+  } = useURLBackedCallPageState();
 
   return (
     <CallPage
-      entity={params.entity}
-      project={params.project}
-      callId={callId}
-      path={query[PATH_PARAM]}
-      setCallId={setCallId}
+      entity={entity}
+      project={project}
+      rootCallId={rootCallId}
+      setRootCallId={setRootCallId}
+      descendentCallId={descendentCallId}
+      setDescendentCallId={setDescendentCallId}
+      hideTracetree={hideTracetree}
+      setHideTracetree={setHideTracetree}
+      showFeedback={showFeedback}
+      setShowFeedback={setShowFeedback}
     />
   );
 };
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx
index 1f0565fb829f..1f6186ecc5e1 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx
@@ -100,8 +100,9 @@ export const browse2Context = {
     projectName: string,
     traceId: string,
     callId: string,
-    path?: string | null,
-    tracetree?: boolean
+    descendentCallId?: string,
+    hideTracetree?: boolean,
+    showFeedback?: boolean
   ) => {
     return `/${entityName}/${projectName}/trace/${traceId}/${callId}`;
   },
@@ -350,20 +351,20 @@ export const browse3ContextGen = (
       projectName: string,
       traceId: string,
       callId: string,
-      path?: string | null,
-      tracetree?: boolean,
-      feedbackExpand?: boolean
+      descendentCallId?: string,
+      hideTracetree?: boolean,
+      showFeedback?: boolean
     ) => {
       let url = `${projectRoot(entityName, projectName)}/calls/${callId}`;
       const params = new URLSearchParams();
-      if (path) {
-        params.set(PATH_PARAM, path);
+      if (descendentCallId) {
+        params.set(DESCENDENT_CALL_ID_PARAM, descendentCallId);
       }
-      if (tracetree !== undefined) {
-        params.set(TRACETREE_PARAM, tracetree ? '1' : '0');
+      if (hideTracetree !== undefined) {
+        params.set(HIDE_TRACETREE_PARAM, hideTracetree ? '1' : '0');
       }
-      if (feedbackExpand !== undefined) {
-        params.set(FEEDBACK_EXPAND_PARAM, feedbackExpand ? '1' : '0');
+      if (showFeedback !== undefined) {
+        params.set(SHOW_FEEDBACK_PARAM, showFeedback ? '1' : '0');
       }
       if (params.toString()) {
         url += '?' + params.toString();
@@ -540,9 +541,9 @@ type RouteType = {
     projectName: string,
     traceId: string,
     callId: string,
-    path?: string | null,
-    tracetree?: boolean,
-    feedbackExpand?: boolean
+    descendentCallId?: string,
+    hideTracetree?: boolean,
+    showFeedback?: boolean
   ) => string;
   tracesUIUrl: (entityName: string, projectName: string) => string;
   callsUIUrl: (
@@ -623,9 +624,9 @@ const useSetSearchParam = () => {
 };
 
 export const PEEK_PARAM = 'peekPath';
-export const TRACETREE_PARAM = 'tracetree';
-export const FEEDBACK_EXPAND_PARAM = 'feedbackExpand';
-export const PATH_PARAM = 'path';
+export const HIDE_TRACETREE_PARAM = 'hideTracetree';
+export const SHOW_FEEDBACK_PARAM = 'showFeedback';
+export const DESCENDENT_CALL_ID_PARAM = 'descendentCallId';
 
 export const baseContext = browse3ContextGen(
   (entityName: string, projectName: string) => {
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/CallPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/CallPage.tsx
index beb268d40770..52c822b06997 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/CallPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/CallPage.tsx
@@ -9,7 +9,6 @@ import React, {
   useRef,
   useState,
 } from 'react';
-import {useHistory} from 'react-router-dom';
 
 import {makeRefCall} from '../../../../../../util/refs';
 import {Button} from '../../../../../Button';
@@ -17,12 +16,7 @@ import {Tailwind} from '../../../../../Tailwind';
 import {Browse2OpDefCode} from '../../../Browse2/Browse2OpDefCode';
 import {TableRowSelectionContext} from '../../../TableRowSelectionContext';
 import {TraceNavigator} from '../../components/TraceNavigator/TraceNavigator';
-import {
-  FEEDBACK_EXPAND_PARAM,
-  TRACETREE_PARAM,
-  useWeaveflowCurrentRouteContext,
-  WeaveflowPeekContext,
-} from '../../context';
+import {WeaveflowPeekContext} from '../../context';
 import {FeedbackGrid} from '../../feedback/FeedbackGrid';
 import {ScorerFeedbackGrid} from '../../feedback/ScorerFeedbackGrid';
 import {FeedbackSidebar} from '../../feedback/StructuredFeedback/FeedbackSidebar';
@@ -36,7 +30,6 @@ import {
   SimplePageLayoutWithHeader,
 } from '../common/SimplePageLayout';
 import {CompareEvaluationsPageContent} from '../CompareEvaluationsPage/CompareEvaluationsPage';
-import {useURLSearchParamsDict} from '../util';
 import {useWFHooks} from '../wfReactInterface/context';
 import {CallSchema} from '../wfReactInterface/wfDataModelHooksInterface';
 import {CallChat} from './CallChat';
@@ -46,20 +39,37 @@ import {CallSummary} from './CallSummary';
 import {PaginationControls} from './PaginationControls';
 import {TabUseCall} from './TabUseCall';
 
-export const CallPage: FC<{
+type CallPageProps = {
   entity: string;
   project: string;
-  callId: string;
-  setCallId: (callId: string) => void;
-  path?: string;
-}> = props => {
+  rootCallId: string;
+  setRootCallId: (callId: string) => void;
+  descendentCallId?: string;
+  setDescendentCallId: (descendentCallId: string | undefined) => void;
+  hideTracetree?: boolean;
+  setHideTracetree: (hideTracetree: boolean | undefined) => void;
+  showFeedback?: boolean;
+  setShowFeedback: (showFeedback: boolean | undefined) => void;
+};
+
+type CallPageInnerProps = CallPageProps & {
+  descendentCallId: string;
+  setDescendentCallId: (descendentCallId: string) => void;
+  descendentCall: CallSchema;
+};
+
+export const CallPage: FC<CallPageProps> = props => {
   const {useCall} = useWFHooks();
 
-  const call = useCall({
-    entity: props.entity,
-    project: props.project,
-    callId: props.callId,
-  });
+  const descendentCallId = props.descendentCallId ?? props.rootCallId;
+  const call = useCall(
+    {
+      entity: props.entity,
+      project: props.project,
+      callId: descendentCallId,
+    }
+    // , {includeCosts: true}
+  );
   // TODO: CLean this up!
   const lastResult = useRef(call.result);
   useEffect(() => {
@@ -75,8 +85,8 @@ export const CallPage: FC<{
       return (
         <CallPageInnerVertical
           {...props}
-          call={call.result}
-          setCallById={props.setCallId}
+          descendentCallId={descendentCallId}
+          descendentCall={call.result}
         />
       );
     }
@@ -87,8 +97,8 @@ export const CallPage: FC<{
       return (
         <CallPageInnerVertical
           {...props}
-          call={lastResult.current}
-          setCallById={props.setCallId}
+          descendentCallId={descendentCallId}
+          descendentCall={lastResult.current}
         />
       );
     }
@@ -230,73 +240,28 @@ const useCallTabs = (call: CallSchema) => {
   ];
 };
 
-const CallPageInnerVertical: FC<{
-  call: CallSchema;
-  callId: string;
-  setCallById: (callId: string) => void;
-  path?: string;
-}> = ({call, callId, setCallById: setCallId, path}) => {
+const CallPageInnerVertical: FC<CallPageInnerProps> = ({
+  descendentCall: call,
+  descendentCallId: callId,
+  setRootCallId: setCallId,
+  setHideTracetree,
+  setShowFeedback,
+  showFeedback,
+  hideTracetree,
+}) => {
   useViewTraceEvent(call);
 
-  const history = useHistory();
-  const currentRouter = useWeaveflowCurrentRouteContext();
-
-  const query = useURLSearchParamsDict();
   const showTraceTree =
-    TRACETREE_PARAM in query
-      ? query[TRACETREE_PARAM] === '1'
-      : !isEvaluateOp(call.spanName);
-  const showFeedbackExpand =
-    FEEDBACK_EXPAND_PARAM in query
-      ? query[FEEDBACK_EXPAND_PARAM] === '1'
-      : false;
+    hideTracetree != null ? !hideTracetree : !isEvaluateOp(call.spanName);
+  const showFeedbackExpand = showFeedback != null ? showFeedback : false;
 
   const onToggleTraceTree = useCallback(() => {
-    history.replace(
-      currentRouter.callUIUrl(
-        call.entity,
-        call.project,
-        call.traceId,
-        callId,
-        path,
-        !showTraceTree,
-        showFeedbackExpand ? true : undefined
-      )
-    );
-  }, [
-    callId,
-    call.entity,
-    call.project,
-    call.traceId,
-    currentRouter,
-    history,
-    path,
-    showTraceTree,
-    showFeedbackExpand,
-  ]);
+    setHideTracetree(showTraceTree);
+  }, [setHideTracetree, showTraceTree]);
   const onToggleFeedbackExpand = useCallback(() => {
-    history.replace(
-      currentRouter.callUIUrl(
-        call.entity,
-        call.project,
-        call.traceId,
-        callId,
-        path,
-        showTraceTree,
-        !showFeedbackExpand ? true : undefined
-      )
-    );
-  }, [
-    history,
-    currentRouter,
-    call.entity,
-    call.project,
-    call.traceId,
-    callId,
-    path,
-    showTraceTree,
-    showFeedbackExpand,
-  ]);
+    setShowFeedback(!showFeedbackExpand);
+  }, [setShowFeedback, showFeedbackExpand]);
+
   const {humanAnnotationSpecs, specsLoading} = useHumanAnnotationSpecs(
     call.entity,
     call.project
@@ -313,6 +278,7 @@ const CallPageInnerVertical: FC<{
   //   callId: selectedCall.callId,
   // });
   const callCompleteWithCosts = callComplete;
+  // console.log(callCompleteWithCosts)
   // useMemo(() => {
   //   if (callComplete.result?.traceCall == null) {
   //     return callComplete.result;
@@ -334,15 +300,15 @@ const CallPageInnerVertical: FC<{
   //   };
   // }, [callComplete.result, selectedCall]);
 
-  const assumeCallIsSelectedCall = path == null || path === '';
+  // const assumeCallIsSelectedCall = path == null || path === '';
   const [currentCall, setCurrentCall] = useState(call);
   const callLoading = call.callId !== callId;
 
-  useEffect(() => {
-    if (assumeCallIsSelectedCall) {
-      setCurrentCall(selectedCall);
-    }
-  }, [assumeCallIsSelectedCall, selectedCall]);
+  // useEffect(() => {
+  //   if (assumeCallIsSelectedCall) {
+  //     setCurrentCall(selectedCall);
+  //   }
+  // }, [assumeCallIsSelectedCall, selectedCall]);
 
   useEffect(() => {
     if (callCompleteWithCosts != null) {
@@ -367,7 +333,7 @@ const CallPageInnerVertical: FC<{
             alignItems: 'center',
           }}>
           {showPaginationControls && (
-            <PaginationControls call={call} path={path} />
+            <PaginationControls call={call} setRootCallId={setCallId} />
           )}
           <Box sx={{marginLeft: showPaginationControls ? 0 : 'auto'}}>
             <Button
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/PaginationControls.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/PaginationControls.tsx
index 7254851929af..b5ef47aaf5ef 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/PaginationControls.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/PaginationControls.tsx
@@ -1,83 +1,31 @@
 import {Box} from '@mui/material';
 import {Button} from '@wandb/weave/components/Button';
 import React, {FC, useCallback, useContext, useEffect} from 'react';
-import {useHistory} from 'react-router-dom';
 
 import {TableRowSelectionContext} from '../../../TableRowSelectionContext';
-import {
-  FEEDBACK_EXPAND_PARAM,
-  TRACETREE_PARAM,
-  useWeaveflowCurrentRouteContext,
-} from '../../context';
-import {useURLSearchParamsDict} from '../util';
 import {CallSchema} from '../wfReactInterface/wfDataModelHooksInterface';
 
 export const PaginationControls: FC<{
   call: CallSchema;
-  path?: string;
-}> = ({call, path}) => {
+  setRootCallId: (callId: string) => void;
+}> = ({call, setRootCallId}) => {
   // Call navigation by arrow keys and buttons
   const {getNextRowId, getPreviousRowId, rowIdInTable} = useContext(
     TableRowSelectionContext
   );
-  const history = useHistory();
-  const currentRouter = useWeaveflowCurrentRouteContext();
-  const query = useURLSearchParamsDict();
-  const showTraceTree =
-    TRACETREE_PARAM in query ? query[TRACETREE_PARAM] === '1' : false;
-  const showFeedbackExpand =
-    FEEDBACK_EXPAND_PARAM in query
-      ? query[FEEDBACK_EXPAND_PARAM] === '1'
-      : undefined;
 
   const onNextCall = useCallback(() => {
     const nextCallId = getNextRowId?.(call.callId);
     if (nextCallId) {
-      history.replace(
-        currentRouter.callUIUrl(
-          call.entity,
-          call.project,
-          call.traceId,
-          nextCallId,
-          path,
-          showTraceTree,
-          showFeedbackExpand
-        )
-      );
+      setRootCallId(nextCallId);
     }
-  }, [
-    call,
-    currentRouter,
-    history,
-    path,
-    showTraceTree,
-    getNextRowId,
-    showFeedbackExpand,
-  ]);
+  }, [getNextRowId, call.callId, setRootCallId]);
   const onPreviousCall = useCallback(() => {
     const previousRowId = getPreviousRowId?.(call.callId);
     if (previousRowId) {
-      history.replace(
-        currentRouter.callUIUrl(
-          call.entity,
-          call.project,
-          call.traceId,
-          previousRowId,
-          path,
-          showTraceTree,
-          showFeedbackExpand
-        )
-      );
+      setRootCallId(previousRowId);
     }
-  }, [
-    call,
-    currentRouter,
-    history,
-    path,
-    showTraceTree,
-    getPreviousRowId,
-    showFeedbackExpand,
-  ]);
+  }, [getPreviousRowId, call.callId, setRootCallId]);
   const handleKeyDown = useCallback(
     (event: KeyboardEvent) => {
       if (event.key === 'ArrowDown' && event.shiftKey) {
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallsPage/callsTableColumns.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallsPage/callsTableColumns.tsx
index e85624a801db..6496b0ad620b 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallsPage/callsTableColumns.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallsPage/callsTableColumns.tsx
@@ -245,7 +245,7 @@ function buildCallsTableColumns(
             opName={opName}
             callId={rowParams.row.id}
             fullWidth={true}
-            preservePath={preservePath}
+            preserveDescendentCallId={preservePath}
             color={TEAL_600}
             isEval={isEval}
           />
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/PlaygroundPage/PlaygroundChat/PlaygroundCallStats.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/PlaygroundPage/PlaygroundChat/PlaygroundCallStats.tsx
index 7f6dadf8c8f4..01d39851ad25 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/PlaygroundPage/PlaygroundChat/PlaygroundCallStats.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/PlaygroundPage/PlaygroundChat/PlaygroundCallStats.tsx
@@ -27,7 +27,7 @@ export const PlaygroundCallStats = ({call}: {call: TraceCallSchema}) => {
     projectName,
     '',
     callId,
-    null,
+    undefined,
     false
   );
 
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx
index 7c027aa02171..c918f0ed01f8 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx
@@ -13,9 +13,9 @@ import styled, {css} from 'styled-components';
 import {TargetBlank} from '../../../../../../common/util/links';
 import {maybePluralizeWord} from '../../../../../../core/util/string';
 import {
-  FEEDBACK_EXPAND_PARAM,
-  PATH_PARAM,
-  TRACETREE_PARAM,
+  DESCENDENT_CALL_ID_PARAM,
+  HIDE_TRACETREE_PARAM,
+  SHOW_FEEDBACK_PARAM,
   usePeekLocation,
   useWeaveflowRouteContext,
 } from '../../context';
@@ -297,7 +297,7 @@ export const CallLink: React.FC<{
   callId: string;
   variant?: LinkVariant;
   fullWidth?: boolean;
-  preservePath?: boolean;
+  preserveDescendentCallId?: boolean;
   tracetree?: boolean;
   icon?: React.ReactNode;
   color?: string;
@@ -313,26 +313,32 @@ export const CallLink: React.FC<{
   // to provide the right abstractions.
   const peekLoc = usePeekLocation();
   const peekParams = new URLSearchParams(peekLoc?.search ?? '');
-  const existingPath = peekParams.get(PATH_PARAM) ?? '';
+  const existingDCID = peekParams.get(DESCENDENT_CALL_ID_PARAM) ?? '';
   // Preserve the path only when showing trace tree
-  const path = props.preservePath ? existingPath : null;
+  const descendentCallId = props.preserveDescendentCallId
+    ? existingDCID
+    : undefined;
   // default to true if not specified and not an eval
-  const traceTreeParam = peekParams.get(TRACETREE_PARAM);
-  const showTraceTree =
+  const traceTreeParam = peekParams.get(HIDE_TRACETREE_PARAM);
+  const hideTracetree =
     traceTreeParam === '1'
       ? true
       : traceTreeParam === '0'
       ? false
-      : !props.isEval;
+      : props.isEval
+      ? true
+      : undefined;
   // default to false if not specified
-  const showFeedbackExpand = peekParams.get(FEEDBACK_EXPAND_PARAM) === '1';
+  const showFeedbackParam = peekParams.get(SHOW_FEEDBACK_PARAM);
+  const showFeedbackExpand =
+    showFeedbackParam === '1' ? true : showFeedbackParam === '0' ? false : undefined;
   const to = peekingRouter.callUIUrl(
     props.entityName,
     props.projectName,
     '',
     props.callId,
-    path,
-    showTraceTree,
+    descendentCallId,
+    hideTracetree,
     showFeedbackExpand
   );
 
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/views/Leaderboard/LeaderboardGrid.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/views/Leaderboard/LeaderboardGrid.tsx
index 24a45a858bdf..b212190c4851 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/views/Leaderboard/LeaderboardGrid.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/views/Leaderboard/LeaderboardGrid.tsx
@@ -69,7 +69,7 @@ export const LeaderboardGrid: React.FC<LeaderboardGridProps> = ({
             null
           );
         } else {
-          to = peekingRouter.callUIUrl(entity, project, '', sourceCallId, null);
+          to = peekingRouter.callUIUrl(entity, project, '', sourceCallId);
         }
         history.push(to);
       }