diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/elastic-search-reindex/elastic-search-reindex.constants.ts b/nuxeo-admin-console-web/angular-app/src/app/features/elastic-search-reindex/elastic-search-reindex.constants.ts
index c8f7f4ad..3e0fbc6e 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/elastic-search-reindex/elastic-search-reindex.constants.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/elastic-search-reindex/elastic-search-reindex.constants.ts
@@ -3,11 +3,11 @@ export const ELASTIC_SEARCH_LABELS = {
   DOCUMENT_REINDEX_TITLE: "Reindex a single document",
   NXQL_QUERY_REINDEX_TITLE: "Reindex the results of a NXQL query",
   REINDEX_BUTTON_LABEL: "Reindex",
-  DOCUMENT_QUERY: "ecm:path='{query}'",
+  DOCUMENT_QUERY: "ecm:path='{query}' AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
   FOLDER_QUERY:
-    "ecm:uuid='{query}' OR ecm:ancestorId='{query}' AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
+    "(ecm:uuid='{query}' OR ecm:ancestorId='{query}') AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
   NXQL_QUERY:
-    "ecm:uuid='{query}' OR ecm:ancestorId='{query}' AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
+    "(ecm:uuid='{query}' OR ecm:ancestorId='{query}') AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
   NXQL_QUERY_DEFAULT_VALUE:
     "SELECT * FROM Document WHERE ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0 AND dc:title = 'A document to reindex'",
 };
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/pictures/pictures-renditions.constants.ts b/nuxeo-admin-console-web/angular-app/src/app/features/pictures/pictures-renditions.constants.ts
index 36a7ac68..32017e35 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/pictures/pictures-renditions.constants.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/pictures/pictures-renditions.constants.ts
@@ -6,9 +6,9 @@ export const PICTURE_RENDITIONS_LABELS = {
     DOCUMENT_QUERY:
     "ecm:path='{query}' AND ecm:mixinType = 'Picture' AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
   FOLDER_QUERY:
-    "(ecm:uuid='{query}' OR ecm:ancestorId='{query}') AND ecm:mixinType = 'Picture' AND ecm:isProxy = 0 AND ecm:isVersion = 0",
+    "(ecm:uuid='{query}' OR ecm:ancestorId='{query}') AND ecm:mixinType = 'Picture' AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
   NXQL_QUERY:
-    "(ecm:uuid='{query}' OR ecm:ancestorId='{query}') AND ecm:mixinType = 'Picture' AND ecm:isProxy = 0 AND ecm:isVersion = 0",
+    "(ecm:uuid='{query}' OR ecm:ancestorId='{query}') AND ecm:mixinType = 'Picture' AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
   NXQL_QUERY_DEFAULT_VALUE:
     "SELECT * FROM Document WHERE ecm:mixinType = 'Picture' AND picture:views/*/title IS NULL AND ecm:isVersion = 0 AND ecm:isProxy = 0 AND ecm:isTrashed = 0 AND dc:title = 'A picture without renditions'",
   };
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/thumbnail-generation/thumbnail-generation.constants.ts b/nuxeo-admin-console-web/angular-app/src/app/features/thumbnail-generation/thumbnail-generation.constants.ts
index 94ff6e1b..d244d36f 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/thumbnail-generation/thumbnail-generation.constants.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/thumbnail-generation/thumbnail-generation.constants.ts
@@ -2,8 +2,8 @@ export const THUMBNAIL_GENERATION_LABELS = {
     DOCUMENT_THUMBNAIL_GENERATION_TITLE: "Generate the thumbnail of a single document",
     FOLDER_THUMBNAIL_GENERATION_TITLE: "Generate the thumbnail of a document and all of its children",
     THUMBNAIL_GENERATION_BUTTON_LABEL: "Generate",
-    DOCUMENT_QUERY: "ecm:path='{query}'",
-    FOLDER_QUERY:"ecm:uuid='{query}' OR ecm:ancestorId='{query}' AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
+    DOCUMENT_QUERY: "ecm:path='{query}' AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
+    FOLDER_QUERY:"(ecm:uuid='{query}' OR ecm:ancestorId='{query}') AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
     NXQL_THUMBNAIL_GENERATION_TITLE: "Generate the thumbnail of the documents returned by a NXQL query",
     NXQL_QUERY_DEFAULT_VALUE: "SELECT * FROM Document WHERE ecm:mixinType = 'Thumbnail' AND thumb:thumbnail/data IS NULL AND ecm:isVersion = 0 AND ecm:isProxy = 0 AND ecm:isTrashed = 0 AND dc:title = 'A document without thumbnail'",
     NXQL_QUERY: "(ecm:uuid='{query}' OR ecm:ancestorId='{query}') AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0"
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/video-renditions-generation/video-renditions-generation.constants.ts b/nuxeo-admin-console-web/angular-app/src/app/features/video-renditions-generation/video-renditions-generation.constants.ts
index 3728b31c..6a595d87 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/video-renditions-generation/video-renditions-generation.constants.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/video-renditions-generation/video-renditions-generation.constants.ts
@@ -14,9 +14,9 @@ export const VIDEO_RENDITIONS_LABELS = {
   DOCUMENT_QUERY:
     "ecm:path='{query}' AND ecm:mixinType = 'Video' AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
   FOLDER_QUERY:
-    "ecm:uuid='{query}' OR ecm:ancestorId='{query}' AND ecm:mixinType = 'Video' AND ecm:isProxy = 0 AND ecm:isVersion = 0",
+    "(ecm:uuid='{query}' OR ecm:ancestorId='{query}') AND ecm:mixinType = 'Video' AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
   NXQL_QUERY:
-    "ecm:uuid='{query}' OR ecm:ancestorId='{query}' AND ecm:mixinType = 'Video' AND ecm:isProxy = 0 AND ecm:isVersion = 0",
+    "(ecm:uuid='{query}' OR ecm:ancestorId='{query}') AND ecm:mixinType = 'Video' AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
   NXQL_QUERY_DEFAULT_VALUE:
     "SELECT * FROM Document WHERE ecm:mixinType = 'Video' AND ecm:isProxy = 0 AND ecm:isVersion = 0 AND ecm:isTrashed = 0 AND vid:transcodedVideos/0/name IS NULL AND dc:title = 'A video without renditions'",
   VID_TRANSCODED: "vid:transcodedVideos/0/name",