diff --git a/src/bundle/Resources/public/js/scripts/helpers/content.type.helper.js b/src/bundle/Resources/public/js/scripts/helpers/content.type.helper.js
index c7367c8835..73430a880c 100644
--- a/src/bundle/Resources/public/js/scripts/helpers/content.type.helper.js
+++ b/src/bundle/Resources/public/js/scripts/helpers/content.type.helper.js
@@ -67,16 +67,12 @@ const getContentTypeName = (contentTypeIdentifier) => {
     return contentTypesDataMap[contentTypeIdentifier].name;
 };
 
-const getContentTypeByIdentifier = (contentTypeIdentifier) => {
+const getContentTypeData = (contentTypeIdentifier) => {
     if (!contentTypesDataMap) {
         contentTypesDataMap = createContentTypeDataMap();
     }
 
-    if (!contentTypeIdentifier || !contentTypesDataMap[contentTypeIdentifier]) {
-        return null;
-    }
-
-    return contentTypesDataMap[contentTypeIdentifier];
+    return contentTypesDataMap[contentTypeIdentifier] ?? null;
 };
 
 const getContentTypeIconUrlByHref = (contentTypeHref) => {
@@ -113,7 +109,7 @@ export {
     createContentTypeDataMapByHref,
     getContentTypeIconUrl,
     getContentTypeName,
-    getContentTypeByIdentifier,
+    getContentTypeData,
     getContentTypeIconUrlByHref,
     getContentTypeDataByHref,
     getContentTypeNameByHref,
diff --git a/src/bundle/Resources/public/scss/_custom.scss b/src/bundle/Resources/public/scss/_custom.scss
index 8b834bc810..39a6b2e857 100644
--- a/src/bundle/Resources/public/scss/_custom.scss
+++ b/src/bundle/Resources/public/scss/_custom.scss
@@ -176,8 +176,8 @@ $ibexa-font-family:
 $ibexa-font-family-headings: 'Work Sans', sans-serif;
 
 //Ibexa z-index
-$ibexa-backdrop-zindex: 1175;
-$ibexa-modal-zindex: 1180;
+$ibexa-backdrop-zindex: 2175;
+$ibexa-modal-zindex: 2180;
 
 // boostrap variables
 $white: $ibexa-color-white;
diff --git a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_main.scss b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_main.scss
index cdfe9a31a9..2699fd5841 100644
--- a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_main.scss
+++ b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_main.scss
@@ -1,6 +1,6 @@
 .m-ud {
     position: fixed;
-    z-index: 1100;
+    z-index: 2100;
     top: 0;
     left: 0;
     height: 100vh;