diff --git a/src/bundle/Resources/config/universal_discovery_widget.yaml b/src/bundle/Resources/config/universal_discovery_widget.yaml
index 1b0f5dc1af..32feca3396 100644
--- a/src/bundle/Resources/config/universal_discovery_widget.yaml
+++ b/src/bundle/Resources/config/universal_discovery_widget.yaml
@@ -35,15 +35,6 @@ system:
                         browse:
                             items_per_page: 50
                             priority: 30
-                    image_picker_tabs_config:
-                        image_picker:
-                            id: 'image_picker'
-                            priority: 40
-                            hidden: false
-                        image_picker_bookmarks:
-                            id: 'image_picker_bookmarks'
-                            priority: 50
-                            hidden: false
 
                 # These inherit _default configuration
                 create:
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/hooks/useSearchByQueryFetch.js b/src/bundle/ui-dev/src/modules/universal-discovery/hooks/useSearchByQueryFetch.js
index 4f6397c9f7..1393947f70 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/hooks/useSearchByQueryFetch.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/hooks/useSearchByQueryFetch.js
@@ -77,7 +77,7 @@ export const useSearchByQueryFetch = () => {
             }
 
             if (isBookmarked) {
-                query.IsBookmarkedCriterion = isBookmarked;
+                query.IsBookmarkedCriterion = true;
             }
 
             const isImageCriterionDataEmpty = !imageCriterionData || Object.keys(imageCriterionData).length === 0;
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js b/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js
index 34248dc033..0a96efb063 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js
@@ -195,7 +195,6 @@ export const DropdownPortalRefContext = createContext();
 export const SuggestionsStorageContext = createContext();
 export const GridActiveLocationIdContext = createContext();
 export const SnackbarActionsContext = createContext();
-export const ImagePickerTabsConfigContext = createContext();
 
 const UniversalDiscoveryModule = (props) => {
     const { restInfo } = props;
@@ -474,114 +473,112 @@ const UniversalDiscoveryModule = (props) => {
                                         <MultipleConfigContext.Provider value={[props.multiple, props.multipleItemsLimit]}>
                                             <ContainersOnlyContext.Provider value={props.containersOnly}>
                                                 <AllowedContentTypesContext.Provider value={props.allowedContentTypes}>
-                                                    <ImagePickerTabsConfigContext.Provider value={props.imagePickerTabsConfig}>
-                                                        <SnackbarActionsContext.Provider value={props.snackbarEnabledActions}>
-                                                            <ActiveTabContext.Provider
-                                                                value={[activeTab, setActiveTab, previousActiveTab, props.activeTab]}
-                                                            >
-                                                                <TabsContext.Provider value={tabs}>
-                                                                    <TabsConfigContext.Provider value={props.tabsConfig}>
-                                                                        <TitleContext.Provider value={props.title}>
-                                                                            <CancelContext.Provider value={props.onCancel}>
-                                                                                <ConfirmContext.Provider value={onConfirm}>
-                                                                                    <SortingContext.Provider value={[sorting, setSorting]}>
-                                                                                        <SortOrderContext.Provider
-                                                                                            value={[sortOrder, setSortOrder]}
+                                                    <SnackbarActionsContext.Provider value={props.snackbarEnabledActions}>
+                                                        <ActiveTabContext.Provider
+                                                            value={[activeTab, setActiveTab, previousActiveTab, props.activeTab]}
+                                                        >
+                                                            <TabsContext.Provider value={tabs}>
+                                                                <TabsConfigContext.Provider value={props.tabsConfig}>
+                                                                    <TitleContext.Provider value={props.title}>
+                                                                        <CancelContext.Provider value={props.onCancel}>
+                                                                            <ConfirmContext.Provider value={onConfirm}>
+                                                                                <SortingContext.Provider value={[sorting, setSorting]}>
+                                                                                    <SortOrderContext.Provider
+                                                                                        value={[sortOrder, setSortOrder]}
+                                                                                    >
+                                                                                        <CurrentViewContext.Provider
+                                                                                            value={[currentView, setCurrentView]}
                                                                                         >
-                                                                                            <CurrentViewContext.Provider
-                                                                                                value={[currentView, setCurrentView]}
+                                                                                            <MarkedLocationIdContext.Provider
+                                                                                                value={[
+                                                                                                    markedLocationId,
+                                                                                                    setMarkedLocationId,
+                                                                                                ]}
                                                                                             >
-                                                                                                <MarkedLocationIdContext.Provider
+                                                                                                <GridActiveLocationIdContext.Provider
                                                                                                     value={[
-                                                                                                        markedLocationId,
-                                                                                                        setMarkedLocationId,
+                                                                                                        gridActiveLocationId,
+                                                                                                        setGridActiveLocationId,
                                                                                                     ]}
                                                                                                 >
-                                                                                                    <GridActiveLocationIdContext.Provider
+                                                                                                    <LoadedLocationsMapContext.Provider
                                                                                                         value={[
-                                                                                                            gridActiveLocationId,
-                                                                                                            setGridActiveLocationId,
+                                                                                                            loadedLocationsMap,
+                                                                                                            dispatchLoadedLocationsAction,
                                                                                                         ]}
                                                                                                     >
-                                                                                                        <LoadedLocationsMapContext.Provider
-                                                                                                            value={[
-                                                                                                                loadedLocationsMap,
-                                                                                                                dispatchLoadedLocationsAction,
-                                                                                                            ]}
+                                                                                                        <RootLocationIdContext.Provider
+                                                                                                            value={props.rootLocationId}
                                                                                                         >
-                                                                                                            <RootLocationIdContext.Provider
-                                                                                                                value={props.rootLocationId}
+                                                                                                            <SelectedLocationsContext.Provider
+                                                                                                                value={[
+                                                                                                                    selectedLocations,
+                                                                                                                    dispatchSelectedLocationsAction,
+                                                                                                                ]}
                                                                                                             >
-                                                                                                                <SelectedLocationsContext.Provider
+                                                                                                                <CreateContentWidgetContext.Provider
                                                                                                                     value={[
-                                                                                                                        selectedLocations,
-                                                                                                                        dispatchSelectedLocationsAction,
+                                                                                                                        createContentVisible,
+                                                                                                                        setCreateContentVisible,
                                                                                                                     ]}
                                                                                                                 >
-                                                                                                                    <CreateContentWidgetContext.Provider
+                                                                                                                    <SuggestionsStorageContext.Provider
                                                                                                                         value={[
-                                                                                                                            createContentVisible,
-                                                                                                                            setCreateContentVisible,
+                                                                                                                            suggestionsStorage,
+                                                                                                                            setSuggestionsStorage,
                                                                                                                         ]}
                                                                                                                     >
-                                                                                                                        <SuggestionsStorageContext.Provider
+                                                                                                                        <ContentOnTheFlyDataContext.Provider
                                                                                                                             value={[
-                                                                                                                                suggestionsStorage,
-                                                                                                                                setSuggestionsStorage,
+                                                                                                                                contentOnTheFlyData,
+                                                                                                                                setContentOnTheFlyData,
                                                                                                                             ]}
                                                                                                                         >
-                                                                                                                            <ContentOnTheFlyDataContext.Provider
-                                                                                                                                value={[
-                                                                                                                                    contentOnTheFlyData,
-                                                                                                                                    setContentOnTheFlyData,
-                                                                                                                                ]}
+                                                                                                                            <ContentOnTheFlyConfigContext.Provider
+                                                                                                                                value={
+                                                                                                                                    props.contentOnTheFly
+                                                                                                                                }
                                                                                                                             >
-                                                                                                                                <ContentOnTheFlyConfigContext.Provider
-                                                                                                                                    value={
-                                                                                                                                        props.contentOnTheFly
-                                                                                                                                    }
+                                                                                                                                <EditOnTheFlyDataContext.Provider
+                                                                                                                                    value={[
+                                                                                                                                        editOnTheFlyData,
+                                                                                                                                        setEditOnTheFlyData,
+                                                                                                                                    ]}
                                                                                                                                 >
-                                                                                                                                    <EditOnTheFlyDataContext.Provider
+                                                                                                                                    <SearchTextContext.Provider
                                                                                                                                         value={[
-                                                                                                                                            editOnTheFlyData,
-                                                                                                                                            setEditOnTheFlyData,
+                                                                                                                                            searchText,
+                                                                                                                                            setSearchText,
                                                                                                                                         ]}
                                                                                                                                     >
-                                                                                                                                        <SearchTextContext.Provider
-                                                                                                                                            value={[
-                                                                                                                                                searchText,
-                                                                                                                                                setSearchText,
-                                                                                                                                            ]}
+                                                                                                                                        <DropdownPortalRefContext.Provider
+                                                                                                                                            value={
+                                                                                                                                                dropdownPortalRef
+                                                                                                                                            }
                                                                                                                                         >
-                                                                                                                                            <DropdownPortalRefContext.Provider
-                                                                                                                                                value={
-                                                                                                                                                    dropdownPortalRef
-                                                                                                                                                }
-                                                                                                                                            >
-                                                                                                                                                <Tab />
-                                                                                                                                            </DropdownPortalRefContext.Provider>
-                                                                                                                                        </SearchTextContext.Provider>
-                                                                                                                                    </EditOnTheFlyDataContext.Provider>
-                                                                                                                                </ContentOnTheFlyConfigContext.Provider>
-                                                                                                                            </ContentOnTheFlyDataContext.Provider>
-                                                                                                                        </SuggestionsStorageContext.Provider>
-                                                                                                                    </CreateContentWidgetContext.Provider>
-                                                                                                                </SelectedLocationsContext.Provider>
-                                                                                                            </RootLocationIdContext.Provider>
-                                                                                                        </LoadedLocationsMapContext.Provider>
-                                                                                                    </GridActiveLocationIdContext.Provider>
-                                                                                                </MarkedLocationIdContext.Provider>
-                                                                                            </CurrentViewContext.Provider>
-                                                                                        </SortOrderContext.Provider>
-                                                                                    </SortingContext.Provider>
-                                                                                </ConfirmContext.Provider>
-                                                                            </CancelContext.Provider>
-                                                                        </TitleContext.Provider>
-                                                                    </TabsConfigContext.Provider>
-                                                                </TabsContext.Provider>
-                                                            </ActiveTabContext.Provider>
-                                                        </SnackbarActionsContext.Provider>
-                                                    </ImagePickerTabsConfigContext.Provider>
+                                                                                                                                            <Tab />
+                                                                                                                                        </DropdownPortalRefContext.Provider>
+                                                                                                                                    </SearchTextContext.Provider>
+                                                                                                                                </EditOnTheFlyDataContext.Provider>
+                                                                                                                            </ContentOnTheFlyConfigContext.Provider>
+                                                                                                                        </ContentOnTheFlyDataContext.Provider>
+                                                                                                                    </SuggestionsStorageContext.Provider>
+                                                                                                                </CreateContentWidgetContext.Provider>
+                                                                                                            </SelectedLocationsContext.Provider>
+                                                                                                        </RootLocationIdContext.Provider>
+                                                                                                    </LoadedLocationsMapContext.Provider>
+                                                                                                </GridActiveLocationIdContext.Provider>
+                                                                                            </MarkedLocationIdContext.Provider>
+                                                                                        </CurrentViewContext.Provider>
+                                                                                    </SortOrderContext.Provider>
+                                                                                </SortingContext.Provider>
+                                                                            </ConfirmContext.Provider>
+                                                                        </CancelContext.Provider>
+                                                                    </TitleContext.Provider>
+                                                                </TabsConfigContext.Provider>
+                                                            </TabsContext.Provider>
+                                                        </ActiveTabContext.Provider>
+                                                    </SnackbarActionsContext.Provider>
                                                 </AllowedContentTypesContext.Provider>
                                             </ContainersOnlyContext.Provider>
                                         </MultipleConfigContext.Provider>
@@ -636,13 +633,6 @@ UniversalDiscoveryModule.propTypes = {
         instanceUrl: PropTypes.string,
     }),
     snackbarEnabledActions: PropTypes.array,
-    imagePickerTabsConfig: PropTypes.objectOf(
-        PropTypes.shape({
-            id: PropTypes.string.isRequired,
-            priority: PropTypes.number.isRequired,
-            hidden: PropTypes.bool.isRequired,
-        }),
-    ),
 };
 
 UniversalDiscoveryModule.defaultProps = {
@@ -659,7 +649,6 @@ UniversalDiscoveryModule.defaultProps = {
     selectedLocations: [],
     restInfo: defaultRestInfo,
     snackbarEnabledActions: Object.values(SNACKBAR_ACTIONS),
-    imagePickerTabsConfig: {},
 };
 
 export default UniversalDiscoveryModule;