diff --git a/src/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php b/src/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php
index 14f58606..8ab82f7f 100644
--- a/src/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php
+++ b/src/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php
@@ -73,6 +73,7 @@ public function mapFields(Content $content)
         $ancestorLocationsContentIds[] = $contentInfo->ownerId;
 
         $section = $this->sectionHandler->load($contentInfo->sectionId);
+        $contentType = $this->contentTypeHandler->load($contentInfo->contentTypeId);
 
         return [
             new Field(
@@ -173,9 +174,14 @@ public function mapFields(Content $content)
             ),
             new Field(
                 'content_type_group_ids',
-                $this->contentTypeHandler->load($contentInfo->contentTypeId)->groupIds,
+                $contentType->groupIds,
                 new FieldType\MultipleIdentifierField()
             ),
+            new Field(
+                'content_type_is_container',
+                $contentType->isContainer,
+                new FieldType\BooleanField()
+            ),
             new Field(
                 'content_object_state_ids',
                 $this->getObjectStateIds($contentInfo->id),
diff --git a/src/lib/FieldMapper/LocationFieldMapper/LocationDocumentBaseFields.php b/src/lib/FieldMapper/LocationFieldMapper/LocationDocumentBaseFields.php
index f52fbf06..da8aa62c 100644
--- a/src/lib/FieldMapper/LocationFieldMapper/LocationDocumentBaseFields.php
+++ b/src/lib/FieldMapper/LocationFieldMapper/LocationDocumentBaseFields.php
@@ -8,6 +8,7 @@
 
 use Ibexa\Contracts\Core\Persistence\Content\Handler as ContentHandler;
 use Ibexa\Contracts\Core\Persistence\Content\Location;
+use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler;
 use Ibexa\Contracts\Core\Search\Field;
 use Ibexa\Contracts\Core\Search\FieldType;
 use Ibexa\Contracts\Solr\DocumentMapper;
@@ -23,9 +24,14 @@ class LocationDocumentBaseFields extends LocationFieldMapper
      */
     protected $contentHandler;
 
-    public function __construct(ContentHandler $contentHandler)
-    {
+    protected ContentTypeHandler $contentTypeHandler;
+
+    public function __construct(
+        ContentHandler $contentHandler,
+        ContentTypeHandler $contentTypeHandler
+    ) {
         $this->contentHandler = $contentHandler;
+        $this->contentTypeHandler = $contentTypeHandler;
     }
 
     public function accept(Location $location)
@@ -36,6 +42,7 @@ public function accept(Location $location)
     public function mapFields(Location $location)
     {
         $contentInfo = $this->contentHandler->loadContentInfo($location->contentId);
+        $contentType = $this->contentTypeHandler->load($contentInfo->contentTypeId);
 
         return [
             new Field(
@@ -109,6 +116,11 @@ public function mapFields(Location $location)
                 ($location->id == $contentInfo->mainLocationId),
                 new FieldType\BooleanField()
             ),
+            new Field(
+                'is_container',
+                $contentType->isContainer,
+                new FieldType\BooleanField()
+            ),
         ];
     }
 
diff --git a/src/lib/Query/Common/CriterionVisitor/BaseIsContainer.php b/src/lib/Query/Common/CriterionVisitor/BaseIsContainer.php
new file mode 100644
index 00000000..210033c9
--- /dev/null
+++ b/src/lib/Query/Common/CriterionVisitor/BaseIsContainer.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Solr\Query\Common\CriterionVisitor;
+
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator;
+use Ibexa\Contracts\Solr\Query\CriterionVisitor;
+
+/**
+ * @internal
+ */
+abstract class BaseIsContainer extends CriterionVisitor
+{
+    abstract protected function getTargetField(): string;
+
+    public function canVisit(Criterion $criterion): bool
+    {
+        return $criterion instanceof Criterion\IsContainer && $criterion->operator === Operator::EQ;
+    }
+
+    public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null): string
+    {
+        $value = $criterion->value;
+
+        if (!is_array($value) || !is_bool($value[0])) {
+            throw new \LogicException(sprintf(
+                '%s value should be of type array<bool>, received %s.',
+                Criterion\IsContainer::class,
+                get_debug_type($value),
+            ));
+        }
+
+        return $this->getTargetField() . ':' . $this->toString($value[0]);
+    }
+}
diff --git a/src/lib/Query/Content/CriterionVisitor/IsContainer.php b/src/lib/Query/Content/CriterionVisitor/IsContainer.php
new file mode 100644
index 00000000..d825a61f
--- /dev/null
+++ b/src/lib/Query/Content/CriterionVisitor/IsContainer.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Solr\Query\Content\CriterionVisitor;
+
+use Ibexa\Solr\Query\Common\CriterionVisitor\BaseIsContainer;
+
+/**
+ * @internal
+ */
+final class IsContainer extends BaseIsContainer
+{
+    public function getTargetField(): string
+    {
+        return 'content_type_is_container_b';
+    }
+}
diff --git a/src/lib/Query/Location/CriterionVisitor/IsContainer.php b/src/lib/Query/Location/CriterionVisitor/IsContainer.php
new file mode 100644
index 00000000..5f21b5e5
--- /dev/null
+++ b/src/lib/Query/Location/CriterionVisitor/IsContainer.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Solr\Query\Location\CriterionVisitor;
+
+use Ibexa\Solr\Query\Common\CriterionVisitor\BaseIsContainer;
+
+/**
+ * @internal
+ */
+final class IsContainer extends BaseIsContainer
+{
+    public function getTargetField(): string
+    {
+        return 'is_container_b';
+    }
+}
diff --git a/src/lib/Resources/config/container/solr/criterion_visitors.yml b/src/lib/Resources/config/container/solr/criterion_visitors.yml
index 7ab6c403..399a903f 100644
--- a/src/lib/Resources/config/container/solr/criterion_visitors.yml
+++ b/src/lib/Resources/config/container/solr/criterion_visitors.yml
@@ -241,6 +241,10 @@ services:
             - {name: ibexa.search.solr.query.content.criterion.visitor}
             - {name: ibexa.search.solr.query.location.criterion.visitor}
 
+    Ibexa\Solr\Query\Content\CriterionVisitor\IsContainer:
+        tags:
+            - { name: ibexa.search.solr.query.content.criterion.visitor }
+
     # Location search
     Ibexa\Solr\Query\Location\CriterionVisitor\Ancestor:
         tags:
@@ -291,6 +295,10 @@ services:
         tags:
             - {name: ibexa.search.solr.query.location.criterion.visitor}
 
+    Ibexa\Solr\Query\Location\CriterionVisitor\IsContainer:
+        tags:
+            - { name: ibexa.search.solr.query.location.criterion.visitor }
+
     Ibexa\Solr\Query\Location\CriterionVisitor\Factory\LocationFullTextFactory:
         parent: Ibexa\Solr\Query\Common\CriterionVisitor\Factory\FullTextFactoryAbstract
 
diff --git a/src/lib/Resources/config/container/solr/field_mappers.yml b/src/lib/Resources/config/container/solr/field_mappers.yml
index 234a2ad3..cbf481c8 100644
--- a/src/lib/Resources/config/container/solr/field_mappers.yml
+++ b/src/lib/Resources/config/container/solr/field_mappers.yml
@@ -58,6 +58,7 @@ services:
     Ibexa\Solr\FieldMapper\LocationFieldMapper\LocationDocumentBaseFields:
         arguments:
             - '@Ibexa\Contracts\Core\Persistence\Content\Handler'
+            - '@Ibexa\Contracts\Core\Persistence\Content\Type\Handler'
         tags:
             - {name: ibexa.search.solr.field.mapper.location}