diff --git a/odd-platform-ui/src/components/Activity/ActivityResults/ActivityItem/ActivityItem.tsx b/odd-platform-ui/src/components/Activity/ActivityResults/ActivityItem/ActivityItem.tsx
index d4c5ca598..ce3c57282 100644
--- a/odd-platform-ui/src/components/Activity/ActivityResults/ActivityItem/ActivityItem.tsx
+++ b/odd-platform-ui/src/components/Activity/ActivityResults/ActivityItem/ActivityItem.tsx
@@ -18,7 +18,6 @@ import {
 } from 'components/shared/elements/Activity';
 import { useAppDateTime } from 'lib/hooks';
 import type { Activity } from 'redux/interfaces';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 import * as S from './ActivityItemStyles';
 
@@ -33,7 +32,6 @@ const ActivityItem: React.FC<ActivityItemProps> = ({
   hideAllDetails,
   dataQA,
 }) => {
-  const { updatePath } = useIsEmbeddedPath();
   const { activityFormattedDateTime } = useAppDateTime();
 
   const tagStateItem = React.useCallback(
@@ -50,7 +48,7 @@ const ActivityItem: React.FC<ActivityItemProps> = ({
     <S.Container container data-qa={dataQA}>
       <Grid container justifyContent='space-between' flexWrap='nowrap'>
         <Grid item display='flex' flexWrap='nowrap' alignItems='center'>
-          <Link to={updatePath(dataEntityDetailsPath(activity.dataEntity.id))}>
+          <Link to={dataEntityDetailsPath(activity.dataEntity.id)}>
             <Typography variant='h3' sx={{ mr: 1, width: 'max-content' }}>
               {activity.dataEntity.externalName || activity.dataEntity.internalName}
             </Typography>
diff --git a/odd-platform-ui/src/components/Alerts/AlertsList/AlertItem/AlertItem.tsx b/odd-platform-ui/src/components/Alerts/AlertsList/AlertItem/AlertItem.tsx
index 85b42d640..cd065b45a 100644
--- a/odd-platform-ui/src/components/Alerts/AlertsList/AlertItem/AlertItem.tsx
+++ b/odd-platform-ui/src/components/Alerts/AlertsList/AlertItem/AlertItem.tsx
@@ -9,7 +9,6 @@ import { GearIcon, UserIcon } from 'components/shared/icons';
 import { AlertStatusItem, Button, EntityClassItem } from 'components/shared/elements';
 import { alertTitlesMap } from 'lib/constants';
 import { getGlobalPermissions } from 'redux/selectors';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 import * as S from './AlertItemStyles';
 
@@ -31,7 +30,6 @@ const AlertItem: React.FC<AlertItemProps> = ({
 }) => {
   const dispatch = useAppDispatch();
   const { alertFormattedDateTime } = useAppDateTime();
-  const { updatePath } = useIsEmbeddedPath();
 
   const [showHistory, setShowHistory] = React.useState(false);
   const [disableResolve, setDisableResolve] = React.useState(false);
@@ -119,7 +117,7 @@ const AlertItem: React.FC<AlertItemProps> = ({
           <>
             <Button
               text={dataEntity.externalName || dataEntity.internalName}
-              to={updatePath(dataEntityDetailsPath(dataEntity.id))}
+              to={dataEntityDetailsPath(dataEntity.id)}
               buttonType='link-m'
             />
             {dataEntity?.entityClasses?.map(entityClass => (
diff --git a/odd-platform-ui/src/components/Alerts/AlertsTabs/AlertsTabs.tsx b/odd-platform-ui/src/components/Alerts/AlertsTabs/AlertsTabs.tsx
index 4ef3f071e..564bf89b7 100644
--- a/odd-platform-ui/src/components/Alerts/AlertsTabs/AlertsTabs.tsx
+++ b/odd-platform-ui/src/components/Alerts/AlertsTabs/AlertsTabs.tsx
@@ -4,9 +4,7 @@ import { type AppTabItem, AppTabs } from 'components/shared/elements';
 import { changeAlertsFilterAction } from 'redux/slices/alerts.slice';
 import { useAppDispatch } from 'redux/lib/hooks';
 import type { AlertTotals } from 'generated-sources';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { alertsPath } from 'routes';
-import { useLocation, useMatch } from 'react-router-dom';
 import useSetSelectedTab from 'components/shared/elements/AppTabs/useSetSelectedTab';
 
 interface AlertsTabsProps {
@@ -17,9 +15,6 @@ interface AlertsTabsProps {
 const AlertsTabs: React.FC<AlertsTabsProps> = ({ totals, showMyAndDepends }) => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
-  const { updatePath } = useIsEmbeddedPath();
-  const match = useMatch(useLocation().pathname);
-
   const [selectedTab, setSelectedTab] = useState(-1);
 
   const tabs = useMemo<AppTabItem[]>(
@@ -27,25 +22,25 @@ const AlertsTabs: React.FC<AlertsTabsProps> = ({ totals, showMyAndDepends }) =>
       {
         name: t('All'),
         hint: totals?.total ?? 0,
-        link: updatePath(alertsPath('all')),
+        link: alertsPath('all'),
       },
       {
         name: t('My Objects'),
         hint: totals?.myTotal ?? 0,
-        link: updatePath(alertsPath('my')),
+        link: alertsPath('my'),
         hidden: !showMyAndDepends,
       },
       {
         name: t('Dependents'),
         hint: totals?.dependentTotal ?? 0,
-        link: updatePath(alertsPath('dependents')),
+        link: alertsPath('dependents'),
         hidden: !showMyAndDepends,
       },
     ],
     [totals, showMyAndDepends, t]
   );
 
-  useSetSelectedTab(tabs, match, setSelectedTab);
+  useSetSelectedTab(tabs, setSelectedTab);
 
   const alertsFilterUpdateAction = useCallback(() => {
     dispatch(changeAlertsFilterAction());
diff --git a/odd-platform-ui/src/components/App.tsx b/odd-platform-ui/src/components/App.tsx
index 266ef8992..43e51d3d6 100644
--- a/odd-platform-ui/src/components/App.tsx
+++ b/odd-platform-ui/src/components/App.tsx
@@ -10,13 +10,17 @@ import {
   fetchIdentity,
   fetchTagsList,
 } from 'redux/thunks';
-import { useAppPaths } from 'lib/hooks';
 import {
+  activityPath,
   alertsPath,
+  dataEntitiesPath,
   dataModellingPath,
   dataQualityPath,
   directoryPath,
   managementPath,
+  searchPath,
+  termsPath,
+  termsSearchPath,
 } from 'routes';
 
 // lazy elements
@@ -35,16 +39,6 @@ const DataModeling = lazy(() => import('./DataModelling/DataModelling'));
 const App: React.FC = () => {
   const dispatch = useAppDispatch();
 
-  const {
-    isPathEmbedded,
-    SearchRoutes,
-    basePath,
-    TermsRoutes,
-    ActivityRoutes,
-    getNonExactPath,
-    getNonExactParamPath,
-  } = useAppPaths();
-
   useEffect(() => {
     dispatch(fetchDataEntitiesClassesAndTypes()).catch(() => {});
     dispatch(fetchIdentity()).catch(() => {});
@@ -55,38 +49,25 @@ const App: React.FC = () => {
   return (
     <div className='App'>
       <Toaster position='bottom-right' toastOptions={{ custom: { duration: 6000 } }} />
-      {!isPathEmbedded && <AppToolbar />}
+      <AppToolbar />
       <div style={{ paddingTop: `${toolbarHeight}px` }}>
         <AppSuspenseWrapper>
           <Routes>
-            <Route path={basePath} element={<Overview />} />
-            <Route path={getNonExactPath(SearchRoutes.search)} element={<Search />} />
-            <Route path={getNonExactPath(managementPath())} element={<Management />} />
-            <Route
-              path={getNonExactPath(TermsRoutes.termSearch)}
-              element={<TermSearch />}
-            />
-            <Route path={getNonExactPath(alertsPath())} element={<Alerts />} />
-            <Route
-              path={getNonExactPath(ActivityRoutes.activity)}
-              element={<Activity />}
-            />
-            <Route path={getNonExactPath(TermsRoutes.terms)} element={<TermDetails />}>
-              <Route path={getNonExactParamPath(TermsRoutes.termIdParam)} />
+            <Route path='/' element={<Overview />} />
+            <Route path={`${searchPath()}/*`} element={<Search />} />
+            <Route path={`${managementPath()}/*`} element={<Management />} />
+            <Route path={`${termsSearchPath()}/*`} element={<TermSearch />} />
+            <Route path={`${alertsPath()}/*`} element={<Alerts />} />
+            <Route path={activityPath()} element={<Activity />} />
+            <Route path={termsPath()}>
+              <Route path=':termId/*' element={<TermDetails />} />
+            </Route>
+            <Route path={dataEntitiesPath()}>
+              <Route path=':dataEntityId/*' element={<DataEntityDetails />} />
             </Route>
-            <Route
-              path={getNonExactPath('/dataentities/:dataEntityId')}
-              element={<DataEntityDetails />}
-            />
-            <Route
-              path={getNonExactPath(directoryPath())}
-              element={<DirectoryRoutes />}
-            />
-            <Route path={getNonExactPath(dataQualityPath())} element={<DataQuality />} />
-            <Route
-              path={getNonExactPath(dataModellingPath())}
-              element={<DataModeling />}
-            />
+            <Route path={`${directoryPath()}/*`} element={<DirectoryRoutes />} />
+            <Route path={dataQualityPath()} element={<DataQuality />} />
+            <Route path={`${dataModellingPath()}/*`} element={<DataModeling />} />
           </Routes>
         </AppSuspenseWrapper>
       </div>
diff --git a/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/CreateMessageForm/CreateMessageForm.tsx b/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/CreateMessageForm/CreateMessageForm.tsx
index f4fb89851..b247ec89b 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/CreateMessageForm/CreateMessageForm.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/CreateMessageForm/CreateMessageForm.tsx
@@ -13,7 +13,6 @@ import {
 } from 'components/shared/elements';
 import { type MessageRequest } from 'generated-sources';
 import { getMessageToSlackCreatingStatuses } from 'redux/selectors';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 
 interface CreateMessageFormProps {
@@ -28,13 +27,12 @@ const CreateMessageForm: React.FC<CreateMessageFormProps> = ({
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
   const navigate = useNavigate();
-  const { updatePath } = useIsEmbeddedPath();
 
   const { isLoading: isMessageCreating, isLoaded: isMessageCreated } = useAppSelector(
     getMessageToSlackCreatingStatuses
   );
 
-  const toCollaboration = updatePath(dataEntityDetailsPath(dataEntityId, 'discussions'));
+  const toCollaboration = dataEntityDetailsPath(dataEntityId, 'discussions');
 
   type MessageFormData = Omit<MessageRequest, 'dataEntityId'>;
 
diff --git a/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/CurrentMessage/Thread/Thread.tsx b/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/CurrentMessage/Thread/Thread.tsx
index 0265aaa4d..3e89bafd1 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/CurrentMessage/Thread/Thread.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/CurrentMessage/Thread/Thread.tsx
@@ -10,7 +10,6 @@ import {
 } from 'redux/selectors';
 import { fetchRelatedMessages, messagesListSize as size } from 'redux/thunks';
 import { clearThreadState } from 'redux/slices/dataCollaboration.slice';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath, useDataEntityRouteParams } from 'routes';
 import ThreadContent from './ThreadContent/ThreadContent';
 
@@ -21,7 +20,6 @@ const Thread: React.FC<ThreadProps> = ({ messageDate }) => {
   const dispatch = useAppDispatch();
   const navigate = useNavigate();
   const { dataEntityId, messageId } = useDataEntityRouteParams();
-  const { updatePath } = useIsEmbeddedPath();
 
   const mainMessage = useAppSelector(getDataEntityMessage(messageDate, messageId));
   const relatedMessages = useAppSelector(getRelatedMessages);
@@ -32,7 +30,7 @@ const Thread: React.FC<ThreadProps> = ({ messageDate }) => {
 
   React.useEffect(() => {
     if (relatedMessagesError) {
-      navigate(updatePath(dataEntityDetailsPath(dataEntityId, 'discussions')));
+      navigate(dataEntityDetailsPath(dataEntityId, 'discussions'));
     }
     dispatch(
       fetchRelatedMessages({ dataEntityId, messageId, size, lastMessageId: lastId })
diff --git a/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/CurrentMessage/Thread/ThreadContent/ThreadContent.tsx b/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/CurrentMessage/Thread/ThreadContent/ThreadContent.tsx
index ae6be962e..1e97cedac 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/CurrentMessage/Thread/ThreadContent/ThreadContent.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/CurrentMessage/Thread/ThreadContent/ThreadContent.tsx
@@ -5,7 +5,6 @@ import { useTranslation } from 'react-i18next';
 import { type Message } from 'redux/interfaces';
 import { Button, EmptyContentPlaceholder } from 'components/shared/elements';
 import { ClearIcon } from 'components/shared/icons';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 import ThreadMessage from './ThreadMessage/ThreadMessage';
 import MainThreadMessage from './MainThreadMessage/MainThreadMessage';
@@ -31,7 +30,6 @@ const ThreadContent: React.FC<ThreadContentProps> = ({
   isRelatedMessagesLoaded,
 }) => {
   const { t } = useTranslation();
-  const { updatePath } = useIsEmbeddedPath();
 
   return (
     <Grid
@@ -46,7 +44,7 @@ const ThreadContent: React.FC<ThreadContentProps> = ({
           {t('Thread')}
         </Typography>
         <Button
-          to={updatePath(dataEntityDetailsPath(dataEntityId, 'discussions'))}
+          to={dataEntityDetailsPath(dataEntityId, 'discussions')}
           buttonType='linkGray-m'
           icon={<ClearIcon viewBox='0 0 16 16' width={24} height={24} />}
           sx={{ ml: 2 }}
diff --git a/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/MessagesList/MessagesList.tsx b/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/MessagesList/MessagesList.tsx
index a577bb4cb..15028b16e 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/MessagesList/MessagesList.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/DataCollaboration/MessagesList/MessagesList.tsx
@@ -4,7 +4,6 @@ import { useNavigate } from 'react-router-dom';
 import InfiniteScroll from 'react-infinite-scroll-component';
 import { type MessagesByDate } from 'redux/interfaces';
 import { EmptyContentPlaceholder } from 'components/shared/elements';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDiscussionsPath, useDataEntityRouteParams } from 'routes';
 import Message from './Message/Message';
 import * as S from './MessagesListStyles';
@@ -31,11 +30,9 @@ const MessagesList: React.FC<MessagesListProps> = ({
 }) => {
   const navigate = useNavigate();
   const { dataEntityId, messageId: routerMessageId } = useDataEntityRouteParams();
-  const { updatePath } = useIsEmbeddedPath();
-
   const handleMessageOnClick = React.useCallback(
     (messageId: string) => () => {
-      navigate(updatePath(dataEntityDiscussionsPath(dataEntityId, messageId)));
+      navigate(dataEntityDiscussionsPath(dataEntityId, messageId));
     },
     [dataEntityId]
   );
diff --git a/odd-platform-ui/src/components/DataEntityDetails/DataEntityDetailsTabs/DataEntityDetailsTabs.tsx b/odd-platform-ui/src/components/DataEntityDetails/DataEntityDetailsTabs/DataEntityDetailsTabs.tsx
index b92d22c5b..050562802 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/DataEntityDetailsTabs/DataEntityDetailsTabs.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/DataEntityDetailsTabs/DataEntityDetailsTabs.tsx
@@ -14,7 +14,6 @@ import {
   type ActivityQuery,
   defaultActivityQuery,
 } from 'components/shared/elements/Activity/common';
-import { useLocation, useMatch } from 'react-router-dom';
 import {
   dataEntityDetailsPath,
   dataEntityLineagePath,
@@ -22,7 +21,6 @@ import {
   useDataEntityRouteParams,
 } from 'routes';
 import useSetSelectedTab from 'components/shared/elements/AppTabs/useSetSelectedTab';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { defaultLineageQuery } from '../Lineage/HierarchyLineage/lineageLib/constants';
 import { defaultDEGLineageQuery } from '../Lineage/DEGLineage/lib/constants';
 
@@ -35,7 +33,6 @@ const DataEntityDetailsTabs: React.FC = () => {
   const { defaultQueryString: activityQueryString } =
     useQueryParams<ActivityQuery>(defaultActivityQuery);
 
-  const { updatePath } = useIsEmbeddedPath();
   const openAlertsCount = useAppSelector(getDataEntityAlertsCount(dataEntityId));
   const dataEntityDetails = useAppSelector(getDataEntityDetails(dataEntityId));
   const datasetQualityTestReportTotal = useAppSelector(
@@ -45,63 +42,59 @@ const DataEntityDetailsTabs: React.FC = () => {
     getIsDataEntityBelongsToClass(dataEntityId)
   );
   const isStatusDeleted = useAppSelector(getIsEntityStatusDeleted(dataEntityId));
-  const match = useMatch(useLocation().pathname);
-
   const tabs = useMemo<AppTabItem[]>(
     () => [
       {
         name: t('Overview'),
-        link: updatePath(dataEntityDetailsPath(dataEntityId, 'overview')),
+        link: dataEntityDetailsPath(dataEntityId, 'overview'),
       },
       {
         name: t('Structure'),
-        link: updatePath(dataEntityDetailsPath(dataEntityId, 'structure')),
+        link: dataEntityDetailsPath(dataEntityId, 'structure'),
         hidden: !isDataset,
       },
       {
         name: t('Lineage'),
-        link: updatePath(
-          dataEntityLineagePath(
-            dataEntityId,
-            isDEG ? degLineageQueryString : lineageQueryString
-          )
+        link: dataEntityLineagePath(
+          dataEntityId,
+          isDEG ? degLineageQueryString : lineageQueryString
         ),
         hidden: isQualityTest || isStatusDeleted,
       },
       {
         name: t('Test reports'),
-        link: updatePath(dataEntityTestReportsPath(dataEntityId)),
+        link: dataEntityTestReportsPath(dataEntityId),
         hidden: !isDataset || !datasetQualityTestReportTotal || isStatusDeleted,
       },
       {
         name: t('History'),
-        link: updatePath(dataEntityDetailsPath(dataEntityId, 'history')),
+        link: dataEntityDetailsPath(dataEntityId, 'history'),
         hidden: (!isQualityTest && !isTransformer) || isStatusDeleted,
       },
       {
         name: t('Alerts'),
-        link: updatePath(dataEntityDetailsPath(dataEntityId, 'alerts')),
+        link: dataEntityDetailsPath(dataEntityId, 'alerts'),
         hint: openAlertsCount > 0 ? openAlertsCount : undefined,
         hintType: 'alert',
         hidden: isStatusDeleted,
       },
       {
         name: t('Linked entities'),
-        link: updatePath(dataEntityDetailsPath(dataEntityId, 'linked-entities')),
+        link: dataEntityDetailsPath(dataEntityId, 'linked-entities'),
         hidden: !dataEntityDetails?.hasChildren || isStatusDeleted,
       },
       {
         name: t('Query examples'),
-        link: updatePath(dataEntityDetailsPath(dataEntityId, 'query-examples')),
+        link: dataEntityDetailsPath(dataEntityId, 'query-examples'),
         hidden: !isDataset,
       },
       {
         name: t('Activity'),
-        link: updatePath(dataEntityDetailsPath(dataEntityId, 'activity')),
+        link: dataEntityDetailsPath(dataEntityId, 'activity'),
       },
       {
         name: t('Discussions'),
-        link: updatePath(dataEntityDetailsPath(dataEntityId, 'discussions')),
+        link: dataEntityDetailsPath(dataEntityId, 'discussions'),
         hidden: isStatusDeleted,
       },
     ],
@@ -124,7 +117,7 @@ const DataEntityDetailsTabs: React.FC = () => {
   );
 
   const [selectedTab, setSelectedTab] = React.useState(-1);
-  useSetSelectedTab(tabs, match, setSelectedTab);
+  useSetSelectedTab(tabs, setSelectedTab);
 
   return (
     <>
diff --git a/odd-platform-ui/src/components/DataEntityDetails/DataEntityGroup/DataEntityGroupForm/DataEntityGroupForm.tsx b/odd-platform-ui/src/components/DataEntityDetails/DataEntityGroup/DataEntityGroupForm/DataEntityGroupForm.tsx
index 26d04b0f2..eea8b3fd2 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/DataEntityGroup/DataEntityGroupForm/DataEntityGroupForm.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/DataEntityGroup/DataEntityGroupForm/DataEntityGroupForm.tsx
@@ -28,7 +28,6 @@ import {
 } from 'redux/selectors';
 import { createDataEntityGroup, updateDataEntityGroup } from 'redux/thunks';
 import { dataEntityDetailsPath, useDataEntityRouteParams } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import EntityItem from './EntityItem/EntityItem';
 import { EntityItemsContainer } from './DataEntityGroupFormStyles';
 
@@ -40,7 +39,6 @@ const DataEntityGroupForm: React.FC<DataEntityGroupFormProps> = ({ btnCreateEl }
   const dispatch = useAppDispatch();
   const { dataEntityId } = useDataEntityRouteParams();
   const navigate = useNavigate();
-  const { updatePath } = useIsEmbeddedPath();
 
   const dataEntityGroupDetails: DataEntityDetails = useAppSelector(
     getDataEntityDetails(dataEntityId)
@@ -96,7 +94,7 @@ const DataEntityGroupForm: React.FC<DataEntityGroupFormProps> = ({ btnCreateEl }
       .unwrap()
       .then(response => {
         clearState();
-        navigate(updatePath(dataEntityDetailsPath(response.id)));
+        navigate(dataEntityDetailsPath(response.id));
       });
   };
 
diff --git a/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureCompare/DatasetStructureCompareHeader/DatasetStructureCompareHeader.tsx b/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureCompare/DatasetStructureCompareHeader/DatasetStructureCompareHeader.tsx
index d9827ece3..5d610b72c 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureCompare/DatasetStructureCompareHeader/DatasetStructureCompareHeader.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureCompare/DatasetStructureCompareHeader/DatasetStructureCompareHeader.tsx
@@ -7,7 +7,6 @@ import { Button, Checkbox, AppMenuItem, AppSelect } from 'components/shared/elem
 import { useAppDateTime, useQueryParams } from 'lib/hooks';
 import type { DataSetVersion } from 'generated-sources';
 import { datasetStructurePath, useDataEntityRouteParams } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { showOnlyChangesAtom } from '../lib/atoms';
 import { defaultStructureCompareQuery } from '../lib/constants';
 import type { StructureCompareQueryParams } from '../lib/interfaces';
@@ -22,8 +21,6 @@ const DatasetStructureCompareHeader: FC<DatasetStructureCompareHeaderProps> = ({
   const { dataEntityId } = useDataEntityRouteParams();
   const { datasetStructureVersionFormattedDateTime } = useAppDateTime();
   const navigate = useNavigate();
-  const { updatePath } = useIsEmbeddedPath();
-
   const [showOnlyChanges, setShowOnlyChanges] = useAtom(showOnlyChangesAtom);
 
   const {
@@ -32,7 +29,7 @@ const DatasetStructureCompareHeader: FC<DatasetStructureCompareHeaderProps> = ({
   } = useQueryParams<StructureCompareQueryParams>(defaultStructureCompareQuery);
 
   const handleCloseClick = useCallback(() => {
-    navigate(updatePath(datasetStructurePath(dataEntityId)));
+    navigate(datasetStructurePath(dataEntityId));
   }, [dataEntityId]);
 
   const handleFirstRevisionChange = useCallback(
diff --git a/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureOverview.tsx b/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureOverview.tsx
index a356e909b..99e58504f 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureOverview.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureOverview.tsx
@@ -14,7 +14,6 @@ import {
 } from 'redux/selectors';
 import { AppErrorPage, EmptyContentPlaceholder } from 'components/shared/elements';
 import { useAppDispatch, useAppSelector } from 'redux/lib/hooks';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { datasetStructurePath, useDataEntityRouteParams } from 'routes';
 import DatasetStructureOverviewProvider from './lib/DatasetStructureOverviewProvider';
 import DatasetStructureSkeleton from './DatasetStructureSkeleton/DatasetStructureSkeleton';
@@ -23,7 +22,6 @@ import DatasetStructureView from './DatasetStructureView/DatasetStructureView';
 const DatasetStructureOverview: React.FC = () => {
   const dispatch = useAppDispatch();
   const navigate = useNavigate();
-  const { updatePath } = useIsEmbeddedPath();
   const { dataEntityId, versionId } = useDataEntityRouteParams();
 
   useEffect(() => {
@@ -33,7 +31,7 @@ const DatasetStructureOverview: React.FC = () => {
       dispatch(fetchDataSetStructureLatest({ dataEntityId }))
         .unwrap()
         .then(({ dataSetVersionId }) => {
-          navigate(updatePath(datasetStructurePath(dataEntityId, dataSetVersionId)), {
+          navigate(datasetStructurePath(dataEntityId, dataSetVersionId), {
             replace: true,
           });
         });
diff --git a/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetFieldOverview/DatasetFieldTerms/TermItem/TermItem.tsx b/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetFieldOverview/DatasetFieldTerms/TermItem/TermItem.tsx
index b0a7621fd..86a4d002d 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetFieldOverview/DatasetFieldTerms/TermItem/TermItem.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetFieldOverview/DatasetFieldTerms/TermItem/TermItem.tsx
@@ -9,7 +9,8 @@ import {
   Markdown,
 } from 'components/shared/elements';
 import { DeleteIcon, LinkedTermIcon } from 'components/shared/icons';
-import { useAppPaths, useDeleteDatasetFieldTerm } from 'lib/hooks';
+import { useDeleteDatasetFieldTerm } from 'lib/hooks';
+import { termDetailsPath } from 'routes';
 
 interface TermItemProps {
   name: TermRef['name'];
@@ -30,8 +31,7 @@ const TermItem: FC<TermItemProps> = ({
 }) => {
   const { mutateAsync: deleteTerm } = useDeleteDatasetFieldTerm();
 
-  const { termDetailsOverviewPath } = useAppPaths();
-  const termDetailsLink = termDetailsOverviewPath(termId);
+  const termDetailsLink = termDetailsPath(termId, 'overview');
 
   const handleDelete = useCallback(
     (e: React.MouseEvent) => {
diff --git a/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetStructureHeader/DatasetStructureHeader.tsx b/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetStructureHeader/DatasetStructureHeader.tsx
index aa047ae70..721f2f347 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetStructureHeader/DatasetStructureHeader.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/DatasetStructure/DatasetStructureOverview/DatasetStructureView/DatasetStructureHeader/DatasetStructureHeader.tsx
@@ -14,7 +14,6 @@ import {
   Input,
   NumberFormatted,
 } from 'components/shared/elements';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import {
   datasetStructureComparePath,
   datasetStructurePath,
@@ -28,7 +27,6 @@ const DatasetStructureHeader: FC = () => {
   const navigate = useNavigate();
   const { versionId, dataEntityId } = useDataEntityRouteParams();
   const { t } = useTranslation();
-  const { updatePath } = useIsEmbeddedPath();
   const { datasetStructureVersionFormattedDateTime } = useAppDateTime();
   const {
     handleSearch,
@@ -49,7 +47,7 @@ const DatasetStructureHeader: FC = () => {
     (event: SelectChangeEvent<unknown>) => {
       const newVersionId = event.target.value as number;
       dispatch(fetchDataSetStructure({ dataEntityId, versionId: newVersionId }));
-      navigate(updatePath(datasetStructurePath(dataEntityId, newVersionId)));
+      navigate(datasetStructurePath(dataEntityId, newVersionId));
     },
     [dataEntityId]
   );
@@ -71,11 +69,7 @@ const DatasetStructureHeader: FC = () => {
   const handleCompareClick = useCallback(() => {
     const firstVersionId = sortedVersions[0].id;
     const secondVersionId = sortedVersions[sortedVersions.length - 1].id;
-    navigate(
-      updatePath(
-        datasetStructureComparePath(dataEntityId, firstVersionId, secondVersionId)
-      )
-    );
+    navigate(datasetStructureComparePath(dataEntityId, firstVersionId, secondVersionId));
   }, [dataEntityId]);
 
   const onSearchClick = useCallback(() => {
diff --git a/odd-platform-ui/src/components/DataEntityDetails/Lineage/DEGLineage/components/Node/Node.tsx b/odd-platform-ui/src/components/DataEntityDetails/Lineage/DEGLineage/components/Node/Node.tsx
index 8561d355e..9d71dc044 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/Lineage/DEGLineage/components/Node/Node.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/Lineage/DEGLineage/components/Node/Node.tsx
@@ -5,7 +5,6 @@ import { useTranslation } from 'react-i18next';
 import { EntityClassItem, LabeledInfoItem } from 'components/shared/elements';
 import { EmptyIcon } from 'components/shared/icons';
 import { dataEntityDetailsPath, dataEntityLineagePath } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import * as S from './Node.styles';
 import type { Node as NodeType } from '../../lib/interfaces';
 
@@ -27,13 +26,12 @@ const Node = forwardRef<HTMLDivElement, NodeProps>(
   ) => {
     const { t } = useTranslation();
     const navigate = useNavigate();
-    const { updatePath } = useIsEmbeddedPath();
 
     const lineageLink = React.useMemo(
       () =>
         data?.entityClasses?.some(entityClass => entityClass.name === 'DATA_QUALITY_TEST')
-          ? updatePath(dataEntityDetailsPath(id))
-          : updatePath(dataEntityLineagePath(id)),
+          ? dataEntityDetailsPath(id)
+          : dataEntityLineagePath(id),
       [id, data?.entityClasses]
     );
 
diff --git a/odd-platform-ui/src/components/DataEntityDetails/Lineage/HierarchyLineage/ZoomableLineage/LineageGraph/Node/Info/GroupedEntitiesListModal/GroupedEntitiesListModal.tsx b/odd-platform-ui/src/components/DataEntityDetails/Lineage/HierarchyLineage/ZoomableLineage/LineageGraph/Node/Info/GroupedEntitiesListModal/GroupedEntitiesListModal.tsx
index d7e46c806..846de7911 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/Lineage/HierarchyLineage/ZoomableLineage/LineageGraph/Node/Info/GroupedEntitiesListModal/GroupedEntitiesListModal.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/Lineage/HierarchyLineage/ZoomableLineage/LineageGraph/Node/Info/GroupedEntitiesListModal/GroupedEntitiesListModal.tsx
@@ -18,7 +18,6 @@ import {
 import * as S from 'components/DataEntityDetails/Lineage/HierarchyLineage/ZoomableLineage/LineageGraph/Node/Info/GroupedEntitiesListModal/GroupedEntitiesListModalStyles';
 import type { LineageQueryParams } from 'components/DataEntityDetails/Lineage/HierarchyLineage/lineageLib/interfaces';
 import { defaultLineageQuery } from 'components/DataEntityDetails/Lineage/HierarchyLineage/lineageLib/constants';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 
 interface GroupedEntitiesListModalProps {
@@ -38,7 +37,6 @@ const GroupedEntitiesListModal: React.FC<GroupedEntitiesListModalProps> = ({
 }) => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
-  const { updatePath } = useIsEmbeddedPath();
   const {
     queryParams: { eag },
     setQueryParams,
@@ -88,7 +86,7 @@ const GroupedEntitiesListModal: React.FC<GroupedEntitiesListModalProps> = ({
   };
 
   const listItem = (item: DataEntityLineageNode) => (
-    <Link to={updatePath(dataEntityDetailsPath(item.id))}>
+    <Link to={dataEntityDetailsPath(item.id)}>
       <S.ListItemContainer container>
         <Grid maxWidth='370px'>
           <Typography noWrap title={item.internalName || item.externalName}>
diff --git a/odd-platform-ui/src/components/DataEntityDetails/Lineage/HierarchyLineage/ZoomableLineage/LineageGraph/Node/Node.tsx b/odd-platform-ui/src/components/DataEntityDetails/Lineage/HierarchyLineage/ZoomableLineage/LineageGraph/Node/Node.tsx
index 42903e828..9bc19517c 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/Lineage/HierarchyLineage/ZoomableLineage/LineageGraph/Node/Node.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/Lineage/HierarchyLineage/ZoomableLineage/LineageGraph/Node/Node.tsx
@@ -7,7 +7,6 @@ import { DataEntityClassNameEnum } from 'generated-sources';
 import { type StreamType } from 'redux/interfaces';
 import { useQueryParams } from 'lib/hooks';
 import { DatasourceLogo } from 'components/shared/elements';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityLineagePath } from 'routes';
 import type { NodeSize } from '../../../lineageLib/interfaces';
 import { getHighLightedLinks } from '../../../lineageLib/helpers';
@@ -44,7 +43,6 @@ const Node = React.memo<NodeProps>(
     hasChildren,
   }) => {
     const navigate = useNavigate();
-    const { updatePath } = useIsEmbeddedPath();
     const {
       defaultQueryString: lineageQueryString,
       queryParams: { fn, full },
@@ -59,7 +57,7 @@ const Node = React.memo<NodeProps>(
         : node.data.id;
 
       return parent && node.data.externalName
-        ? updatePath(dataEntityLineagePath(entityId, lineageQueryString))
+        ? dataEntityLineagePath(entityId, lineageQueryString)
         : '#';
     }, [
       parent,
diff --git a/odd-platform-ui/src/components/DataEntityDetails/LinkedItemsList/LinkedItem/LinkedItem.tsx b/odd-platform-ui/src/components/DataEntityDetails/LinkedItemsList/LinkedItem/LinkedItem.tsx
index 92b20c45c..fb8a05159 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/LinkedItemsList/LinkedItem/LinkedItem.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/LinkedItemsList/LinkedItem/LinkedItem.tsx
@@ -3,7 +3,6 @@ import { Box, Grid, Typography } from '@mui/material';
 import type { DataEntity } from 'generated-sources';
 import { useAppDateTime } from 'lib/hooks';
 import { MetadataStale } from 'components/shared/elements';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 import { Container, ItemLink, ColContainer } from './LinkedItemStyles';
 
@@ -13,8 +12,7 @@ interface LinkedItemProps {
 
 const LinkedItem: React.FC<LinkedItemProps> = ({ linkedItem }) => {
   const { linkedEntityFormattedDateTime, formatDistanceToNowStrict } = useAppDateTime();
-  const { updatePath } = useIsEmbeddedPath();
-  const detailsLink = updatePath(dataEntityDetailsPath(linkedItem.id));
+  const detailsLink = dataEntityDetailsPath(linkedItem.id);
 
   return (
     <ItemLink to={detailsLink}>
diff --git a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewDataQualityReport/OverviewDQTestReport/OverviewDQTestReport.tsx b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewDataQualityReport/OverviewDQTestReport/OverviewDQTestReport.tsx
index 695ad058b..0402790a3 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewDataQualityReport/OverviewDQTestReport/OverviewDQTestReport.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewDataQualityReport/OverviewDQTestReport/OverviewDQTestReport.tsx
@@ -9,7 +9,6 @@ import {
 } from 'redux/selectors';
 import { Button, NumberFormatted } from 'components/shared/elements';
 import { useAppSelector } from 'redux/lib/hooks';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityTestReportsPath } from 'routes';
 import OverviewDQReportSkeleton from './OverviewDQReportSkeleton/OverviewDQReportSkeleton';
 import * as S from './OverviewDQTestReportStyles';
@@ -20,7 +19,6 @@ interface OverviewDQTestReportProps {
 
 const OverviewDQTestReport: React.FC<OverviewDQTestReportProps> = ({ dataEntityId }) => {
   const { t } = useTranslation();
-  const { updatePath } = useIsEmbeddedPath();
 
   const { isLoading: isDatasetTestReportFetching } = useAppSelector(
     getDatasetTestReportFetchingStatuses
@@ -76,7 +74,7 @@ const OverviewDQTestReport: React.FC<OverviewDQTestReportProps> = ({ dataEntityI
             <Grid item>
               <Button
                 text={t('See all')}
-                to={updatePath(dataEntityTestReportsPath(dataEntityId))}
+                to={dataEntityTestReportsPath(dataEntityId)}
                 buttonType='tertiary-m'
               />
             </Grid>
diff --git a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewGroups/GroupItem/GroupItem.tsx b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewGroups/GroupItem/GroupItem.tsx
index e33b8cd14..644d84816 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewGroups/GroupItem/GroupItem.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewGroups/GroupItem/GroupItem.tsx
@@ -6,7 +6,6 @@ import { deleteDataEntityFromGroup } from 'redux/thunks';
 import { WithPermissions } from 'components/shared/contexts';
 import { Button } from 'components/shared/elements';
 import { CloseIcon } from 'components/shared/icons';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 import * as S from './GroupItemStyles';
 
@@ -17,8 +16,7 @@ interface GroupItemProps {
 
 const GroupItem: React.FC<GroupItemProps> = ({ dataEntityId, group }) => {
   const dispatch = useAppDispatch();
-  const { updatePath } = useIsEmbeddedPath();
-  const groupDetailsLink = updatePath(dataEntityDetailsPath(group.id));
+  const groupDetailsLink = dataEntityDetailsPath(group.id);
 
   const handleDelete = (e: React.MouseEvent) => {
     e.preventDefault();
diff --git a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewDataConsumerStats/OverviewDataConsumerStats.tsx b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewDataConsumerStats/OverviewDataConsumerStats.tsx
index 056d32837..2e6fa8a6c 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewDataConsumerStats/OverviewDataConsumerStats.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewDataConsumerStats/OverviewDataConsumerStats.tsx
@@ -3,7 +3,6 @@ import { Grid, Typography } from '@mui/material';
 import { useTranslation } from 'react-i18next';
 import { DataEntityClassNameEnum, type DataEntityDetails } from 'generated-sources';
 import { EntitiesListModal, Button, EntityClassItem } from 'components/shared/elements';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 
 interface OverviewDataConsumerStatsProps {
@@ -19,7 +18,6 @@ const OverviewDataConsumerStats: React.FC<OverviewDataConsumerStatsProps> = ({
 }) => {
   const { t } = useTranslation();
   const displayedEntitiesNumber = 10;
-  const { updatePath } = useIsEmbeddedPath();
 
   return (
     <Grid container>
@@ -41,7 +39,7 @@ const OverviewDataConsumerStats: React.FC<OverviewDataConsumerStatsProps> = ({
             .map(input => (
               <Button
                 text={input.internalName || input.externalName}
-                to={updatePath(dataEntityDetailsPath(input.id))}
+                to={dataEntityDetailsPath(input.id)}
                 key={input.id}
                 sx={{ my: 0.25 }}
                 buttonType='tertiary-m'
diff --git a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewDataInputStats/OverviewDataInputStats.tsx b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewDataInputStats/OverviewDataInputStats.tsx
index bc59634bf..ebb442dc6 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewDataInputStats/OverviewDataInputStats.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewDataInputStats/OverviewDataInputStats.tsx
@@ -3,7 +3,6 @@ import { Grid, Typography } from '@mui/material';
 import { useTranslation } from 'react-i18next';
 import { DataEntityClassNameEnum, type DataEntityDetails } from 'generated-sources';
 import { Button, EntitiesListModal, EntityClassItem } from 'components/shared/elements';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 
 interface OverviewDataInputStatsProps {
@@ -19,7 +18,6 @@ const OverviewDataInputStats: React.FC<OverviewDataInputStatsProps> = ({
 }) => {
   const { t } = useTranslation();
   const displayedEntitiesNumber = 10;
-  const { updatePath } = useIsEmbeddedPath();
 
   return (
     <Grid container>
@@ -39,7 +37,7 @@ const OverviewDataInputStats: React.FC<OverviewDataInputStatsProps> = ({
             .map(output => (
               <Button
                 text={output.internalName || output.externalName}
-                to={updatePath(dataEntityDetailsPath(output.id))}
+                to={dataEntityDetailsPath(output.id)}
                 key={output.id}
                 sx={{ my: 0.25 }}
                 buttonType='tertiary-m'
diff --git a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewEntityGroupItems/EntityGroupItem/EntityGroupItem.tsx b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewEntityGroupItems/EntityGroupItem/EntityGroupItem.tsx
index 0559d0e68..9e9265730 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewEntityGroupItems/EntityGroupItem/EntityGroupItem.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewEntityGroupItems/EntityGroupItem/EntityGroupItem.tsx
@@ -12,7 +12,6 @@ import {
 } from 'components/shared/elements';
 import { TriangularUnionIcon } from 'components/shared/icons';
 import MetadataStale from 'components/shared/elements/MetadataStale/MetadataStale';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 
 interface EntityGroupItemProps {
@@ -42,7 +41,6 @@ const EntityGroupItem: FC<EntityGroupItemProps> = ({
   lastIngestedAt,
   isStale,
 }) => {
-  const { updatePath } = useIsEmbeddedPath();
   const { dataEntityFormattedDateTime } = useAppDateTime();
 
   const ownersEllipsis = useCallback(
@@ -57,7 +55,7 @@ const EntityGroupItem: FC<EntityGroupItemProps> = ({
   );
 
   return (
-    <Link to={updatePath(dataEntityDetailsPath(id))}>
+    <Link to={dataEntityDetailsPath(id)}>
       <Table.RowContainer>
         <Table.Cell $flex={flexMap.name}>
           <Grid
diff --git a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewQualityTestStats/OverviewQualityTestStats.tsx b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewQualityTestStats/OverviewQualityTestStats.tsx
index 92fdcec5c..d35de77ff 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewQualityTestStats/OverviewQualityTestStats.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewQualityTestStats/OverviewQualityTestStats.tsx
@@ -16,7 +16,6 @@ import {
   TestRunStatusReasonModal,
 } from 'components/shared/elements';
 import { dataEntityDetailsPath } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import * as S from './OverviewQualityTestStatsStyles';
 
 interface OverviewQualityTestStatsProps {
@@ -35,7 +34,6 @@ const OverviewQualityTestStats: React.FC<OverviewQualityTestStatsProps> = ({
   datasetsList,
 }) => {
   const { t } = useTranslation();
-  const { updatePath } = useIsEmbeddedPath();
   const { qualityTestFormattedDateTime, formatDistanceStrict } = useAppDateTime();
 
   const displayedEntitiesNumber = 10;
@@ -59,7 +57,7 @@ const OverviewQualityTestStats: React.FC<OverviewQualityTestStatsProps> = ({
             .map(dataset => (
               <Button
                 text={dataset.internalName || dataset.externalName}
-                to={updatePath(dataEntityDetailsPath(dataset.id))}
+                to={dataEntityDetailsPath(dataset.id)}
                 key={dataset.id}
                 sx={{ my: 0.25, maxWidth: '100%' }}
                 buttonType='link-m'
@@ -132,7 +130,7 @@ const OverviewQualityTestStats: React.FC<OverviewQualityTestStatsProps> = ({
             <Button
               text={t('History')}
               buttonType='secondary-m'
-              to={updatePath(dataEntityDetailsPath(qualityTest?.id, 'history'))}
+              to={dataEntityDetailsPath(qualityTest?.id, 'history')}
             />
           </Grid>
         </S.Overview>
diff --git a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewTransformerStats/OverviewTransformerStats.tsx b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewTransformerStats/OverviewTransformerStats.tsx
index 89e1a8472..7cf389cf8 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewTransformerStats/OverviewTransformerStats.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewStats/OverviewTransformerStats/OverviewTransformerStats.tsx
@@ -4,7 +4,6 @@ import { useTranslation } from 'react-i18next';
 import { DataEntityClassNameEnum, type DataEntityDetails } from 'generated-sources';
 import { UpstreamIcon, DownstreamIcon } from 'components/shared/icons';
 import { EntityClassItem, Button, EntitiesListModal } from 'components/shared/elements';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 import { StatIconContainer } from './OverviewTransformerStatsStyles';
 
@@ -25,7 +24,6 @@ const OverviewTransformerStats: React.FC<OverviewTransformerStatsProps> = ({
 }) => {
   const { t } = useTranslation();
   const displayedEntitiesNumber = 10;
-  const { updatePath } = useIsEmbeddedPath();
 
   return (
     <Grid container>
@@ -56,7 +54,7 @@ const OverviewTransformerStats: React.FC<OverviewTransformerStatsProps> = ({
               .map(source => (
                 <Button
                   text={source.internalName || source.externalName}
-                  to={updatePath(dataEntityDetailsPath(source.id))}
+                  to={dataEntityDetailsPath(source.id)}
                   key={source.id}
                   buttonType='link-m'
                   sx={{ my: 0.25 }}
@@ -103,7 +101,7 @@ const OverviewTransformerStats: React.FC<OverviewTransformerStatsProps> = ({
               .map(target => (
                 <Button
                   text={target.internalName || target.externalName}
-                  to={updatePath(dataEntityDetailsPath(target.id))}
+                  to={dataEntityDetailsPath(target.id)}
                   key={target.id}
                   sx={{ my: 0.25 }}
                   buttonType='link-m'
diff --git a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewTerms/TermItem/TermItem.tsx b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewTerms/TermItem/TermItem.tsx
index 68445a35f..968c669fb 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewTerms/TermItem/TermItem.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/Overview/OverviewTerms/TermItem/TermItem.tsx
@@ -3,11 +3,11 @@ import { Box, Grid, Typography } from '@mui/material';
 import type { LinkedTerm } from 'generated-sources';
 import { Permission } from 'generated-sources';
 import { deleteDataEntityTerm } from 'redux/thunks/dataentities.thunks';
-import { useAppPaths } from 'lib/hooks';
 import { useAppDispatch } from 'redux/lib/hooks';
 import { CloseIcon, LinkedTermIcon } from 'components/shared/icons';
 import { WithPermissions } from 'components/shared/contexts';
 import { Button } from 'components/shared/elements';
+import { termDetailsPath } from 'routes';
 import * as S from './TermItem.styles';
 
 interface TermItemProps {
@@ -22,8 +22,7 @@ const TermItem: React.FC<TermItemProps> = ({
   isStatusDeleted,
 }) => {
   const dispatch = useAppDispatch();
-  const { termDetailsOverviewPath } = useAppPaths();
-  const termDetailsLink = termDetailsOverviewPath(linkedTerm.term.id);
+  const termDetailsLink = termDetailsPath(linkedTerm.term.id);
 
   const handleDelete = (e: React.MouseEvent) => {
     e.preventDefault();
diff --git a/odd-platform-ui/src/components/DataEntityDetails/QualityTestRunsHistory/TestRunStatusReasonModal/TestRunStatusReasonModal.tsx b/odd-platform-ui/src/components/DataEntityDetails/QualityTestRunsHistory/TestRunStatusReasonModal/TestRunStatusReasonModal.tsx
index b7a95727b..896c50aa4 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/QualityTestRunsHistory/TestRunStatusReasonModal/TestRunStatusReasonModal.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/QualityTestRunsHistory/TestRunStatusReasonModal/TestRunStatusReasonModal.tsx
@@ -9,7 +9,6 @@ import {
   TestRunStatusItem,
 } from 'components/shared/elements';
 import { useAppDateTime } from 'lib/hooks';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 import { StatsContainer, StatusReasonContainer } from './TestRunStatusReasonModalStyles';
 
@@ -27,7 +26,6 @@ const TestRunStatusReasonModal: React.FC<TestRunStatusReasonModalProps> = ({
   dataQATestRun,
 }) => {
   const { t } = useTranslation();
-  const { updatePath } = useIsEmbeddedPath();
   const { qualityTestRunFormattedDateTime, formatDistanceStrict } = useAppDateTime();
 
   const modalTitle = (
@@ -36,7 +34,7 @@ const TestRunStatusReasonModal: React.FC<TestRunStatusReasonModalProps> = ({
         {dataQATestName}
       </Typography>
       <Button
-        to={updatePath(dataEntityDetailsPath(dataQATestId))}
+        to={dataEntityDetailsPath(dataQATestId)}
         text={t('Go to page')}
         buttonType='tertiary-m'
       />
diff --git a/odd-platform-ui/src/components/DataEntityDetails/TestReport/TestReportDetails/TestReportDetails.tsx b/odd-platform-ui/src/components/DataEntityDetails/TestReport/TestReportDetails/TestReportDetails.tsx
index c47ee7ac1..9b9ac81cb 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/TestReport/TestReportDetails/TestReportDetails.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/TestReport/TestReportDetails/TestReportDetails.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Grid, Typography } from '@mui/material';
-import { Navigate, Route, Routes, useLocation, useMatch } from 'react-router-dom';
+import { Navigate, Route, Routes } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import {
   Button,
@@ -13,7 +13,6 @@ import { getQualityTestByTestId, getResourcePermissions } from 'redux/selectors'
 import { useAppSelector } from 'redux/lib/hooks';
 import { WithPermissionsProvider } from 'components/shared/contexts';
 import { Permission, PermissionResourceType } from 'generated-sources';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import {
   dataEntityDetailsPath,
   dataEntityTestReportsPath,
@@ -32,9 +31,6 @@ const TestReportDetailsHistory = React.lazy(
 const TestReportDetails: React.FC = () => {
   const { t } = useTranslation();
   const { dataQATestId, dataEntityId } = useDataEntityRouteParams();
-  const { updatePath } = useIsEmbeddedPath();
-  const match = useMatch(useLocation().pathname);
-
   const qualityTest = useAppSelector(getQualityTestByTestId(dataQATestId));
   const resourcePermissions = useAppSelector(
     getResourcePermissions(PermissionResourceType.DATA_ENTITY, dataEntityId)
@@ -44,15 +40,11 @@ const TestReportDetails: React.FC = () => {
     () => [
       {
         name: t('Overview'),
-        link: updatePath(dataEntityTestReportsPath(dataEntityId, dataQATestId)),
-        value: 'overview',
+        link: dataEntityTestReportsPath(dataEntityId, dataQATestId),
       },
       {
         name: t('History'),
-        link: updatePath(
-          dataEntityTestReportsPath(dataEntityId, dataQATestId, 'history')
-        ),
-        value: 'history',
+        link: dataEntityTestReportsPath(dataEntityId, dataQATestId, 'history'),
       },
     ],
     [dataEntityId, dataQATestId, t]
@@ -60,7 +52,7 @@ const TestReportDetails: React.FC = () => {
 
   const [selectedTab, setSelectedTab] = React.useState(-1);
 
-  useSetSelectedTab(tabs, match, setSelectedTab);
+  useSetSelectedTab(tabs, setSelectedTab);
 
   return (
     <Grid container sx={{ p: 2 }}>
@@ -74,7 +66,7 @@ const TestReportDetails: React.FC = () => {
         </Grid>
         <Button
           text={t('Go to page')}
-          to={updatePath(dataEntityDetailsPath(dataQATestId))}
+          to={dataEntityDetailsPath(dataQATestId)}
           buttonType='tertiary-m'
           sx={{ ml: 2, flexShrink: 0 }}
         />
diff --git a/odd-platform-ui/src/components/DataEntityDetails/TestReport/TestReportItem/TestReportItem.tsx b/odd-platform-ui/src/components/DataEntityDetails/TestReport/TestReportItem/TestReportItem.tsx
index f9c2221fa..f167a0857 100644
--- a/odd-platform-ui/src/components/DataEntityDetails/TestReport/TestReportItem/TestReportItem.tsx
+++ b/odd-platform-ui/src/components/DataEntityDetails/TestReport/TestReportItem/TestReportItem.tsx
@@ -6,7 +6,6 @@ import { TestRunStatusItem, Button } from 'components/shared/elements';
 import { MinusIcon, PlusIcon } from 'components/shared/icons';
 import type { DataSetQualityTestsStatusCount } from 'redux/interfaces';
 import { dataEntityTestReportsPath } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import TestItem from './TestItem/TestItem';
 import * as S from './TestReportItemStyles';
 
@@ -26,8 +25,6 @@ const TestReportItem: React.FC<TestReportItemProps> = ({
   dataQATestReport,
 }) => {
   const [open, setOpen] = React.useState<boolean>(false);
-  const { updatePath } = useIsEmbeddedPath();
-
   React.useEffect(() => {
     if (dataQATestList.length < 5) setOpen(true);
   }, [dataQATestList]);
@@ -78,7 +75,7 @@ const TestReportItem: React.FC<TestReportItemProps> = ({
         {open && dataQATestList.length
           ? dataQATestList.map(dataQATest => (
               <Link
-                to={updatePath(dataEntityTestReportsPath(dataSetId, dataQATest.id))}
+                to={dataEntityTestReportsPath(dataSetId, dataQATest.id)}
                 key={dataQATest.id}
               >
                 <TestItem
diff --git a/odd-platform-ui/src/components/DataModelling/DataModellingTabs.tsx b/odd-platform-ui/src/components/DataModelling/DataModellingTabs.tsx
index d9d42a88a..b557b6bec 100644
--- a/odd-platform-ui/src/components/DataModelling/DataModellingTabs.tsx
+++ b/odd-platform-ui/src/components/DataModelling/DataModellingTabs.tsx
@@ -11,11 +11,9 @@ const DataModellingTabs = () => {
     () => [
       {
         name: t('Query Examples'),
-        value: 'query-examples',
       },
       {
         name: t('Relationships'),
-        value: 'relationships',
         disabled: true,
       },
     ],
diff --git a/odd-platform-ui/src/components/DataModelling/QueryExampleDetails/QuertExampleDettailsLinkedEntitiesItem.tsx b/odd-platform-ui/src/components/DataModelling/QueryExampleDetails/QuertExampleDettailsLinkedEntitiesItem.tsx
index e93830bdd..91fa4b094 100644
--- a/odd-platform-ui/src/components/DataModelling/QueryExampleDetails/QuertExampleDettailsLinkedEntitiesItem.tsx
+++ b/odd-platform-ui/src/components/DataModelling/QueryExampleDetails/QuertExampleDettailsLinkedEntitiesItem.tsx
@@ -4,7 +4,6 @@ import { Box, Grid, Typography } from '@mui/material';
 import { EntityClassItem, MetadataStale } from 'components/shared/elements';
 import React, { useCallback } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 
 interface QueryExampleDetailsLinkedEntitiesItemProps {
@@ -16,9 +15,8 @@ const QueryExampleDetailsLinkedEntitiesItem = ({
 }: QueryExampleDetailsLinkedEntitiesItemProps) => {
   const { linkedEntityFormattedDateTime, formatDistanceToNowStrict } = useAppDateTime();
   const navigate = useNavigate();
-  const { updatePath } = useIsEmbeddedPath();
   const onClick = useCallback(() => {
-    navigate(updatePath(dataEntityDetailsPath(entity.id)));
+    navigate(dataEntityDetailsPath(entity.id));
   }, [entity.id, navigate]);
 
   return (
diff --git a/odd-platform-ui/src/components/DataModelling/QueryExampleDetails/QueryExampleDetailsTabs.tsx b/odd-platform-ui/src/components/DataModelling/QueryExampleDetails/QueryExampleDetailsTabs.tsx
index 33a4d5814..9c36416c4 100644
--- a/odd-platform-ui/src/components/DataModelling/QueryExampleDetails/QueryExampleDetailsTabs.tsx
+++ b/odd-platform-ui/src/components/DataModelling/QueryExampleDetails/QueryExampleDetailsTabs.tsx
@@ -20,11 +20,9 @@ const QueryExampleDetailsTabs = ({
     () => [
       {
         name: t('Overview'),
-        value: 'overview',
       },
       {
         name: t('Linked Entities'),
-        value: 'linked-entities',
         hint: linkedEntitiesHint,
       },
     ],
diff --git a/odd-platform-ui/src/components/DataModelling/QueryExampleForm/QueryExampleForm.tsx b/odd-platform-ui/src/components/DataModelling/QueryExampleForm/QueryExampleForm.tsx
index 0b4ae98d9..21402a6db 100644
--- a/odd-platform-ui/src/components/DataModelling/QueryExampleForm/QueryExampleForm.tsx
+++ b/odd-platform-ui/src/components/DataModelling/QueryExampleForm/QueryExampleForm.tsx
@@ -10,7 +10,6 @@ import { Controller, useForm } from 'react-hook-form';
 import { Grid, Typography } from '@mui/material';
 import { Button, DialogWrapper, Input, Markdown } from 'components/shared/elements';
 import { queryExamplesPath } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 
 interface QueryExampleFormProps {
   btnCreateEl: JSX.Element;
@@ -22,7 +21,6 @@ const QueryExampleForm = ({
   btnCreateEl,
 }: QueryExampleFormProps) => {
   const { t } = useTranslation();
-  const { updatePath } = useIsEmbeddedPath();
   const navigate = useNavigate();
   const {
     mutateAsync: addQueryExample,
@@ -64,7 +62,7 @@ const QueryExampleForm = ({
 
       mutation$.then(qe => {
         reset();
-        navigate(updatePath(queryExamplesPath(qe.id)));
+        navigate(queryExamplesPath(qe.id));
       });
     },
     [queryExampleDetails]
diff --git a/odd-platform-ui/src/components/Directory/Entities/EntitiesList/EntityItem/EntityItem.tsx b/odd-platform-ui/src/components/Directory/Entities/EntitiesList/EntityItem/EntityItem.tsx
index 3b452d16e..baf1c5c76 100644
--- a/odd-platform-ui/src/components/Directory/Entities/EntitiesList/EntityItem/EntityItem.tsx
+++ b/odd-platform-ui/src/components/Directory/Entities/EntitiesList/EntityItem/EntityItem.tsx
@@ -11,7 +11,6 @@ import {
 import { DataEntityClassTypeLabelMap } from 'lib/constants';
 import { useAppDateTime } from 'lib/hooks';
 import { dataEntityDetailsPath, useDirectoryRouteParams } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 
 interface EntityItemProps {
   name: DataEntity['internalName'] | DataEntity['externalName'];
@@ -39,11 +38,10 @@ const EntityItem: FC<EntityItemProps> = ({
   id,
 }) => {
   const { typeId } = useDirectoryRouteParams();
-  const { updatePath } = useIsEmbeddedPath();
   const { dataEntityFormattedDateTime } = useAppDateTime();
 
   return (
-    <Link to={updatePath(dataEntityDetailsPath(id))}>
+    <Link to={dataEntityDetailsPath(id)}>
       <Table.RowContainer>
         <Table.Cell $flex={flexMap.name}>
           <Grid
diff --git a/odd-platform-ui/src/components/Directory/Entities/EntitiesTabs/EntitiesTabs.tsx b/odd-platform-ui/src/components/Directory/Entities/EntitiesTabs/EntitiesTabs.tsx
index 7f22c7673..5685d1dac 100644
--- a/odd-platform-ui/src/components/Directory/Entities/EntitiesTabs/EntitiesTabs.tsx
+++ b/odd-platform-ui/src/components/Directory/Entities/EntitiesTabs/EntitiesTabs.tsx
@@ -4,30 +4,26 @@ import type { DataEntityType } from 'generated-sources';
 import { AppTabs, type AppTabItem } from 'components/shared/elements';
 import { DataEntityClassTypeLabelMap } from 'lib/constants';
 import { directoryDataSourcePath, useDirectoryRouteParams } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 
 interface EntitiesListTabsProps {
   types: DataEntityType[];
 }
 
 const EntitiesTabs: FC<EntitiesListTabsProps> = ({ types }) => {
-  const { updatePath } = useIsEmbeddedPath();
   const { typeId, dataSourceTypePrefix, dataSourceId } = useDirectoryRouteParams();
   const [selectedTab, setSelectedTab] = React.useState(0);
 
   const tabs = React.useMemo<AppTabItem[]>(() => {
     const dynamicTabs = types.map(({ id, name }) => ({
       name: DataEntityClassTypeLabelMap.get(name)!.plural,
-      link: updatePath(directoryDataSourcePath(dataSourceTypePrefix, dataSourceId, id)),
+      link: directoryDataSourcePath(dataSourceTypePrefix, dataSourceId, id),
       value: id,
     }));
 
     return [
       {
         name: 'All',
-        link: updatePath(
-          directoryDataSourcePath(dataSourceTypePrefix, dataSourceId, 'all')
-        ),
+        link: directoryDataSourcePath(dataSourceTypePrefix, dataSourceId, 'all'),
         value: 'all',
       },
       ...dynamicTabs,
diff --git a/odd-platform-ui/src/components/Management/Integrations/Integration/IntegrationTabs/IntegrationTabs.tsx b/odd-platform-ui/src/components/Management/Integrations/Integration/IntegrationTabs/IntegrationTabs.tsx
index 189cbda76..4fe7aa1ea 100644
--- a/odd-platform-ui/src/components/Management/Integrations/Integration/IntegrationTabs/IntegrationTabs.tsx
+++ b/odd-platform-ui/src/components/Management/Integrations/Integration/IntegrationTabs/IntegrationTabs.tsx
@@ -2,11 +2,9 @@ import React from 'react';
 import { Grid } from '@mui/material';
 import capitalize from 'lodash/capitalize';
 import { type AppTabItem, AppTabs } from 'components/shared/elements';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { integrationsPath } from 'routes';
 import type { Integration } from 'generated-sources';
 import useSetSelectedTab from 'components/shared/elements/AppTabs/useSetSelectedTab';
-import { useLocation, useMatch } from 'react-router-dom';
 
 interface IntegrationTabsProps {
   titles: string[];
@@ -14,21 +12,18 @@ interface IntegrationTabsProps {
 }
 
 const IntegrationTabs: React.FC<IntegrationTabsProps> = ({ titles, integrationId }) => {
-  const { updatePath } = useIsEmbeddedPath();
-  const match = useMatch(useLocation().pathname);
-
   const [selectedTab, setSelectedTab] = React.useState(0);
 
   const tabs = React.useMemo<AppTabItem[]>(
     () =>
       titles.map(title => ({
         name: capitalize(title),
-        link: updatePath(integrationsPath(integrationId, title)),
+        link: integrationsPath(integrationId, title),
       })),
     [titles]
   );
 
-  useSetSelectedTab(tabs, match, setSelectedTab);
+  useSetSelectedTab(tabs, setSelectedTab);
 
   return (
     <Grid sx={{ mt: 1 }}>
diff --git a/odd-platform-ui/src/components/Management/Integrations/IntegrationPreviewList/IntegrationPreviewItem/IntegrationPreviewItem.tsx b/odd-platform-ui/src/components/Management/Integrations/IntegrationPreviewList/IntegrationPreviewItem/IntegrationPreviewItem.tsx
index 2b1c5f333..c940c640e 100644
--- a/odd-platform-ui/src/components/Management/Integrations/IntegrationPreviewList/IntegrationPreviewItem/IntegrationPreviewItem.tsx
+++ b/odd-platform-ui/src/components/Management/Integrations/IntegrationPreviewList/IntegrationPreviewItem/IntegrationPreviewItem.tsx
@@ -7,7 +7,6 @@ import { IntegratedIcon } from 'components/shared/icons';
 import type { DatasourceName } from 'lib/interfaces';
 import { DatasourceLogo } from 'components/shared/elements';
 import { integrationsPath } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import * as S from './IntegrationPreviewItem.styles';
 
 interface IntegrationPreviewItemProps {
@@ -25,10 +24,8 @@ const IntegrationPreviewItem: FC<IntegrationPreviewItemProps> = ({
 }) => {
   const { t } = useTranslation();
   const navigate = useNavigate();
-  const { updatePath } = useIsEmbeddedPath();
-
   const handleOnItemClick = useCallback(() => {
-    navigate(updatePath(integrationsPath(id)));
+    navigate(integrationsPath(id));
   }, [id]);
 
   return (
diff --git a/odd-platform-ui/src/components/Management/ManagementTabs/ManagementTabs.tsx b/odd-platform-ui/src/components/Management/ManagementTabs/ManagementTabs.tsx
index 81512d0cb..5bf2c49f4 100644
--- a/odd-platform-ui/src/components/Management/ManagementTabs/ManagementTabs.tsx
+++ b/odd-platform-ui/src/components/Management/ManagementTabs/ManagementTabs.tsx
@@ -5,16 +5,11 @@ import { type AppTabItem, AppTabs } from 'components/shared/elements';
 import { Permission } from 'generated-sources';
 import { usePermissions } from 'lib/hooks';
 import { managementPath } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
-import { useLocation, useMatch } from 'react-router-dom';
 import useSetSelectedTab from 'components/shared/elements/AppTabs/useSetSelectedTab';
 
 const ManagementTabs: FC = () => {
   const { t } = useTranslation();
   const { hasAccessTo } = usePermissions();
-  const { updatePath } = useIsEmbeddedPath();
-  const match = useMatch(useLocation().pathname);
-
   const [selectedTab, setSelectedTab] = useState(0);
 
   const hideAssociations = useMemo(
@@ -26,37 +21,37 @@ const ManagementTabs: FC = () => {
     () => [
       {
         name: t('Namespaces'),
-        link: updatePath(managementPath('namespaces')),
+        link: managementPath('namespaces'),
       },
       {
         name: t('Datasources'),
-        link: updatePath(managementPath('datasources')),
+        link: managementPath('datasources'),
       },
       {
         name: t('Integrations'),
-        link: updatePath(managementPath('integrations')),
+        link: managementPath('integrations'),
       },
       {
         name: t('Collectors'),
-        link: updatePath(managementPath('collectors')),
+        link: managementPath('collectors'),
       },
-      { name: t('Owners'), link: updatePath(managementPath('owners')) },
-      { name: t('Tags'), link: updatePath(managementPath('tags')) },
+      { name: t('Owners'), link: managementPath('owners') },
+      { name: t('Tags'), link: managementPath('tags') },
       {
         name: t('Associations'),
-        link: updatePath(managementPath('associations')),
+        link: managementPath('associations'),
         hidden: hideAssociations,
       },
-      { name: t('Roles'), link: updatePath(managementPath('roles')) },
+      { name: t('Roles'), link: managementPath('roles') },
       {
         name: t('Policies'),
-        link: updatePath(managementPath('policies')),
+        link: managementPath('policies'),
       },
     ],
     [hideAssociations, t]
   );
 
-  useSetSelectedTab(tabs, match, setSelectedTab);
+  useSetSelectedTab(tabs, setSelectedTab);
 
   return (
     <Grid sx={{ p: 0.5 }}>
diff --git a/odd-platform-ui/src/components/Management/OwnerAssociations/OwnerAssociationsTabs/OwnerAssociationsTabs.tsx b/odd-platform-ui/src/components/Management/OwnerAssociations/OwnerAssociationsTabs/OwnerAssociationsTabs.tsx
index abd751f75..9def36e1d 100644
--- a/odd-platform-ui/src/components/Management/OwnerAssociations/OwnerAssociationsTabs/OwnerAssociationsTabs.tsx
+++ b/odd-platform-ui/src/components/Management/OwnerAssociations/OwnerAssociationsTabs/OwnerAssociationsTabs.tsx
@@ -6,8 +6,6 @@ import { useAppDispatch, useAppSelector } from 'redux/lib/hooks';
 import { fetchOwnerAssociationRequestList } from 'redux/thunks';
 import { getOwnerAssociationRequestsListFetchingStatuses } from 'redux/selectors';
 import { associationsPath } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
-import { useLocation, useMatch } from 'react-router-dom';
 import useSetSelectedTab from 'components/shared/elements/AppTabs/useSetSelectedTab';
 import { queryAtom } from '../OwnerAssociationsStore/OwnerAssociationsAtoms';
 
@@ -26,28 +24,24 @@ const OwnerAssociationsTabs: React.FC<OwnerAssociationsTabsProps> = ({
   const [, setQuery] = useAtom(queryAtom);
 
   const { isLoading } = useAppSelector(getOwnerAssociationRequestsListFetchingStatuses);
-  const { updatePath } = useIsEmbeddedPath();
-  const match = useMatch(useLocation().pathname);
 
   const tabs = React.useMemo<AppTabItem<boolean>[]>(
     () => [
       {
         name: t('New'),
         hint: newRequestsTabHint,
-        link: updatePath(associationsPath('new')),
-        value: true,
+        link: associationsPath('new'),
       },
       {
         name: t('Resolved'),
-        link: updatePath(associationsPath('resolved')),
-        value: false,
+        link: associationsPath('resolved'),
       },
     ],
     [t, newRequestsTabHint]
   );
 
   const [selectedTab, setSelectedTab] = React.useState(-1);
-  useSetSelectedTab(tabs, match, setSelectedTab);
+  useSetSelectedTab(tabs, setSelectedTab);
 
   const onTabChange = React.useCallback(() => {
     setQuery('');
diff --git a/odd-platform-ui/src/components/Management/PolicyList/PolicyDetails/PolicyForm/PolicyForm.tsx b/odd-platform-ui/src/components/Management/PolicyList/PolicyDetails/PolicyForm/PolicyForm.tsx
index b0b418e34..d3fd4a8f8 100644
--- a/odd-platform-ui/src/components/Management/PolicyList/PolicyDetails/PolicyForm/PolicyForm.tsx
+++ b/odd-platform-ui/src/components/Management/PolicyList/PolicyDetails/PolicyForm/PolicyForm.tsx
@@ -10,7 +10,6 @@ import { AppJSONEditor, Button, Input } from 'components/shared/elements';
 import { ClearIcon } from 'components/shared/icons';
 import { Permission, type PolicyDetails, type PolicyFormData } from 'generated-sources';
 import { managementPath } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 
 interface PolicyFormProps {
   schema: Record<string, unknown>;
@@ -23,12 +22,11 @@ const PolicyForm: React.FC<PolicyFormProps> = ({ schema, policyId, name, policy
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
   const navigate = useNavigate();
-  const { updatePath } = useIsEmbeddedPath();
   const { hasAccessTo } = usePermissions();
   const canUpdatePolicy = hasAccessTo(Permission.POLICY_UPDATE);
 
   const isAdministrator = name === 'Administrator';
-  const toPolicies = updatePath(managementPath('policies'));
+  const toPolicies = managementPath('policies');
   const defaultValues = React.useMemo(() => ({ name, policy }), [name, policy]);
 
   const { control, handleSubmit, formState } = useForm<PolicyFormData>({
diff --git a/odd-platform-ui/src/components/Overview/Directory/DirectoryItem/DirectoryItem.tsx b/odd-platform-ui/src/components/Overview/Directory/DirectoryItem/DirectoryItem.tsx
index aa12a0068..c0e78b9e7 100644
--- a/odd-platform-ui/src/components/Overview/Directory/DirectoryItem/DirectoryItem.tsx
+++ b/odd-platform-ui/src/components/Overview/Directory/DirectoryItem/DirectoryItem.tsx
@@ -2,7 +2,6 @@ import React, { type FC } from 'react';
 import type { DataSourceType } from 'generated-sources';
 import { DatasourceLogo, IconicInfoBadge } from 'components/shared/elements';
 import { directoryDataSourcePath } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 
 interface DirectoryItemProps {
   name: DataSourceType['name'];
@@ -10,24 +9,15 @@ interface DirectoryItemProps {
   entitiesCount: DataSourceType['entitiesCount'];
 }
 
-const DirectoryItem: FC<DirectoryItemProps> = ({ name, entitiesCount, prefix }) => {
-  const { updatePath } = useIsEmbeddedPath();
-
-  return (
-    <IconicInfoBadge
-      name={name}
-      count={entitiesCount}
-      to={updatePath(directoryDataSourcePath(prefix))}
-      icon={
-        <DatasourceLogo
-          name={prefix}
-          width={24}
-          padding={0.5}
-          backgroundColor='default'
-        />
-      }
-    />
-  );
-};
+const DirectoryItem: FC<DirectoryItemProps> = ({ name, entitiesCount, prefix }) => (
+  <IconicInfoBadge
+    name={name}
+    count={entitiesCount}
+    to={directoryDataSourcePath(prefix)}
+    icon={
+      <DatasourceLogo name={prefix} width={24} padding={0.5} backgroundColor='default' />
+    }
+  />
+);
 
 export default DirectoryItem;
diff --git a/odd-platform-ui/src/components/Overview/Domains/DomainItem/DomainItem.tsx b/odd-platform-ui/src/components/Overview/Domains/DomainItem/DomainItem.tsx
index a93d96f3b..4c7a22eac 100644
--- a/odd-platform-ui/src/components/Overview/Domains/DomainItem/DomainItem.tsx
+++ b/odd-platform-ui/src/components/Overview/Domains/DomainItem/DomainItem.tsx
@@ -3,7 +3,6 @@ import { Box } from '@mui/material';
 import type { DataEntityDomain } from 'generated-sources';
 import { IconicInfoBadge } from 'components/shared/elements';
 import { FolderIcon } from 'components/shared/icons';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 
 interface DomainItemProps {
@@ -11,28 +10,24 @@ interface DomainItemProps {
   childrenCount: DataEntityDomain['childrenCount'];
 }
 
-const DomainItem: FC<DomainItemProps> = ({ domain, childrenCount }) => {
-  const { updatePath } = useIsEmbeddedPath();
-
-  return (
-    <IconicInfoBadge
-      name={domain.internalName ?? domain.externalName ?? ''}
-      count={childrenCount}
-      to={updatePath(dataEntityDetailsPath(domain.id))}
-      icon={
-        <Box
-          sx={{
-            backgroundColor: 'white',
-            padding: 0.5,
-            borderRadius: 2,
-            display: 'flex',
-          }}
-        >
-          <FolderIcon width={24} height={24} />
-        </Box>
-      }
-    />
-  );
-};
+const DomainItem: FC<DomainItemProps> = ({ domain, childrenCount }) => (
+  <IconicInfoBadge
+    name={domain.internalName ?? domain.externalName ?? ''}
+    count={childrenCount}
+    to={dataEntityDetailsPath(domain.id)}
+    icon={
+      <Box
+        sx={{
+          backgroundColor: 'white',
+          padding: 0.5,
+          borderRadius: 2,
+          display: 'flex',
+        }}
+      >
+        <FolderIcon width={24} height={24} />
+      </Box>
+    }
+  />
+);
 
 export default DomainItem;
diff --git a/odd-platform-ui/src/components/Overview/OwnerAssociation/OwnerEntitiesList/DataEntityList/DataEntityList.tsx b/odd-platform-ui/src/components/Overview/OwnerAssociation/OwnerEntitiesList/DataEntityList/DataEntityList.tsx
index a6a01e169..c29587030 100644
--- a/odd-platform-ui/src/components/Overview/OwnerAssociation/OwnerEntitiesList/DataEntityList/DataEntityList.tsx
+++ b/odd-platform-ui/src/components/Overview/OwnerAssociation/OwnerEntitiesList/DataEntityList/DataEntityList.tsx
@@ -7,7 +7,6 @@ import {
   MetadataStale,
 } from 'components/shared/elements';
 import { AlertIcon } from 'components/shared/icons';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 import * as S from './DataEntityListStyles';
 
@@ -25,10 +24,8 @@ const DataEntityList: React.FC<OverviewDataEntityProps> = ({
   entityListIcon,
   isFetching,
   isNotFetched,
-}) => {
-  const { updatePath } = useIsEmbeddedPath();
-
-  return isNotFetched ? null : (
+}) =>
+  isNotFetched ? null : (
     <S.DataEntityListContainer item lg={3}>
       <S.SectionCaption variant='h4' sx={{ mb: 2 }}>
         {entityListIcon}
@@ -38,10 +35,7 @@ const DataEntityList: React.FC<OverviewDataEntityProps> = ({
       <S.ListLinksContainer $isListEmpty={!dataEntitiesList.length}>
         {dataEntitiesList.map(item => (
           <li key={item.id}>
-            <S.ListLink
-              to={updatePath(dataEntityDetailsPath(item.id))}
-              $hasAlerts={item.hasAlerts}
-            >
+            <S.ListLink to={dataEntityDetailsPath(item.id)} $hasAlerts={item.hasAlerts}>
               <S.ListLinkInnerItem $bounded>
                 {item.hasAlerts ? <AlertIcon sx={{ mr: 0.5 }} /> : null}
                 <MetadataStale isStale={item.isStale} />
@@ -74,6 +68,5 @@ const DataEntityList: React.FC<OverviewDataEntityProps> = ({
       </S.ListLinksContainer>
     </S.DataEntityListContainer>
   );
-};
 
 export default DataEntityList;
diff --git a/odd-platform-ui/src/components/Search/Results/ResultItem/ResultItem.tsx b/odd-platform-ui/src/components/Search/Results/ResultItem/ResultItem.tsx
index c62491402..995551a5e 100644
--- a/odd-platform-ui/src/components/Search/Results/ResultItem/ResultItem.tsx
+++ b/odd-platform-ui/src/components/Search/Results/ResultItem/ResultItem.tsx
@@ -19,7 +19,6 @@ import type { DataEntity } from 'redux/interfaces';
 import { useAppSelector } from 'redux/lib/hooks';
 import { getSearchQuery } from 'redux/selectors';
 import { dataEntityDetailsPath } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { type GridSizesByBreakpoints, SearchCol } from '../Results.styles';
 import * as S from './ResultItemStyles';
 import SearchHighlights from './SearchHighlights/SearchHighlights';
@@ -39,9 +38,8 @@ const ResultItem: React.FC<ResultItemProps> = ({
 }) => {
   const { t } = useTranslation();
   const navigate = useNavigate();
-  const { updatePath } = useIsEmbeddedPath();
   const { dataEntityFormattedDateTime, formatDistanceToNowStrict } = useAppDateTime();
-  const detailsLink = updatePath(dataEntityDetailsPath(searchResult.id));
+  const detailsLink = dataEntityDetailsPath(searchResult.id);
 
   const searchQuery = useAppSelector(getSearchQuery);
 
diff --git a/odd-platform-ui/src/components/Search/Search.tsx b/odd-platform-ui/src/components/Search/Search.tsx
index b1d7588da..af0a14389 100644
--- a/odd-platform-ui/src/components/Search/Search.tsx
+++ b/odd-platform-ui/src/components/Search/Search.tsx
@@ -4,7 +4,7 @@ import mapValues from 'lodash/mapValues';
 import values from 'lodash/values';
 import { useTranslation } from 'react-i18next';
 import { MainSearch, PageWithLeftSidebar } from 'components/shared/elements';
-import { useAppParams, useCreateSearch } from 'lib/hooks';
+import { useCreateSearch } from 'lib/hooks';
 import { getDataEntitiesSearch, updateDataEntitiesSearch } from 'redux/thunks';
 import {
   getSearchCreatingStatuses,
@@ -17,13 +17,14 @@ import {
 import { useAppDispatch, useAppSelector } from 'redux/lib/hooks';
 import { Permission } from 'generated-sources';
 import { WithPermissionsProvider } from 'components/shared/contexts';
+import { useSearchRouteParams } from 'routes';
 import Filters from './Filters/Filters';
 import Results from './Results/Results';
 
 const Search: React.FC = () => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
-  const { searchId: routerSearchId } = useAppParams();
+  const { searchId: routerSearchId } = useSearchRouteParams();
   const createSearch = useCreateSearch();
 
   const searchId = useAppSelector(getSearchId);
diff --git a/odd-platform-ui/src/components/Terms/TermDetails/Overview/Overview.tsx b/odd-platform-ui/src/components/Terms/TermDetails/Overview/Overview.tsx
index 50ac5a7f3..736fd9592 100644
--- a/odd-platform-ui/src/components/Terms/TermDetails/Overview/Overview.tsx
+++ b/odd-platform-ui/src/components/Terms/TermDetails/Overview/Overview.tsx
@@ -2,7 +2,6 @@ import { Grid, Typography } from '@mui/material';
 import React, { type FC } from 'react';
 import { Markdown, SkeletonWrapper } from 'components/shared/elements';
 import { useAppSelector } from 'redux/lib/hooks';
-import { useAppParams } from 'lib/hooks';
 import {
   getResourcePermissions,
   getTermDetails,
@@ -10,13 +9,14 @@ import {
 } from 'redux/selectors';
 import { Permission, PermissionResourceType } from 'generated-sources';
 import { WithPermissionsProvider } from 'components/shared/contexts';
+import { useTermsRouteParams } from 'routes';
 import OverviewGeneral from './OverviewGeneral/OverviewGeneral';
 import OverviewSkeleton from './OverviewSkeleton/OverviewSkeleton';
 import OverviewTags from './OverviewTags/OverviewTags';
 import * as S from './OverviewStyles';
 
 const Overview: FC = () => {
-  const { termId } = useAppParams();
+  const { termId } = useTermsRouteParams();
 
   const termDetails = useAppSelector(getTermDetails(termId));
   const termPermissions = useAppSelector(
diff --git a/odd-platform-ui/src/components/Terms/TermDetails/Overview/OverviewGeneral/OverviewGeneral.tsx b/odd-platform-ui/src/components/Terms/TermDetails/Overview/OverviewGeneral/OverviewGeneral.tsx
index fdac968f1..b261a5a30 100644
--- a/odd-platform-ui/src/components/Terms/TermDetails/Overview/OverviewGeneral/OverviewGeneral.tsx
+++ b/odd-platform-ui/src/components/Terms/TermDetails/Overview/OverviewGeneral/OverviewGeneral.tsx
@@ -10,18 +10,19 @@ import {
 import { AddIcon, DeleteIcon, EditIcon } from 'components/shared/icons';
 import { deleteTermOwnership } from 'redux/thunks';
 import { useAppDispatch, useAppSelector } from 'redux/lib/hooks';
-import { useAppDateTime, useAppParams } from 'lib/hooks';
+import { useAppDateTime } from 'lib/hooks';
 import { getTermDetails } from 'redux/selectors/terms.selectors';
 import { getTermOwnership } from 'redux/selectors';
 import { WithPermissions } from 'components/shared/contexts';
 import { Permission } from 'generated-sources';
+import { useTermsRouteParams } from 'routes';
 import OwnershipForm from '../../Ownership/OwnershipForm';
 import { OwnerActionBtns, OwnerItem } from './OverviewGeneralStyles';
 
 const OverviewGeneral: React.FC = () => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
-  const { termId } = useAppParams();
+  const { termId } = useTermsRouteParams();
   const { termFormattedDateTime } = useAppDateTime();
 
   const termDetails = useAppSelector(getTermDetails(termId));
diff --git a/odd-platform-ui/src/components/Terms/TermDetails/Overview/OverviewTags/TagsEditForm/TagsEditForm.tsx b/odd-platform-ui/src/components/Terms/TermDetails/Overview/OverviewTags/TagsEditForm/TagsEditForm.tsx
index cb9d9044b..d465442ed 100644
--- a/odd-platform-ui/src/components/Terms/TermDetails/Overview/OverviewTags/TagsEditForm/TagsEditForm.tsx
+++ b/odd-platform-ui/src/components/Terms/TermDetails/Overview/OverviewTags/TagsEditForm/TagsEditForm.tsx
@@ -21,7 +21,7 @@ import { ClearIcon } from 'components/shared/icons';
 import { useAppDispatch, useAppSelector } from 'redux/lib/hooks';
 import { fetchTagsList as searchTags, updateTermDetailsTags } from 'redux/thunks';
 import { getTermDetailsTags, getTermDetailsTagsUpdatingStatuses } from 'redux/selectors';
-import { useAppParams } from 'lib/hooks';
+import { useTermsRouteParams } from 'routes';
 import { OptionsContainer } from './TagsEditFormStyles';
 
 interface TagsEditProps {
@@ -31,7 +31,7 @@ interface TagsEditProps {
 const TagsEditForm: React.FC<TagsEditProps> = ({ btnEditEl }) => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
-  const { termId } = useAppParams();
+  const { termId } = useTermsRouteParams();
 
   const termDetailsTags = useAppSelector(state => getTermDetailsTags(state, termId));
 
diff --git a/odd-platform-ui/src/components/Terms/TermDetails/Ownership/OwnershipForm.tsx b/odd-platform-ui/src/components/Terms/TermDetails/Ownership/OwnershipForm.tsx
index 9fe5463e1..850694852 100644
--- a/odd-platform-ui/src/components/Terms/TermDetails/Ownership/OwnershipForm.tsx
+++ b/odd-platform-ui/src/components/Terms/TermDetails/Ownership/OwnershipForm.tsx
@@ -11,13 +11,13 @@ import {
   OwnerTitleAutocomplete,
 } from 'components/shared/elements';
 import { useAppDispatch, useAppSelector } from 'redux/lib/hooks';
-import { useAppParams } from 'lib/hooks';
 import { createTermOwnership, updateTermOwnership } from 'redux/thunks';
 import {
   getTermDetailsOwnerCreatingStatuses,
   getTermDetailsOwnerUpdatingStatuses,
 } from 'redux/selectors';
 import { WithPermissions } from 'components/shared/contexts';
+import { useTermsRouteParams } from 'routes';
 
 interface OwnershipFormProps {
   termDetailsOwnership?: Ownership;
@@ -30,7 +30,7 @@ const OwnershipForm: React.FC<OwnershipFormProps> = ({
 }) => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
-  const { termId } = useAppParams();
+  const { termId } = useTermsRouteParams();
 
   const { isLoading: isOwnerUpdating, isLoaded: isOwnerUpdated } = useAppSelector(
     getTermDetailsOwnerUpdatingStatuses
diff --git a/odd-platform-ui/src/components/Terms/TermDetails/TermDetails.tsx b/odd-platform-ui/src/components/Terms/TermDetails/TermDetails.tsx
index d36b96561..1c9909389 100644
--- a/odd-platform-ui/src/components/Terms/TermDetails/TermDetails.tsx
+++ b/odd-platform-ui/src/components/Terms/TermDetails/TermDetails.tsx
@@ -1,7 +1,6 @@
 import React, { type FC, useCallback, useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { AppErrorPage, SkeletonWrapper } from 'components/shared/elements';
-import { useAppParams, useAppPaths } from 'lib/hooks';
 import {
   getResourcePermissions,
   getTermDetails,
@@ -13,6 +12,7 @@ import { deleteTerm, fetchResourcePermissions, fetchTermDetails } from 'redux/th
 import { useAppDispatch, useAppSelector } from 'redux/lib/hooks';
 import { Permission, PermissionResourceType } from 'generated-sources';
 import { WithPermissionsProvider } from 'components/shared/contexts';
+import { termsSearchPath, useTermsRouteParams } from 'routes';
 import TermDetailsHeader from './TermDetailsHeader/TermDetailsHeader';
 import TermDetailsSkeleton from './TermDetailsSkeleton/TermDetailsSkeleton';
 import TermDetailsTabs from './TermDetailsTabs/TermDetailsTabs';
@@ -22,8 +22,7 @@ import TermDetailsRoutes from './TermDetailsRoutes/TermDetailsRoutes';
 const TermDetailsView: FC = () => {
   const navigate = useNavigate();
   const dispatch = useAppDispatch();
-  const { termId } = useAppParams();
-  const { termSearchPath } = useAppPaths();
+  const { termId } = useTermsRouteParams();
 
   const { isLoading: isTermDetailsFetching, isNotLoaded: isTermDetailsNotFetched } =
     useAppSelector(getTermDetailsFetchingStatuses);
@@ -48,7 +47,7 @@ const TermDetailsView: FC = () => {
   const handleTermDelete = useCallback(
     (id: number) => () =>
       dispatch(deleteTerm({ termId: id })).then(() =>
-        navigate(termSearchPath(termSearchId))
+        navigate(termsSearchPath(termSearchId))
       ),
     [termSearchId]
   );
diff --git a/odd-platform-ui/src/components/Terms/TermDetails/TermDetailsRoutes/TermDetailsRoutes.tsx b/odd-platform-ui/src/components/Terms/TermDetails/TermDetailsRoutes/TermDetailsRoutes.tsx
index efc9053ec..a4ce779a0 100644
--- a/odd-platform-ui/src/components/Terms/TermDetails/TermDetailsRoutes/TermDetailsRoutes.tsx
+++ b/odd-platform-ui/src/components/Terms/TermDetails/TermDetailsRoutes/TermDetailsRoutes.tsx
@@ -1,6 +1,5 @@
 import React, { lazy } from 'react';
 import { Route, Routes, Navigate } from 'react-router-dom';
-import { useAppPaths } from 'lib/hooks';
 import { AppSuspenseWrapper } from 'components/shared/elements';
 
 const Overview = lazy(() => import('../Overview/Overview'));
@@ -11,21 +10,15 @@ const LinkedColumnsList = lazy(
   () => import('../TermLinkedColumnsList/LinkedColumnsList')
 );
 
-const TermDetailsRoutes: React.FC = () => {
-  const { TermsRoutes } = useAppPaths();
-
-  return (
-    <AppSuspenseWrapper>
-      <Routes>
-        <Route path={TermsRoutes.termsViewTypeParam}>
-          <Route path='' element={<Navigate to={TermsRoutes.overview} />} />
-          <Route path={TermsRoutes.overview} element={<Overview />} />
-          <Route path={TermsRoutes.linkedEntities} element={<LinkedEntitiesList />} />
-          <Route path={TermsRoutes.linkedColumns} element={<LinkedColumnsList />} />
-        </Route>
-      </Routes>
-    </AppSuspenseWrapper>
-  );
-};
+const TermDetailsRoutes: React.FC = () => (
+  <AppSuspenseWrapper>
+    <Routes>
+      <Route path='overview' element={<Overview />} />
+      <Route path='linked-entities' element={<LinkedEntitiesList />} />
+      <Route path='linked-columns' element={<LinkedColumnsList />} />
+      <Route path='' element={<Navigate to='overview' />} />
+    </Routes>
+  </AppSuspenseWrapper>
+);
 
 export default TermDetailsRoutes;
diff --git a/odd-platform-ui/src/components/Terms/TermDetails/TermDetailsTabs/TermDetailsTabs.tsx b/odd-platform-ui/src/components/Terms/TermDetails/TermDetailsTabs/TermDetailsTabs.tsx
index 1fd6f8258..1d80a4fcb 100644
--- a/odd-platform-ui/src/components/Terms/TermDetails/TermDetailsTabs/TermDetailsTabs.tsx
+++ b/odd-platform-ui/src/components/Terms/TermDetails/TermDetailsTabs/TermDetailsTabs.tsx
@@ -1,42 +1,33 @@
-import React, { useEffect, useMemo } from 'react';
+import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { type AppTabItem, AppTabs } from 'components/shared/elements';
-import { useAppParams, useAppPaths } from 'lib/hooks';
 import { getTermDetails } from 'redux/selectors';
 import { useAppSelector } from 'redux/lib/hooks';
+import { termDetailsPath, useTermsRouteParams } from 'routes';
+import useSetSelectedTab from 'components/shared/elements/AppTabs/useSetSelectedTab';
 
 const TermDetailsTabs: React.FC = () => {
   const { t } = useTranslation();
-  const { termId, termsViewType } = useAppParams();
-  const {
-    termDetailsOverviewPath,
-    termDetailsLinkedEntitiesPath,
-    termDetailsLinkedColumnsPath,
-    TermsRoutes,
-  } = useAppPaths();
-
+  const { termId } = useTermsRouteParams();
   const termDetails = useAppSelector(getTermDetails(termId));
 
   const tabs = useMemo<AppTabItem[]>(
     () => [
       {
         name: t('Overview'),
-        link: termDetailsOverviewPath(termId),
-        value: TermsRoutes.overview,
+        link: termDetailsPath(termId),
       },
       {
         name: t('Linked entities'),
-        link: termDetailsLinkedEntitiesPath(termId),
+        link: termDetailsPath(termId, 'linked-entities'),
         hint: termDetails?.entitiesUsingCount,
         hidden: !termDetails?.entitiesUsingCount,
-        value: TermsRoutes.linkedEntities,
       },
       {
         name: t('Linked columns'),
-        link: termDetailsLinkedColumnsPath(termId),
+        link: termDetailsPath(termId, 'linked-columns'),
         hint: termDetails?.columnsUsingCount,
         hidden: !termDetails?.columnsUsingCount,
-        value: TermsRoutes.linkedColumns,
       },
     ],
     [termId, termDetails?.entitiesUsingCount, termDetails?.columnsUsingCount, t]
@@ -44,11 +35,7 @@ const TermDetailsTabs: React.FC = () => {
 
   const [selectedTab, setSelectedTab] = React.useState(-1);
 
-  useEffect(() => {
-    setSelectedTab(
-      termsViewType ? tabs.findIndex(tab => tab.value === termsViewType) : 0
-    );
-  }, [tabs, termsViewType]);
+  useSetSelectedTab(tabs, setSelectedTab);
 
   return (
     <>
diff --git a/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedColumnsList/LinkedColumn/LinkedColumn.tsx b/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedColumnsList/LinkedColumn/LinkedColumn.tsx
index 2eca50a17..553385a04 100644
--- a/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedColumnsList/LinkedColumn/LinkedColumn.tsx
+++ b/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedColumnsList/LinkedColumn/LinkedColumn.tsx
@@ -6,7 +6,6 @@ import { AppTooltip } from 'components/shared/elements';
 import { StrokedInfoIcon } from 'components/shared/icons';
 import TypeFieldLabel from 'components/DataEntityDetails/DatasetStructure/shared/TypeFieldLabel/TypeFieldLabel';
 import { dataEntityDetailsPath } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { Container, ColumnLink, NameContainer } from './LinkedColumnStyles';
 import { TermLinkedColumnsColContainer } from '../LinkedColumnsListStyles';
 
@@ -15,10 +14,9 @@ interface LinkedColumnProps {
 }
 
 const LinkedColumn: React.FC<LinkedColumnProps> = ({ linkedColumn }) => {
-  const { updatePath } = useIsEmbeddedPath();
   const { t } = useTranslation();
 
-  const detailsLink = updatePath(dataEntityDetailsPath(linkedColumn.dataEntityId!));
+  const detailsLink = dataEntityDetailsPath(linkedColumn.dataEntityId!);
 
   return (
     <ColumnLink to={detailsLink}>
diff --git a/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedColumnsList/LinkedColumnsList.tsx b/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedColumnsList/LinkedColumnsList.tsx
index 4cec87d22..a6c6b5045 100644
--- a/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedColumnsList/LinkedColumnsList.tsx
+++ b/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedColumnsList/LinkedColumnsList.tsx
@@ -3,7 +3,8 @@ import { Grid, Typography } from '@mui/material';
 import InfiniteScroll from 'react-infinite-scroll-component';
 import { useTranslation } from 'react-i18next';
 import { EmptyContentPlaceholder, Input } from 'components/shared/elements';
-import { useAppParams, useGetTermLinkedColumns } from 'lib/hooks';
+import { useGetTermLinkedColumns } from 'lib/hooks';
+import { useTermsRouteParams } from 'routes';
 import LinkedColumn from './LinkedColumn/LinkedColumn';
 import {
   TermLinkedColumnsColContainer,
@@ -16,7 +17,7 @@ const size = 50;
 
 const LinkedColumnsList: FC = () => {
   const { t } = useTranslation();
-  const { termId } = useAppParams();
+  const { termId } = useTermsRouteParams();
   const [query, setQuery] = useState('');
   const {
     data: { items, pageInfo },
diff --git a/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedEntitiesList/LinkedEntitiesList.tsx b/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedEntitiesList/LinkedEntitiesList.tsx
index 431393197..11cc5a312 100644
--- a/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedEntitiesList/LinkedEntitiesList.tsx
+++ b/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedEntitiesList/LinkedEntitiesList.tsx
@@ -12,7 +12,6 @@ import {
 } from 'components/shared/elements';
 import { stringFormatted } from 'lib/helpers';
 import { useAppDispatch, useAppSelector } from 'redux/lib/hooks';
-import { useAppParams } from 'lib/hooks';
 import {
   getDataEntityClassesList,
   getTermLinkedList,
@@ -21,6 +20,7 @@ import {
   getTermLinkedListPageInfo,
 } from 'redux/selectors';
 import { fetchTermLinkedList } from 'redux/thunks';
+import { useTermsRouteParams } from 'routes';
 import LinkedEntity from './LinkedEntity/LinkedEntity';
 import {
   TermLinkedEntitiesColContainer,
@@ -32,7 +32,7 @@ import LinkedEntitiesListSkeleton from './LinkedEntitiesListSkeleton/LinkedEntit
 const LinkedEntitiesList: FC = () => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
-  const { termId } = useAppParams();
+  const { termId } = useTermsRouteParams();
 
   const termLinkedList = useAppSelector(getTermLinkedList(termId));
 
diff --git a/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedEntitiesList/LinkedEntity/LinkedEntity.tsx b/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedEntitiesList/LinkedEntity/LinkedEntity.tsx
index 582f208e2..c4397657e 100644
--- a/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedEntitiesList/LinkedEntity/LinkedEntity.tsx
+++ b/odd-platform-ui/src/components/Terms/TermDetails/TermLinkedEntitiesList/LinkedEntity/LinkedEntity.tsx
@@ -4,7 +4,6 @@ import type { DataEntity } from 'generated-sources';
 import { EntityClassItem, MetadataStale } from 'components/shared/elements';
 import { useAppDateTime } from 'lib/hooks';
 import { dataEntityDetailsPath } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { TermLinkedEntitiesColContainer } from '../LinkedEntitiesListStyles';
 import { Container, EntityLink, NameContainer } from './LinkedEntityStyles';
 
@@ -13,10 +12,9 @@ interface LinkedEntityProps {
 }
 
 const LinkedEntity: React.FC<LinkedEntityProps> = ({ linkedEntity }) => {
-  const { updatePath } = useIsEmbeddedPath();
   const { linkedEntityFormattedDateTime, formatDistanceToNowStrict } = useAppDateTime();
 
-  const detailsLink = updatePath(dataEntityDetailsPath(linkedEntity.id));
+  const detailsLink = dataEntityDetailsPath(linkedEntity.id);
 
   return (
     <EntityLink to={detailsLink}>
diff --git a/odd-platform-ui/src/components/Terms/TermSearch/TermForm/TermsForm.tsx b/odd-platform-ui/src/components/Terms/TermSearch/TermForm/TermsForm.tsx
index 49a0ea0fa..9860a4743 100644
--- a/odd-platform-ui/src/components/Terms/TermSearch/TermForm/TermsForm.tsx
+++ b/odd-platform-ui/src/components/Terms/TermSearch/TermForm/TermsForm.tsx
@@ -18,7 +18,7 @@ import {
   getTermDetails,
   getTermUpdatingStatuses,
 } from 'redux/selectors';
-import { useAppParams, useAppPaths } from 'lib/hooks';
+import { termDetailsPath, useTermsRouteParams } from 'routes';
 
 interface TermsFormDialogProps {
   btnCreateEl: JSX.Element;
@@ -28,8 +28,7 @@ const TermsForm: FC<TermsFormDialogProps> = ({ btnCreateEl }) => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
   const navigate = useNavigate();
-  const { termId } = useAppParams();
-  const { termDetailsOverviewPath } = useAppPaths();
+  const { termId } = useTermsRouteParams();
 
   const term = useAppSelector(getTermDetails(termId));
   const { isLoading: isTermCreating, isLoaded: isTermCreated } = useAppSelector(
@@ -71,7 +70,7 @@ const TermsForm: FC<TermsFormDialogProps> = ({ btnCreateEl }) => {
       .unwrap()
       .then((response: TermDetails) => {
         clearState();
-        navigate(termDetailsOverviewPath(response.id));
+        navigate(termDetailsPath(response.id));
       });
   };
 
diff --git a/odd-platform-ui/src/components/Terms/TermSearch/TermSearch.tsx b/odd-platform-ui/src/components/Terms/TermSearch/TermSearch.tsx
index ca770934b..d0451de3d 100644
--- a/odd-platform-ui/src/components/Terms/TermSearch/TermSearch.tsx
+++ b/odd-platform-ui/src/components/Terms/TermSearch/TermSearch.tsx
@@ -4,7 +4,6 @@ import mapValues from 'lodash/mapValues';
 import values from 'lodash/values';
 import { useNavigate } from 'react-router-dom';
 import { PageWithLeftSidebar } from 'components/shared/elements';
-import { useAppParams } from 'lib/hooks';
 import {
   getTermSearchCreateStatuses,
   getTermSearchFacetsParams,
@@ -16,6 +15,7 @@ import { createTermSearch, getTermsSearch, updateTermSearch } from 'redux/thunks
 import { useAppDispatch, useAppSelector } from 'redux/lib/hooks';
 import { Permission } from 'generated-sources';
 import { WithPermissionsProvider } from 'components/shared/contexts';
+import { useTermsRouteParams } from 'routes';
 import TermSearchFilters from './TermSearchFilters/TermSearchFilters';
 import TermsSearchResults from './TermSearchResults/TermSearchResults';
 import TermSearchHeader from './TermSearchHeader/TermSearchHeader';
@@ -23,7 +23,7 @@ import TermSearchHeader from './TermSearchHeader/TermSearchHeader';
 const TermSearch: React.FC = () => {
   const navigate = useNavigate();
   const dispatch = useAppDispatch();
-  const { termSearchId: routerTermSearchId } = useAppParams();
+  const { termSearchId: routerTermSearchId } = useTermsRouteParams();
 
   const termSearchId = useAppSelector(getTermSearchId);
   const termSearchQuery = useAppSelector(getTermSearchQuery);
diff --git a/odd-platform-ui/src/components/Terms/TermSearch/TermSearchResults/TermSearchResultItem/TermSearchResultItem.tsx b/odd-platform-ui/src/components/Terms/TermSearch/TermSearchResults/TermSearchResultItem/TermSearchResultItem.tsx
index 90eea84df..e01364c11 100644
--- a/odd-platform-ui/src/components/Terms/TermSearch/TermSearchResults/TermSearchResultItem/TermSearchResultItem.tsx
+++ b/odd-platform-ui/src/components/Terms/TermSearch/TermSearchResults/TermSearchResultItem/TermSearchResultItem.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import { Grid, Typography } from '@mui/material';
 import { type Term } from 'generated-sources';
-import { useAppDateTime, useAppPaths } from 'lib/hooks';
+import { useAppDateTime } from 'lib/hooks';
+import { termDetailsPath } from 'routes';
 import {
   TermSearchNameContainer,
   TermSearchResultsColContainer,
@@ -13,10 +14,9 @@ interface TermsResultItemProps {
 }
 
 const TermSearchResultItem: React.FC<TermsResultItemProps> = ({ termSearchResult }) => {
-  const { termDetailsOverviewPath } = useAppPaths();
   const { termFormattedDateTime, formatDistanceToNowStrict } = useAppDateTime();
 
-  const termDetailsOverviewLink = termDetailsOverviewPath(termSearchResult.id);
+  const termDetailsOverviewLink = termDetailsPath(termSearchResult.id);
   const usingCount =
     (termSearchResult.entitiesUsingCount ?? 0) +
     (termSearchResult.columnsUsingCount ?? 0);
diff --git a/odd-platform-ui/src/components/shared/elements/Activity/ActivityFields/CustomGroupActivityField/CustomGroupActivityField.tsx b/odd-platform-ui/src/components/shared/elements/Activity/ActivityFields/CustomGroupActivityField/CustomGroupActivityField.tsx
index efc9f1dcc..c8da65701 100644
--- a/odd-platform-ui/src/components/shared/elements/Activity/ActivityFields/CustomGroupActivityField/CustomGroupActivityField.tsx
+++ b/odd-platform-ui/src/components/shared/elements/Activity/ActivityFields/CustomGroupActivityField/CustomGroupActivityField.tsx
@@ -8,8 +8,7 @@ import Button from 'components/shared/elements/Button/Button';
 import ActivityFieldState from 'components/shared/elements/Activity/ActivityFields/ActivityFieldState/ActivityFieldState';
 import ActivityFieldHeader from 'components/shared/elements/Activity/ActivityFields/ActivityFieldHeader/ActivityFieldHeader';
 import * as S from 'components/shared/elements/Activity/ActivityFields/ArrayActivityField/ArrayActivityFieldStyles';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
-import { dataEntityDetailsPath } from '../../../../../../routes';
+import { dataEntityDetailsPath } from 'routes';
 
 interface GroupFieldData {
   id?: number;
@@ -36,7 +35,6 @@ const CustomGroupActivityField: React.FC<CustomGroupActivityFieldProps> = ({
   hideAllDetails,
 }) => {
   const { t } = useTranslation();
-  const { updatePath } = useIsEmbeddedPath();
 
   const [isDetailsOpen, setIsDetailsOpen] = React.useState(false);
 
@@ -140,7 +138,7 @@ const CustomGroupActivityField: React.FC<CustomGroupActivityFieldProps> = ({
             <S.ArrayItemWrapper key={item.id} $typeOfChange={item.typeOfChange}>
               <Button
                 text={item.name}
-                to={updatePath(dataEntityDetailsPath(item.id))}
+                to={dataEntityDetailsPath(item.id)}
                 buttonType='tertiary-m'
                 sx={{
                   mb: item.typeOfChange ? 0 : 0.5,
diff --git a/odd-platform-ui/src/components/shared/elements/AppTabs/useSetSelectedTab.ts b/odd-platform-ui/src/components/shared/elements/AppTabs/useSetSelectedTab.ts
index 8de0b9b09..a50fb0278 100644
--- a/odd-platform-ui/src/components/shared/elements/AppTabs/useSetSelectedTab.ts
+++ b/odd-platform-ui/src/components/shared/elements/AppTabs/useSetSelectedTab.ts
@@ -1,22 +1,20 @@
 import type React from 'react';
 import { useEffect } from 'react';
-import type { PathMatch } from 'react-router-dom';
+import { useLocation, useResolvedPath } from 'react-router-dom';
 import type { AppTabItem } from './AppTabs';
 
 const useSetSelectedTab = (
   tabs: AppTabItem[],
-  match: PathMatch | null,
   setSelectedTab: React.Dispatch<React.SetStateAction<number>>
 ) => {
+  const resolvedPath = useResolvedPath(useLocation().pathname);
   useEffect(() => {
     const foundIndex = tabs.findIndex(({ link }) => {
-      const pathname = match?.pathname;
-      return link && pathname
-        ? pathname.includes(link) || link.includes(pathname)
-        : false;
+      const { pathname } = resolvedPath;
+      return link ? pathname.includes(link) || link.includes(pathname) : false;
     });
-    setSelectedTab(foundIndex === -1 ? 0 : foundIndex);
-  }, [tabs, match]);
+    setSelectedTab(foundIndex);
+  }, [tabs, resolvedPath]);
 };
 
 export default useSetSelectedTab;
diff --git a/odd-platform-ui/src/components/shared/elements/AppToolbar/AppToolbar.tsx b/odd-platform-ui/src/components/shared/elements/AppToolbar/AppToolbar.tsx
index 1eb4a75b5..1e065a218 100644
--- a/odd-platform-ui/src/components/shared/elements/AppToolbar/AppToolbar.tsx
+++ b/odd-platform-ui/src/components/shared/elements/AppToolbar/AppToolbar.tsx
@@ -6,7 +6,6 @@ import { useAppSelector } from 'redux/lib/hooks';
 import { DropdownIcon } from 'components/shared/icons';
 import AppMenu from 'components/shared/elements/AppMenu/AppMenu';
 import AppMenuItem from 'components/shared/elements/AppMenuItem/AppMenuItem';
-import { useAppPaths } from 'lib/hooks';
 import ToolbarTabs from 'components/shared/elements/AppToolbar/ToolbarTabs/ToolbarTabs';
 import AppInfoMenu from 'components/shared/elements/AppToolbar/AppInfoMenu/AppInfoMenu';
 import Button from 'components/shared/elements/Button/Button';
@@ -17,7 +16,6 @@ import ChevronIcon from 'components/shared/icons/ChevronIcon';
 import type { Lang } from 'lib/interfaces';
 
 const AppToolbar: FC = () => {
-  const { basePath } = useAppPaths();
   const { i18n, t } = useTranslation();
   const identity = useAppSelector(getIdentity);
   const owner = useAppSelector(getOwnership);
@@ -54,7 +52,7 @@ const AppToolbar: FC = () => {
       <S.Container disableGutters>
         <S.ContentContainer container>
           <S.LogoContainer item xs={3}>
-            <S.Title to={basePath}>
+            <S.Title to='/'>
               <S.Logo />
               <Typography variant='h4' noWrap>
                 Platform
diff --git a/odd-platform-ui/src/components/shared/elements/AppToolbar/ToolbarTabs/ToolbarTabs.tsx b/odd-platform-ui/src/components/shared/elements/AppToolbar/ToolbarTabs/ToolbarTabs.tsx
index 37d8f69a9..5b3cc035e 100644
--- a/odd-platform-ui/src/components/shared/elements/AppToolbar/ToolbarTabs/ToolbarTabs.tsx
+++ b/odd-platform-ui/src/components/shared/elements/AppToolbar/ToolbarTabs/ToolbarTabs.tsx
@@ -1,7 +1,7 @@
-import React, { type FC, useCallback, useEffect, useMemo, useState } from 'react';
-import { useLocation, useNavigate } from 'react-router-dom';
+import React, { type FC, useCallback, useMemo, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { useAppPaths, useCreateSearch, useQueryParams } from 'lib/hooks';
+import { useCreateSearch, useQueryParams } from 'lib/hooks';
 import {
   type ActivityQuery,
   defaultActivityQuery,
@@ -10,88 +10,68 @@ import { useAppDispatch } from 'redux/lib/hooks';
 import { createTermSearch } from 'redux/thunks';
 import AppTabs, { type AppTabItem } from 'components/shared/elements/AppTabs/AppTabs';
 import {
+  activityPath,
   alertsPath,
   dataQualityPath,
   directoryPath,
   managementPath,
   queryExamplesPath,
+  searchPath,
+  termsSearchPath,
 } from 'routes';
+import useSetSelectedTab from '../../AppTabs/useSetSelectedTab';
 
 const ToolbarTabs: FC = () => {
   const dispatch = useAppDispatch();
   const { t } = useTranslation();
-  const location = useLocation();
   const navigate = useNavigate();
   const createSearch = useCreateSearch();
   const { defaultQueryString: activityQueryString } =
     useQueryParams<ActivityQuery>(defaultActivityQuery);
 
-  const { activityPath, termSearchPath, TermsRoutes, SearchRoutes, updatePath } =
-    useAppPaths();
-
   const tabs = useMemo<AppTabItem[]>(
     () => [
       {
         name: t('Catalog'),
-        link: updatePath(SearchRoutes.search),
-        value: SearchRoutes.search,
+        link: searchPath(),
       },
       {
         name: t('Directory'),
-        link: updatePath(directoryPath()),
-        value: 'directory',
+        link: directoryPath(),
       },
       {
         name: t('Data Quality'),
-        link: updatePath(dataQualityPath()),
-        value: 'data-quality',
+        link: dataQualityPath(),
       },
       {
         name: t('Data Modelling'),
-        link: updatePath(queryExamplesPath()),
-        value: 'data-modelling',
+        link: queryExamplesPath(),
         hint: t('BETA'),
         hintType: 'secondary',
       },
       {
         name: t('Management'),
-        link: updatePath(managementPath('namespaces')),
-        value: 'management',
+        link: managementPath(),
       },
       {
         name: t('Dictionary'),
-        link: updatePath(TermsRoutes.termSearch),
-        value: TermsRoutes.termSearch,
+        link: termsSearchPath(),
       },
       {
         name: t('Alerts'),
-        link: updatePath(alertsPath('all')),
-        value: 'alerts',
+        link: alertsPath('all'),
       },
       {
         name: t('Activity'),
         link: activityPath(activityQueryString),
-        value: 'activity',
       },
     ],
-    [activityQueryString, t, updatePath]
+    [activityQueryString, t]
   );
 
   const [selectedTab, setSelectedTab] = useState(-1);
 
-  useEffect(() => {
-    let newTabIdx = -1;
-    tabs.forEach((tab, idx) => {
-      if (
-        location.pathname.includes(tab.value as string) &&
-        !location.pathname.includes('dataentities')
-      ) {
-        newTabIdx = idx;
-      }
-    });
-
-    setSelectedTab(newTabIdx);
-  }, [tabs, location]);
+  useSetSelectedTab(tabs, setSelectedTab);
 
   const handleTabClick = useCallback(
     (idx: number) => {
@@ -102,17 +82,14 @@ const ToolbarTabs: FC = () => {
       if (tabs[idx].name === t('Dictionary')) {
         dispatch(createTermSearch({ termSearchFormData: initialParams }))
           .unwrap()
-          .then(termSearch => {
-            const termSearchLink = termSearchPath(termSearch.searchId);
+          .then(({ searchId }) => {
+            const termSearchLink = termsSearchPath(searchId);
             navigate(termSearchLink);
           });
         return;
       }
 
-      if (
-        tabs[idx].name === t('Catalog') &&
-        tabs[idx].link?.includes(SearchRoutes.search)
-      ) {
+      if (tabs[idx].name === t('Catalog') && tabs[idx].link?.includes('search')) {
         createSearch(initialParams);
       }
     },
diff --git a/odd-platform-ui/src/components/shared/elements/Autocomplete/SearchSuggestionsAutocomplete/SearchSuggestionsAutocomplete.tsx b/odd-platform-ui/src/components/shared/elements/Autocomplete/SearchSuggestionsAutocomplete/SearchSuggestionsAutocomplete.tsx
index fe6f393da..662a4b66c 100644
--- a/odd-platform-ui/src/components/shared/elements/Autocomplete/SearchSuggestionsAutocomplete/SearchSuggestionsAutocomplete.tsx
+++ b/odd-platform-ui/src/components/shared/elements/Autocomplete/SearchSuggestionsAutocomplete/SearchSuggestionsAutocomplete.tsx
@@ -25,8 +25,7 @@ import {
 import EntityClassItem from 'components/shared/elements/EntityClassItem/EntityClassItem';
 import Button from 'components/shared/elements/Button/Button';
 import Input, { type InputProps } from 'components/shared/elements/Input/Input';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
-import { dataEntityDetailsPath } from '../../../../../routes';
+import { dataEntityDetailsPath } from 'routes';
 
 interface SearchSuggestionsAutocompleteProps {
   addEntities?: boolean;
@@ -54,8 +53,6 @@ const SearchSuggestionsAutocomplete: FC<SearchSuggestionsAutocompleteProps> = ({
 }) => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
-  const { updatePath } = useIsEmbeddedPath();
-
   const searchSuggestions = useAppSelector(getSearchSuggestions);
   const { isLoading: isSuggestionsLoading } = useAppSelector(
     getSearchSuggestionsFetchingStatuses
@@ -138,9 +135,7 @@ const SearchSuggestionsAutocomplete: FC<SearchSuggestionsAutocompleteProps> = ({
       </Box>
     );
 
-    const linkedItem = id ? (
-      <Link to={updatePath(dataEntityDetailsPath(id))}>{item}</Link>
-    ) : null;
+    const linkedItem = id ? <Link to={dataEntityDetailsPath(id)}>{item}</Link> : null;
 
     return (
       <li {...props} key={id}>
diff --git a/odd-platform-ui/src/components/shared/elements/EntitiesListModal/EntitiesListModal.tsx b/odd-platform-ui/src/components/shared/elements/EntitiesListModal/EntitiesListModal.tsx
index c7db9f604..f34ff153c 100644
--- a/odd-platform-ui/src/components/shared/elements/EntitiesListModal/EntitiesListModal.tsx
+++ b/odd-platform-ui/src/components/shared/elements/EntitiesListModal/EntitiesListModal.tsx
@@ -6,7 +6,6 @@ import type { DataEntityRef } from 'generated-sources';
 import EntityClassItem from 'components/shared/elements/EntityClassItem/EntityClassItem';
 import DialogWrapper from 'components/shared/elements/DialogWrapper/DialogWrapper';
 import * as S from 'components/shared/elements/EntitiesListModal/EntitiesListModalStyles';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 
 type LabelForTypes =
@@ -32,10 +31,9 @@ const EntitiesListModal: React.FC<EntitiesListModalProps> = ({
   openBtnEl,
 }) => {
   const { t } = useTranslation();
-  const { updatePath } = useIsEmbeddedPath();
 
   const listItem = (item: DataEntityRef) => (
-    <Link to={updatePath(dataEntityDetailsPath(item.id))}>
+    <Link to={dataEntityDetailsPath(item.id)}>
       <S.ListItemContainer container>
         <Typography noWrap title={item.internalName || item.externalName}>
           {item.internalName || item.externalName}
diff --git a/odd-platform-ui/src/components/shared/elements/QueryExamples/QueryExamplesListItem.tsx b/odd-platform-ui/src/components/shared/elements/QueryExamples/QueryExamplesListItem.tsx
index 73166d9ff..f6586a63d 100644
--- a/odd-platform-ui/src/components/shared/elements/QueryExamples/QueryExamplesListItem.tsx
+++ b/odd-platform-ui/src/components/shared/elements/QueryExamples/QueryExamplesListItem.tsx
@@ -11,7 +11,6 @@ import ConfirmationDialog from 'components/shared/elements/ConfirmationDialog/Co
 import { useTranslation } from 'react-i18next';
 import { useUnassignEntityQueryExample } from 'lib/hooks/api/dataModelling/queryExamples';
 import { queryExamplesPath } from 'routes';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import TruncatedCell from '../TruncatedCell/TruncatedCell';
 import Markdown from '../Markdown/Markdown';
 import CollapsibleInfoContainer from '../CollapsibleInfoContainer/CollapsibleInfoContainer';
@@ -49,7 +48,6 @@ const QueryExamplesListItem = ({
   const scrollbarWidth = useScrollBarWidth();
   const { t } = useTranslation();
   const { mutateAsync } = useUnassignEntityQueryExample();
-  const { updatePath } = useIsEmbeddedPath();
 
   return (
     <ListItemContainer key={queryExample.id} container pr={scrollbarWidth}>
@@ -75,7 +73,7 @@ const QueryExamplesListItem = ({
           <Button
             buttonType='linkGray-m-icon'
             icon={<PreviewIcon />}
-            to={updatePath(queryExamplesPath(queryExample.id))}
+            to={queryExamplesPath(queryExample.id)}
           />
           <WithPermissions permissionTo={Permission.QUERY_EXAMPLE_DATASET_DELETE}>
             <ConfirmationDialog
diff --git a/odd-platform-ui/src/components/shared/elements/TruncatedCell/TruncatedCell.tsx b/odd-platform-ui/src/components/shared/elements/TruncatedCell/TruncatedCell.tsx
index 3660f8111..3bfdd18e0 100644
--- a/odd-platform-ui/src/components/shared/elements/TruncatedCell/TruncatedCell.tsx
+++ b/odd-platform-ui/src/components/shared/elements/TruncatedCell/TruncatedCell.tsx
@@ -5,7 +5,6 @@ import TruncatedCellMenu from 'components/shared/elements/TruncatedCell/Truncate
 import * as S from 'components/shared/elements/TruncatedCell/TruncatedCellStyles';
 import Button from 'components/shared/elements/Button/Button';
 import type { SerializeDateToNumber } from 'redux/interfaces';
-import { useIsEmbeddedPath } from 'lib/hooks/useAppPaths/useIsEmbeddedPath';
 import { dataEntityDetailsPath } from 'routes';
 
 interface TruncatedCellProps {
@@ -31,8 +30,6 @@ export type Values = {
 type Item = DataEntityRef | LinkedUrl | string | SerializeDateToNumber<DataEntityRef>;
 
 const TruncatedCell: React.FC<TruncatedCellProps> = ({ dataList, externalEntityId }) => {
-  const { updatePath } = useIsEmbeddedPath();
-
   const getValues = React.useCallback((item: Item): Values => {
     let key;
     let linkTo;
@@ -48,7 +45,7 @@ const TruncatedCell: React.FC<TruncatedCellProps> = ({ dataList, externalEntityI
       linkContent = item.name;
     } else {
       key = `${item.id}`;
-      linkTo = updatePath(dataEntityDetailsPath(item.id));
+      linkTo = dataEntityDetailsPath(item.id);
       linkContent = item.internalName || item.externalName;
     }
 
diff --git a/odd-platform-ui/src/lib/hooks/index.ts b/odd-platform-ui/src/lib/hooks/index.ts
index 6712ff417..aa0fc8a10 100644
--- a/odd-platform-ui/src/lib/hooks/index.ts
+++ b/odd-platform-ui/src/lib/hooks/index.ts
@@ -1,8 +1,6 @@
 export { default as usePermissions } from './usePermissions';
 export { default as useScrollBarWidth } from './useScrollBarWidth';
 export { default as useActivityHeaderIcon } from 'lib/hooks/useActivityHeaderIcon';
-export { default as useAppParams } from './useAppParams/useAppParams';
-export { default as useAppPaths } from './useAppPaths/useAppPaths';
 export { default as useAppDateTime } from './useAppDateTime';
 export { default as useQueryParams } from './useQueryParams';
 export { default as useCreateSearch } from './useCreateSearch';
diff --git a/odd-platform-ui/src/lib/hooks/useAppParams/interfaces.ts b/odd-platform-ui/src/lib/hooks/useAppParams/interfaces.ts
deleted file mode 100644
index 789af44a7..000000000
--- a/odd-platform-ui/src/lib/hooks/useAppParams/interfaces.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import type { SearchRoutes, TermsRoutes } from '../useAppPaths/shared';
-
-interface TermRouteViewTypes {
-  [TermsRoutes.termsViewType]:
-    | typeof TermsRoutes.overview
-    | typeof TermsRoutes.linkedEntities;
-}
-
-interface TermRouteParams extends TermRouteViewTypes {
-  [TermsRoutes.termId]: string;
-  [TermsRoutes.termSearchId]: string;
-}
-
-interface AppTermRouteParams extends TermRouteViewTypes {
-  [TermsRoutes.termId]: number;
-  [TermsRoutes.termSearchId]: string;
-}
-
-interface SearchRouteParams {
-  [SearchRoutes.searchId]: string;
-}
-
-interface AppSearchRouteParams {
-  [SearchRoutes.searchId]: string;
-}
-
-export type RouteParams = TermRouteParams & SearchRouteParams;
-export type AppRouteParams = AppSearchRouteParams & AppTermRouteParams;
diff --git a/odd-platform-ui/src/lib/hooks/useAppParams/useAppParams.ts b/odd-platform-ui/src/lib/hooks/useAppParams/useAppParams.ts
deleted file mode 100644
index efa2735f6..000000000
--- a/odd-platform-ui/src/lib/hooks/useAppParams/useAppParams.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { useParams } from 'react-router-dom';
-import type { AppRouteParams, RouteParams } from './interfaces';
-
-const useAppParams = (): AppRouteParams => {
-  const { termId, termSearchId, termsViewType, searchId } = useParams<
-    keyof RouteParams
-  >() as RouteParams;
-
-  return {
-    termId: parseInt(termId, 10),
-    termSearchId,
-    termsViewType,
-    searchId,
-  };
-};
-
-export default useAppParams;
diff --git a/odd-platform-ui/src/lib/hooks/useAppPaths/shared.ts b/odd-platform-ui/src/lib/hooks/useAppPaths/shared.ts
deleted file mode 100644
index 8fafd15ae..000000000
--- a/odd-platform-ui/src/lib/hooks/useAppPaths/shared.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-export const EMBEDDED = 'embedded';
-
-export const ActivityRoutes = {
-  activity: 'activity',
-} as const;
-
-export const SearchRoutes = {
-  search: 'search',
-  searchId: 'searchId',
-  searchIdParam: ':searchId',
-} as const;
-
-export const TermsRoutes = {
-  termSearch: 'termsearch',
-  terms: 'terms',
-  termSearchId: 'termSearchId',
-  termSearchIdParam: ':termSearchId',
-  termId: 'termId',
-  termIdParam: ':termId',
-  termsViewType: 'termsViewType',
-  termsViewTypeParam: ':termsViewType',
-  overview: 'overview',
-  linkedEntities: 'linked-entities',
-  linkedColumns: 'linked-columns',
-} as const;
diff --git a/odd-platform-ui/src/lib/hooks/useAppPaths/useAppPaths.ts b/odd-platform-ui/src/lib/hooks/useAppPaths/useAppPaths.ts
deleted file mode 100644
index f44d6db1e..000000000
--- a/odd-platform-ui/src/lib/hooks/useAppPaths/useAppPaths.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { useMemo } from 'react';
-import { useIsEmbeddedPath } from './useIsEmbeddedPath';
-import { useTermsPaths } from './useTermsPaths';
-import { ActivityRoutes, SearchRoutes, TermsRoutes } from './shared';
-
-const useAppPaths = () => {
-  const { updatePath, isPathEmbedded } = useIsEmbeddedPath();
-  const termsPaths = useTermsPaths();
-
-  const getNonExactPath = (path: string) => updatePath(`${path}/*`);
-  const getNonExactParamPath = (path: string) => `${path}/*`;
-
-  const basePath = updatePath('');
-
-  // search
-  const baseSearchPath = () => `${SearchRoutes.search}`;
-  const searchPath = (searchId: string = SearchRoutes.searchIdParam) =>
-    updatePath(`${baseSearchPath()}/${searchId}`);
-
-  // Activity
-  const activityPath = (query?: string) => {
-    const queryStr = `?${query}`;
-    return updatePath(`${ActivityRoutes.activity}${query ? queryStr : ''}`);
-  };
-
-  return useMemo(
-    () => ({
-      isPathEmbedded,
-      ActivityRoutes,
-      SearchRoutes,
-      TermsRoutes,
-      basePath,
-      updatePath,
-      getNonExactPath,
-      getNonExactParamPath,
-      searchPath,
-      activityPath,
-      ...termsPaths,
-    }),
-    [isPathEmbedded, termsPaths]
-  );
-};
-
-export default useAppPaths;
diff --git a/odd-platform-ui/src/lib/hooks/useAppPaths/useIsEmbeddedPath.ts b/odd-platform-ui/src/lib/hooks/useAppPaths/useIsEmbeddedPath.ts
deleted file mode 100644
index 098daecdd..000000000
--- a/odd-platform-ui/src/lib/hooks/useAppPaths/useIsEmbeddedPath.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import React, { useCallback } from 'react';
-import { useLocation } from 'react-router-dom';
-import { EMBEDDED } from './shared';
-
-export const useIsEmbeddedPath = () => {
-  const location = useLocation();
-  const isPathEmbedded = location.pathname.includes(EMBEDDED);
-
-  const updatePath = useCallback(
-    (link: string) => {
-      if (isPathEmbedded) return `/${EMBEDDED}/${link}`;
-      return `/${link}`;
-    },
-    [isPathEmbedded]
-  );
-
-  return React.useMemo(
-    () => ({ isPathEmbedded, updatePath }),
-    [isPathEmbedded, updatePath]
-  );
-};
diff --git a/odd-platform-ui/src/lib/hooks/useAppPaths/useTermsPaths.ts b/odd-platform-ui/src/lib/hooks/useAppPaths/useTermsPaths.ts
deleted file mode 100644
index 537ef28be..000000000
--- a/odd-platform-ui/src/lib/hooks/useAppPaths/useTermsPaths.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import type { Term } from 'generated-sources';
-import { useIsEmbeddedPath } from './useIsEmbeddedPath';
-import { TermsRoutes } from './shared';
-
-type TermId = Term['id'] | string;
-
-export const useTermsPaths = () => {
-  const { updatePath } = useIsEmbeddedPath();
-
-  const baseTermSearchPath = () => `${TermsRoutes.termSearch}`;
-  const termSearchPath = (termSearchId: string = TermsRoutes.termSearchIdParam) =>
-    updatePath(`${baseTermSearchPath()}/${termSearchId}`);
-
-  const baseTermDetailsPath = () => updatePath(`${TermsRoutes.terms}`);
-  const termDetailsPath = (
-    termId: TermId = TermsRoutes.termIdParam,
-    viewType: string = TermsRoutes.termsViewTypeParam
-  ) => `${baseTermDetailsPath()}/${termId}/${viewType}`;
-
-  const termDetailsLinkedEntitiesPath = (termId: TermId = TermsRoutes.termIdParam) =>
-    `${termDetailsPath(termId, TermsRoutes.linkedEntities)}`;
-
-  const termDetailsLinkedColumnsPath = (termId: TermId = TermsRoutes.termIdParam) =>
-    `${termDetailsPath(termId, TermsRoutes.linkedColumns)}`;
-
-  const termDetailsOverviewPath = (termId: TermId = TermsRoutes.termIdParam) =>
-    `${termDetailsPath(termId, TermsRoutes.overview)}`;
-
-  return {
-    termSearchPath,
-    termDetailsPath,
-    termDetailsLinkedEntitiesPath,
-    termDetailsLinkedColumnsPath,
-    termDetailsOverviewPath,
-  };
-};
diff --git a/odd-platform-ui/src/lib/hooks/useCreateSearch.ts b/odd-platform-ui/src/lib/hooks/useCreateSearch.ts
index 0242292cd..e0fcc0ca7 100644
--- a/odd-platform-ui/src/lib/hooks/useCreateSearch.ts
+++ b/odd-platform-ui/src/lib/hooks/useCreateSearch.ts
@@ -3,12 +3,11 @@ import { useNavigate } from 'react-router-dom';
 import type { SearchFormData } from 'generated-sources';
 import { createDataEntitiesSearch } from 'redux/thunks';
 import { useAppDispatch } from 'redux/lib/hooks';
-import useAppPaths from './useAppPaths/useAppPaths';
+import { searchPath } from 'routes';
 
 export default function useCreateSearch() {
   const dispatch = useAppDispatch();
   const navigate = useNavigate();
-  const { searchPath } = useAppPaths();
 
   return useCallback(
     (searchFormData: SearchFormData) => {
diff --git a/odd-platform-ui/src/lib/hooks/useTermWiki.ts b/odd-platform-ui/src/lib/hooks/useTermWiki.ts
index 90afc34df..a43fe641c 100644
--- a/odd-platform-ui/src/lib/hooks/useTermWiki.ts
+++ b/odd-platform-ui/src/lib/hooks/useTermWiki.ts
@@ -7,10 +7,9 @@ import type {
   TermRef,
 } from 'generated-sources';
 import { useAppDispatch } from 'redux/lib/hooks';
-import useAppPaths from 'lib/hooks/useAppPaths/useAppPaths';
 import { TERM_PATTERN } from 'lib/constants';
 import { useGetTermByNamespaceAndName } from 'lib/hooks/api';
-import { useDataEntityRouteParams } from 'routes';
+import { termDetailsPath, useDataEntityRouteParams } from 'routes';
 
 interface UseTermWikiProps {
   updateDescription: (params: any) => AsyncThunkAction<any, any, any>;
@@ -37,7 +36,6 @@ export default function useTermWiki({
 }: UseTermWikiProps) {
   const dispatch = useAppDispatch();
   const { dataEntityId } = useDataEntityRouteParams();
-  const { termDetailsOverviewPath } = useAppPaths();
   const fetchTerm = useGetTermByNamespaceAndName();
 
   const [editMode, setEditMode] = useState(false);
@@ -192,7 +190,7 @@ export default function useTermWiki({
 
       for (const termKey in fetchedTerms) {
         const { id, name, definition } = fetchedTerms[termKey];
-        const termLink = makeTermLink(name, termDetailsOverviewPath(id), definition);
+        const termLink = makeTermLink(name, termDetailsPath(id), definition);
         const termPattern = makeTermPattern(termKey);
         markdownDescription = markdownDescription.split(termPattern).join(termLink);
       }
diff --git a/odd-platform-ui/src/routes/activityRoutes.ts b/odd-platform-ui/src/routes/activityRoutes.ts
new file mode 100644
index 000000000..b649f49d1
--- /dev/null
+++ b/odd-platform-ui/src/routes/activityRoutes.ts
@@ -0,0 +1,6 @@
+const BASE_PATH = '/activity';
+
+export function activityPath(query?: string) {
+  const queryStr = `?${query}`;
+  return `${BASE_PATH}${query ? queryStr : ''}`;
+}
diff --git a/odd-platform-ui/src/routes/alertsRoutes.ts b/odd-platform-ui/src/routes/alertsRoutes.ts
index c01e096fb..0aa23124a 100644
--- a/odd-platform-ui/src/routes/alertsRoutes.ts
+++ b/odd-platform-ui/src/routes/alertsRoutes.ts
@@ -1,4 +1,4 @@
-const BASE_PATH = 'alerts';
+const BASE_PATH = '/alerts';
 const AlertsRoutes = {
   ALL_PATH: `all`,
   MY_PATH: `my`,
diff --git a/odd-platform-ui/src/routes/dataEntitiesRoutes.ts b/odd-platform-ui/src/routes/dataEntitiesRoutes.ts
index 6fd0773de..ca052fa91 100644
--- a/odd-platform-ui/src/routes/dataEntitiesRoutes.ts
+++ b/odd-platform-ui/src/routes/dataEntitiesRoutes.ts
@@ -1,7 +1,7 @@
 import { generatePath, useParams } from 'react-router-dom';
 import type { DataEntity, DataQualityTest } from 'generated-sources';
 
-const BASE_PATH = 'dataentities';
+const BASE_PATH = '/dataentities';
 const DataEntityDetailsRoutes = {
   OVERVIEW: 'overview',
   LINEAGE: 'lineage',
@@ -53,6 +53,9 @@ export const useDataEntityRouteParams = (): AppDataEntityDetailsRouteParams => {
 
 type DataEntityDetailsRoutesType = typeof DataEntityDetailsRoutes;
 
+export function dataEntitiesPath() {
+  return BASE_PATH;
+}
 export function dataEntityDetailsPath(
   id: DataEntity['id'] | string,
   path: DataEntityDetailsRoutesType[keyof DataEntityDetailsRoutesType] = 'overview'
@@ -78,7 +81,8 @@ export function dataEntityTestReportsPath(
 
 export function dataEntityLineagePath(id: DataEntity['id'] | string, query?: string) {
   const detailsPath = dataEntityDetailsPath(id, DataEntityDetailsRoutes.LINEAGE);
-  return `${generatePath(detailsPath)}${query ? `?${query}` : ''}`;
+  const queryString = query ? `?${query}` : '';
+  return `${detailsPath}${queryString}`;
 }
 
 export function datasetStructurePath(id: DataEntity['id'] | string, versionId?: number) {
@@ -94,16 +98,12 @@ export function datasetStructurePath(id: DataEntity['id'] | string, versionId?:
 
 export function datasetStructureComparePath(
   id: DataEntity['id'] | string,
-  firstVersionId?: number,
-  secondVersionId?: number
+  firstVersionId: number,
+  secondVersionId: number
 ) {
-  const query =
-    firstVersionId && secondVersionId
-      ? `?firstVersionId=${firstVersionId}&secondVersionId=${secondVersionId}`
-      : '';
-
   const detailsPath = dataEntityDetailsPath(id, DataEntityDetailsRoutes.STRUCTURE);
-  return `${generatePath(detailsPath)}${query ? `?${query}` : ''}`;
+  const queryString = `?firstVersionId=${firstVersionId}&secondVersionId=${secondVersionId}`;
+  return `${detailsPath}/compare${queryString}`;
 }
 
 export function dataEntityDiscussionsPath(
diff --git a/odd-platform-ui/src/routes/dataModellingRoutes.ts b/odd-platform-ui/src/routes/dataModellingRoutes.ts
index c72912a76..c56d9f9e4 100644
--- a/odd-platform-ui/src/routes/dataModellingRoutes.ts
+++ b/odd-platform-ui/src/routes/dataModellingRoutes.ts
@@ -5,7 +5,7 @@ export const URLSearchParams = {
   QUERY_SEARCH_ID: 'querySearchId',
 } as const;
 
-const BASE_PATH = 'data-modelling';
+const BASE_PATH = '/data-modelling';
 const QUERY_EXAMPLES_PATH = 'query-examples';
 
 export function dataModellingPath() {
diff --git a/odd-platform-ui/src/routes/dataQualityRoutes.ts b/odd-platform-ui/src/routes/dataQualityRoutes.ts
index 89dc4f891..4872178e5 100644
--- a/odd-platform-ui/src/routes/dataQualityRoutes.ts
+++ b/odd-platform-ui/src/routes/dataQualityRoutes.ts
@@ -1,3 +1,3 @@
 export function dataQualityPath() {
-  return 'data-quality';
+  return '/data-quality';
 }
diff --git a/odd-platform-ui/src/routes/directoryRoutes.ts b/odd-platform-ui/src/routes/directoryRoutes.ts
index 6d463e340..db35cd4f3 100644
--- a/odd-platform-ui/src/routes/directoryRoutes.ts
+++ b/odd-platform-ui/src/routes/directoryRoutes.ts
@@ -1,7 +1,7 @@
 import { generatePath, useParams } from 'react-router-dom';
 import type { DataSource, DataSourceType } from '../generated-sources';
 
-const BASE_PATH = 'directory';
+const BASE_PATH = '/directory';
 
 export function directoryPath() {
   return BASE_PATH;
diff --git a/odd-platform-ui/src/routes/index.ts b/odd-platform-ui/src/routes/index.ts
index b3a2ad738..2f43cba59 100644
--- a/odd-platform-ui/src/routes/index.ts
+++ b/odd-platform-ui/src/routes/index.ts
@@ -4,3 +4,6 @@ export * from './dataModellingRoutes';
 export * from './dataQualityRoutes';
 export * from './managementRoutes';
 export * from './directoryRoutes';
+export * from './searchRoutes';
+export * from './activityRoutes';
+export * from './termsRoutes';
diff --git a/odd-platform-ui/src/routes/managementRoutes.ts b/odd-platform-ui/src/routes/managementRoutes.ts
index 8484b8180..2c0282295 100644
--- a/odd-platform-ui/src/routes/managementRoutes.ts
+++ b/odd-platform-ui/src/routes/managementRoutes.ts
@@ -1,6 +1,6 @@
 import { generatePath, useParams } from 'react-router-dom';
 
-const BASE_PATH = 'management';
+const BASE_PATH = '/management';
 const ManagementRoutes = {
   NAMESPACES: 'namespaces',
   DATASOURCES: 'datasources',
@@ -15,7 +15,7 @@ const ManagementRoutes = {
 type ManagementRoutesType = typeof ManagementRoutes;
 
 export function managementPath(path?: ManagementRoutesType[keyof ManagementRoutesType]) {
-  if (!path) return generatePath(BASE_PATH);
+  if (!path) return BASE_PATH;
   return generatePath(`${BASE_PATH}/${path}`);
 }
 
@@ -29,7 +29,7 @@ type AssociationsRoutesType = typeof AssociationsRoutes;
 export function associationsPath(
   path: AssociationsRoutesType[keyof AssociationsRoutesType]
 ) {
-  return generatePath(`${managementPath(ManagementRoutes.ASSOCIATIONS)}/${path}`);
+  return `${managementPath(ManagementRoutes.ASSOCIATIONS)}/${path}`;
 }
 
 const INTEGRATION_ID_PARAM = ':integrationId';
diff --git a/odd-platform-ui/src/routes/searchRoutes.ts b/odd-platform-ui/src/routes/searchRoutes.ts
new file mode 100644
index 000000000..a4b2c11f7
--- /dev/null
+++ b/odd-platform-ui/src/routes/searchRoutes.ts
@@ -0,0 +1,19 @@
+import { generatePath, useParams } from 'react-router-dom';
+
+const BASE_PATH = '/search';
+const SEARCH_ID_PARAM = ':searchId';
+const SEARCH_ID = 'searchId';
+
+export function searchPath(searchId?: string) {
+  if (searchId) {
+    return generatePath(`${BASE_PATH}/${SEARCH_ID_PARAM}`, { [SEARCH_ID]: searchId });
+  }
+  return BASE_PATH;
+}
+
+interface SearchRouteParams {
+  [SEARCH_ID]: string;
+}
+
+export const useSearchRouteParams = (): SearchRouteParams =>
+  useParams<keyof SearchRouteParams>() as SearchRouteParams;
diff --git a/odd-platform-ui/src/routes/termsRoutes.ts b/odd-platform-ui/src/routes/termsRoutes.ts
new file mode 100644
index 000000000..fcda55cf0
--- /dev/null
+++ b/odd-platform-ui/src/routes/termsRoutes.ts
@@ -0,0 +1,61 @@
+import { generatePath, useParams } from 'react-router-dom';
+import type { Term } from 'generated-sources';
+
+const BASE_PATH = '/terms';
+const TERMS_SEARCH_PATH = '/termsearch';
+
+const TERMS_SEARCH_ID = 'termSearchId';
+const TERMS_SEARCH_ID_PARAM = `:${TERMS_SEARCH_ID}`;
+const TERM_ID = 'termId';
+const TERM_ID_PARAM = `:${TERM_ID}`;
+
+export function termsSearchPath(searchId?: string) {
+  if (searchId) {
+    return generatePath(`${TERMS_SEARCH_PATH}/${TERMS_SEARCH_ID_PARAM}`, {
+      [TERMS_SEARCH_ID]: searchId,
+    });
+  }
+  return TERMS_SEARCH_PATH;
+}
+
+export function termsPath() {
+  return BASE_PATH;
+}
+
+const TermDetailsRoutes = {
+  OVERVIEW: 'overview',
+  LINKED_ENTITIES: 'linked-entities',
+  LINKED_COLUMNS: 'linked-columns',
+} as const;
+
+type TermDetailsRoutesType = (typeof TermDetailsRoutes)[keyof typeof TermDetailsRoutes];
+
+export function termDetailsPath(
+  termId: Term['id'],
+  path: TermDetailsRoutesType = 'overview'
+) {
+  return generatePath(`${BASE_PATH}/${TERM_ID_PARAM}/${path}`, {
+    [TERM_ID]: String(termId),
+  });
+}
+
+interface TermsRouteParams {
+  [TERM_ID]: string;
+  [TERMS_SEARCH_ID]: string;
+}
+
+interface AppTermsRouteParams {
+  [TERM_ID]: Term['id'];
+  [TERMS_SEARCH_ID]: string;
+}
+
+export const useTermsRouteParams = (): AppTermsRouteParams => {
+  const { termId, termSearchId } = useParams<
+    keyof TermsRouteParams
+  >() as TermsRouteParams;
+
+  return {
+    termId: parseInt(termId, 10),
+    termSearchId,
+  };
+};