diff --git a/Resources/translations/universal_discovery_widget.en.xliff b/Resources/translations/universal_discovery_widget.en.xliff
index 74bf5734..0ff9f282 100644
--- a/Resources/translations/universal_discovery_widget.en.xliff
+++ b/Resources/translations/universal_discovery_widget.en.xliff
@@ -11,6 +11,11 @@
         <target state="new">Bookmarks</target>
         <note>key: bookmarks.label</note>
       </trans-unit>
+      <trans-unit id="2467591f8170f453c7e896466beb7bb255078cb7" resname="breadcrumbs.root_location">
+        <source>Root Location</source>
+        <target state="new">Root Location</target>
+        <note>key: breadcrumbs.root_location</note>
+      </trans-unit>
       <trans-unit id="d88e188b21fc4c65a6d8bdf170e0e23dfe0712a3" resname="browse.label">
         <source>Browse</source>
         <target state="new">Browse</target>
diff --git a/src/modules/universal-discovery/bookmarks.tab.module.js b/src/modules/universal-discovery/bookmarks.tab.module.js
index f8b01084..db0d37e4 100644
--- a/src/modules/universal-discovery/bookmarks.tab.module.js
+++ b/src/modules/universal-discovery/bookmarks.tab.module.js
@@ -12,6 +12,7 @@ import {
     LoadedLocationsMapContext,
     SortingContext,
     SortOrderContext,
+    RootLocationIdContext,
 } from './universal.discovery.module';
 import { loadAccordionData } from './services/universal.discovery.service';
 
@@ -26,6 +27,7 @@ const BookmarksTabModule = () => {
     const [markedLocation, setMarkedLocation] = useContext(MarkedLocationContext);
     const [sorting, setSorting] = useContext(SortingContext);
     const [sortOrder, setSortOrder] = useContext(SortOrderContext);
+    const rootLocationId = useContext(RootLocationIdContext);
     const [loadedLocationsMap, dispatchLoadedLocationsAction] = useContext(LoadedLocationsMapContext);
     const [bookmarkedLocationMarked, setBookmarkedLocationMarked] = useState(null);
     const renderBrowseLocations = () => {
@@ -49,6 +51,7 @@ const BookmarksTabModule = () => {
                 sortClause: sorting,
                 sortOrder: sortOrder,
                 gridView: currentView === 'grid',
+                rootLocationId,
             },
             (locationsMap) => {
                 dispatchLoadedLocationsAction({ type: 'SET_LOCATIONS', data: locationsMap });
diff --git a/src/modules/universal-discovery/components/breadcrumbs/breadcrumbs.js b/src/modules/universal-discovery/components/breadcrumbs/breadcrumbs.js
index d5bf1290..a859abc6 100644
--- a/src/modules/universal-discovery/components/breadcrumbs/breadcrumbs.js
+++ b/src/modules/universal-discovery/components/breadcrumbs/breadcrumbs.js
@@ -42,23 +42,28 @@ const Breadcrumbs = () => {
             'c-breadcrumbs__hidden-list': true,
             'c-breadcrumbs__hidden-list--visible': hiddenListVisible,
         });
-        const toggletClassNames = createCssClassNames({
+        const toggleClassNames = createCssClassNames({
             'c-breadcrumbs__hidden-list-toggler': true,
             'c-breadcrumbs__hidden-list-toggler--active': hiddenListVisible,
         });
 
         return (
             <div className="c-breadcrumbs__hidden-list-wrapper">
-                <button className={toggletClassNames} onClick={toggleHiddenListVisible}>
+                <button className={toggleClassNames} onClick={toggleHiddenListVisible}>
                     <Icon name="options" extraClasses="ez-icon--small-medium" />
                 </button>
                 <ul className={hiddenListClassNames}>
                     {hiddenItems.map((item) => {
-                        const onClickHandler = goToLocation.bind(this, item.location.id);
+                        const locationId = item.parentLocationId;
+                        const locationName =
+                            locationId === 1
+                                ? Translator.trans(/*@Desc("Root Location")*/ 'breadcrumbs.root_location', {}, 'universal_discovery_widget')
+                                : item.location.ContentInfo.Content.Name;
+                        const onClickHandler = goToLocation.bind(this, locationId);
 
                         return (
-                            <li key={item.location.id} onClick={onClickHandler} className="c-breadcrumbs__hidden-list-item">
-                                {item.location.ContentInfo.Content.Name}
+                            <li key={locationId} onClick={onClickHandler} className="c-breadcrumbs__hidden-list-item">
+                                {locationName}
                             </li>
                         );
                     })}
@@ -86,20 +91,21 @@ const Breadcrumbs = () => {
             <div className="c-breadcrumbs__list-wrapper">
                 <ul className="c-breadcrumbs__list">
                     {visibleItems.map((item, index) => {
-                        if (!item.location) {
-                            return null;
-                        }
-
+                        const locationId = item.parentLocationId;
+                        const locationName =
+                            locationId === 1
+                                ? Translator.trans(/*@Desc("Root Location")*/ 'breadcrumbs.root_location', {}, 'universal_discovery_widget')
+                                : item.location.ContentInfo.Content.Name;
                         const isLast = index === visibleItems.length - 1;
-                        const onClickHandler = goToLocation.bind(this, item.location.id);
+                        const onClickHandler = goToLocation.bind(this, locationId);
                         const className = createCssClassNames({
                             'c-breadcrumbs__list-item': true,
                             'c-breadcrumbs__list-item--last': isLast,
                         });
 
                         return (
-                            <li key={item.location.id} onClick={onClickHandler} className={className}>
-                                <span className="c-breadcrumbs__list-item-text">{item.location.ContentInfo.Content.Name}</span>
+                            <li key={locationId} onClick={onClickHandler} className={className}>
+                                <span className="c-breadcrumbs__list-item-text">{locationName}</span>
                                 {!isLast && renderSeparator()}
                             </li>
                         );
diff --git a/src/modules/universal-discovery/components/content-table/content.table.item.js b/src/modules/universal-discovery/components/content-table/content.table.item.js
index 5f67c3b0..0b6d5f97 100644
--- a/src/modules/universal-discovery/components/content-table/content.table.item.js
+++ b/src/modules/universal-discovery/components/content-table/content.table.item.js
@@ -18,6 +18,7 @@ import {
     MultipleConfigContext,
     ContainersOnlyContext,
     AllowedContentTypesContext,
+    RootLocationIdContext,
 } from '../../universal.discovery.module';
 
 const ContentTableItem = ({ location }) => {
@@ -30,6 +31,7 @@ const ContentTableItem = ({ location }) => {
     const contentTypesMap = useContext(ContentTypesMapContext);
     const [selectedLocations, dispatchSelectedLocationsAction] = useContext(SelectedLocationsContext);
     const [multiple, multipleItemsLimit] = useContext(MultipleConfigContext);
+    const rootLocationId = useContext(RootLocationIdContext);
     const { formatShortDateTime } = window.eZ.helpers.timezone;
     const allowedContentTypes = useContext(AllowedContentTypesContext);
     const contentTypeInfo = contentTypesMap[location.ContentInfo.Content.ContentType._href];
@@ -57,6 +59,7 @@ const ContentTableItem = ({ location }) => {
                 sortClause: sorting,
                 sortOrder: sortOrder,
                 gridView: currentView === 'grid',
+                rootLocationId,
             },
             (locationsMap) => {
                 dispatchLoadedLocationsAction({ type: 'SET_LOCATIONS', data: locationsMap });
diff --git a/src/modules/universal-discovery/components/finder/finder.branch.js b/src/modules/universal-discovery/components/finder/finder.branch.js
index bdd040b9..1b4e3c4c 100644
--- a/src/modules/universal-discovery/components/finder/finder.branch.js
+++ b/src/modules/universal-discovery/components/finder/finder.branch.js
@@ -41,7 +41,7 @@ const FinderBranch = ({ locationData }) => {
     let resizeStartPositionX = 0;
     let branchCurrentWidth = 0;
     const loadMore = ({ target }) => {
-        const areAllItemsLoaded = loadedLocations.location && locationData.subitems.length >= loadedLocations.location.childCount;
+        const areAllItemsLoaded = locationData.subitems.length >= loadedLocations.totalCount;
         const isOffsetReached = target.scrollHeight - target.clientHeight - target.scrollTop < SCROLL_OFFSET;
 
         if (areAllItemsLoaded || !isOffsetReached || isLoading) {
diff --git a/src/modules/universal-discovery/components/grid-view/grid.view.js b/src/modules/universal-discovery/components/grid-view/grid.view.js
index ffb2b8e8..084c1de5 100644
--- a/src/modules/universal-discovery/components/grid-view/grid.view.js
+++ b/src/modules/universal-discovery/components/grid-view/grid.view.js
@@ -26,7 +26,7 @@ const GridView = () => {
         true
     );
     const loadMore = ({ target }) => {
-        const areAllItemsLoaded = loadedLocations.location && locationData.subitems.length >= loadedLocations.location.childCount;
+        const areAllItemsLoaded = locationData.subitems.length >= loadedLocations.totalCount;
         const isOffsetReached = target.scrollHeight - target.clientHeight - target.scrollTop < SCROLL_OFFSET;
 
         if (areAllItemsLoaded || !isOffsetReached || isLoading) {
diff --git a/src/modules/universal-discovery/content.create.tab.module.js b/src/modules/universal-discovery/content.create.tab.module.js
index 9b6d72d3..b28c74ce 100644
--- a/src/modules/universal-discovery/content.create.tab.module.js
+++ b/src/modules/universal-discovery/content.create.tab.module.js
@@ -61,7 +61,7 @@ const ContentCreataTabModule = () => {
                 const parentLocationData = clonedLoadedLocations[clonedLoadedLocations.length - 1];
 
                 parentLocationData.subitems = [];
-                parentLocationData.location.childCount = parentLocationData.location.childCount + 1;
+                parentLocationData.totalCount = parentLocationData.totalCount + 1;
 
                 dispatchLoadedLocationsAction({ type: 'SET_LOCATIONS', data: clonedLoadedLocations });
                 dispatchSelectedLocationsAction({ type: 'ADD_SELECTED_LOCATION', location: items[0] });
diff --git a/src/modules/universal-discovery/hooks/useFindLocationsByParentLocationIdFetch.js b/src/modules/universal-discovery/hooks/useFindLocationsByParentLocationIdFetch.js
index bf4adacc..8ba90875 100644
--- a/src/modules/universal-discovery/hooks/useFindLocationsByParentLocationIdFetch.js
+++ b/src/modules/universal-discovery/hooks/useFindLocationsByParentLocationIdFetch.js
@@ -29,8 +29,7 @@ export const useFindLocationsByParentLocationIdFetch = (locationData, { sortClau
         if (
             !locationData.parentLocationId ||
             locationData.collapsed ||
-            ((locationData.location && locationData.subitems.length >= locationData.location.childCount) ||
-                locationData.subitems.length >= limit + offset)
+            (locationData.subitems.length >= locationData.totalCount || locationData.subitems.length >= limit + offset)
         ) {
             dispatch({ type: 'FETCH_END', data: {} });
 
diff --git a/src/modules/universal-discovery/services/universal.discovery.service.js b/src/modules/universal-discovery/services/universal.discovery.service.js
index 43decd5d..1cc97035 100644
--- a/src/modules/universal-discovery/services/universal.discovery.service.js
+++ b/src/modules/universal-discovery/services/universal.discovery.service.js
@@ -28,7 +28,7 @@ export const findLocationsByParentLocationId = (
     fetch(request)
         .then(handleRequestResponse)
         .then((response) => {
-            const { bookmark, location, permissions, subitems, version } = response;
+            const { bookmarked, location, permissions, subitems, version } = response;
             const subitemsData = subitems.locations.map((location) => {
                 const mappedSubitems = {
                     location: location.Location,
@@ -44,28 +44,38 @@ export const findLocationsByParentLocationId = (
 
                 return mappedSubitems;
             });
-
-            callback({
-                location: location.Location,
-                version: version.Version,
+            const locationData = {
+                location: location ? location.Location : null,
+                version: version ? version.Version : null,
+                totalCount: subitems.totalCount,
                 subitems: subitemsData,
-                bookmarked: bookmark,
+                bookmarked,
                 permissions,
                 parentLocationId,
-            });
+            };
+
+            callback(locationData);
         })
         .catch(showErrorNotification);
 };
 
 export const loadAccordionData = (
-    { token, parentLocationId, limit = QUERY_LIMIT, sortClause = 'DatePublished', sortOrder = 'ascending', gridView = false },
+    {
+        token,
+        parentLocationId,
+        limit = QUERY_LIMIT,
+        sortClause = 'DatePublished',
+        sortOrder = 'ascending',
+        gridView = false,
+        rootLocationId = 1,
+    },
     callback
 ) => {
     const routeName = gridView ? 'ezplatform.udw.accordion_gridview.data' : 'ezplatform.udw.accordion.data';
     const url = window.Routing.generate(routeName, {
         locationId: parentLocationId,
     });
-    const request = new Request(`${url}?limit=${limit}&sortClause=${sortClause}&sortOrder=${sortOrder}`, {
+    const request = new Request(`${url}?limit=${limit}&sortClause=${sortClause}&sortOrder=${sortOrder}&rootLocationId=${rootLocationId}`, {
         method: 'GET',
         headers: { 'X-CSRF-Token': token },
         mode: 'same-origin',
@@ -88,27 +98,20 @@ export const loadAccordionData = (
             });
 
             const lastLocationData = response.columns[parentLocationId];
-            const subitemsData = lastLocationData.subitems.locations.map((location) => {
-                const mappedSubitems = {
-                    location: location.Location,
-                };
 
-                if (lastLocationData.subitems.versions) {
-                    const version = lastLocationData.subitems.versions.find(
-                        (version) => version.Version.VersionInfo.Content._href === location.Location.Content._href
-                    );
-
-                    mappedSubitems.version = version.Version;
-                }
-
-                return mappedSubitems;
-            });
+            if (response.columns[1]) {
+                mappedItems.unshift({
+                    subitems: [],
+                    parentLocationId: 1,
+                    collapsed: false,
+                });
+            }
 
             mappedItems.push({
                 location: lastLocationData.location.Location,
                 version: lastLocationData.version.Version,
-                subitems: subitemsData,
-                bookmarked: lastLocationData.bookmark,
+                subitems: [],
+                bookmarked: lastLocationData.bookmarked,
                 permissions: lastLocationData.permissions,
                 parentLocationId,
             });
diff --git a/src/modules/universal-discovery/universal.discovery.module.js b/src/modules/universal-discovery/universal.discovery.module.js
index a17cd457..c4a6d13f 100644
--- a/src/modules/universal-discovery/universal.discovery.module.js
+++ b/src/modules/universal-discovery/universal.discovery.module.js
@@ -154,6 +154,7 @@ const UniversalDiscoveryModule = (props) => {
                 sortClause: sorting,
                 sortOrder: sortOrder,
                 gridView: currentView === 'grid',
+                rootLocationId: props.rootLocationId,
             },
             (locationsMap) => {
                 dispatchLoadedLocationsAction({ type: 'SET_LOCATIONS', data: locationsMap });