diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 17e1acdf54..b970075b85 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -182,10 +182,19 @@ jobs:
             -   name: Convert code_samples usages for comment
                 if: steps.list.outputs.CODE_SAMPLES_CHANGE != '' && steps.diff.outputs.CODE_SAMPLES_DIFF != '0'
                 run: |
-                    echo '# code_samples/ change report' >> code_samples_usage.diff.md
+                    title='# code_samples/ change report'
+                    link='<a href="${{ steps.artifact.outputs.artifact-url }}">Download colorized diff</a>'
+                    echo "$title" > code_samples_usage.diff.md
                     echo '' >> code_samples_usage.diff.md
                     php tools/code_samples/code_samples_usage_diff2html.php $HOME/code_samples_usage.diff >> code_samples_usage.diff.md
-                    echo '<a href="${{ steps.artifact.outputs.artifact-url }}">Download colorized diff</a>' >> code_samples_usage.diff.md
+                    echo "$link" >> code_samples_usage.diff.md
+                    if [[ `wc -m < code_samples_usage.diff.md | xargs` -ge $((2**16)) ]]; then
+                        echo "$title" > code_samples_usage.diff.md
+                        echo '' >> code_samples_usage.diff.md
+                        echo "Report's diff is too long to be displayed in a comment." >> code_samples_usage.diff.md
+                        echo '' >> code_samples_usage.diff.md
+                        echo "$link" >> code_samples_usage.diff.md
+                    fi
             -   name: Find Comment
                 id: find-comment
                 uses: peter-evans/find-comment@v3
diff --git a/code_samples/search/custom/config/aggregation_services.yaml b/code_samples/search/custom/config/aggregation_services.yaml
new file mode 100644
index 0000000000..ebfa0074f1
--- /dev/null
+++ b/code_samples/search/custom/config/aggregation_services.yaml
@@ -0,0 +1,49 @@
+services:
+    app.search.solr.query.aggregation_visitor.priority_range_aggregation:
+        class: Ibexa\Solr\Query\Common\AggregationVisitor\RangeAggregationVisitor
+        factory: [ '@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\SearchFieldAggregationVisitorFactory', 'createRangeAggregationVisitor' ]
+        arguments:
+            $aggregationClass: 'App\Query\Aggregation\Solr\PriorityRangeAggregation'
+            $searchIndexFieldName: 'priority_i'
+        tags:
+            - { name: ibexa.search.solr.query.location.aggregation.visitor }
+
+    app.search.elasticsearch.query.aggregation_visitor.priority_range_aggregation:
+        class: Ibexa\Elasticsearch\Query\AggregationVisitor\RangeAggregationVisitor
+        factory: [ '@Ibexa\Elasticsearch\Query\AggregationVisitor\Factory\SearchFieldAggregationVisitorFactory', 'createRangeAggregationVisitor' ]
+        arguments:
+            $aggregationClass: 'App\Query\Aggregation\Elasticsearch\PriorityRangeAggregation'
+            $searchIndexFieldName: 'priority_i'
+        tags:
+            - { name: ibexa.search.elasticsearch.query.location.aggregation.visitor }
+
+    app.search.solr.query.aggregation_result_extractor.priority_range_aggregation:
+        class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor
+        arguments:
+            $aggregationClass: 'App\Query\Aggregation\Solr\PriorityRangeAggregation'
+            $keyMapper: 'Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper\IntRangeAggregationKeyMapper'
+        tags:
+            - { name: ibexa.search.solr.query.location.aggregation.result.extractor }
+
+    app.search.elasticsearch.query.aggregation_result_extractor.priority_range_aggregation:
+        class: Ibexa\Elasticsearch\Query\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor
+        arguments:
+            $aggregationClass: 'App\Query\Aggregation\Elasticsearch\PriorityRangeAggregation'
+        tags:
+            - { name: ibexa.search.elasticsearch.query.location.aggregation.result.extractor }
+
+    App\Query\Aggregation\Solr\PriorityRangeAggregationVisitor:
+        tags:
+            - { name: ibexa.search.solr.query.location.aggregation.visitor }
+
+    App\Query\Aggregation\Solr\PriorityRangeAggregationResultExtractor:
+        tags:
+            - { name: ibexa.search.solr.query.location.aggregation.result.extractor }
+
+    App\Query\Aggregation\Elasticsearch\PriorityRangeAggregationVisitor:
+        tags:
+            - { name: ibexa.search.elasticsearch.query.location.aggregation.visitor }
+
+    App\Query\Aggregation\Elasticsearch\PriorityRangeAggregationResultExtractor:
+        tags:
+            - { name: ibexa.search.elasticsearch.query.location.aggregation.result.extractor }
diff --git a/code_samples/search/elasticsearch/config/criterion_services.yaml b/code_samples/search/custom/config/criterion_services.yaml
similarity index 53%
rename from code_samples/search/elasticsearch/config/criterion_services.yaml
rename to code_samples/search/custom/config/criterion_services.yaml
index 7c27ead21e..5619798150 100644
--- a/code_samples/search/elasticsearch/config/criterion_services.yaml
+++ b/code_samples/search/custom/config/criterion_services.yaml
@@ -1,4 +1,9 @@
 services:
+    App\Query\Criterion\Solr\CameraManufacturerVisitor:
+        tags:
+            - { name: ibexa.search.solr.query.content.criterion.visitor }
+            - { name: ibexa.search.solr.query.location.criterion.visitor }
+
     App\Query\Criterion\Elasticsearch\CameraManufacturerVisitor:
         tags:
             - { name: ibexa.search.elasticsearch.query.content.criterion.visitor }
diff --git a/code_samples/search/solr/config/field_mapper_services.yaml b/code_samples/search/custom/config/field_mapper_services.yaml
similarity index 100%
rename from code_samples/search/solr/config/field_mapper_services.yaml
rename to code_samples/search/custom/config/field_mapper_services.yaml
diff --git a/code_samples/search/elasticsearch/config/group_resolver_services.yaml b/code_samples/search/custom/config/group_resolver_services.yaml
similarity index 100%
rename from code_samples/search/elasticsearch/config/group_resolver_services.yaml
rename to code_samples/search/custom/config/group_resolver_services.yaml
diff --git a/code_samples/search/elasticsearch/config/packages/elasticsearch-en.yaml b/code_samples/search/custom/config/packages/elasticsearch-en.yaml
similarity index 100%
rename from code_samples/search/elasticsearch/config/packages/elasticsearch-en.yaml
rename to code_samples/search/custom/config/packages/elasticsearch-en.yaml
diff --git a/code_samples/search/elasticsearch/config/packages/elasticsearch.yaml b/code_samples/search/custom/config/packages/elasticsearch.yaml
similarity index 100%
rename from code_samples/search/elasticsearch/config/packages/elasticsearch.yaml
rename to code_samples/search/custom/config/packages/elasticsearch.yaml
diff --git a/code_samples/search/elasticsearch/config/sort_clause_services.yaml b/code_samples/search/custom/config/sort_clause_services.yaml
similarity index 53%
rename from code_samples/search/elasticsearch/config/sort_clause_services.yaml
rename to code_samples/search/custom/config/sort_clause_services.yaml
index 7abda53e29..835bb47150 100644
--- a/code_samples/search/elasticsearch/config/sort_clause_services.yaml
+++ b/code_samples/search/custom/config/sort_clause_services.yaml
@@ -1,4 +1,9 @@
 services:
+    App\Query\SortClause\Solr\ScoreVisitor:
+        tags:
+            - { name: ibexa.search.solr.query.content.sort_clause.visitor }
+            - { name: ibexa.search.solr.query.location.sort_clause.visitor }
+
     App\Query\SortClause\Elasticsearch\ScoreVisitor:
         tags:
             - { name: ibexa.search.elasticsearch.query.content.sort_clause.visitor }
diff --git a/code_samples/search/custom/src/EventSubscriber/CustomIndexDataSubscriber.php b/code_samples/search/custom/src/EventSubscriber/CustomIndexDataSubscriber.php
new file mode 100644
index 0000000000..02d216cdf0
--- /dev/null
+++ b/code_samples/search/custom/src/EventSubscriber/CustomIndexDataSubscriber.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\EventSubscriber;
+
+use Ibexa\Contracts\Core\Search\Field;
+use Ibexa\Contracts\Core\Search\FieldType\StringField;
+use Ibexa\Contracts\Elasticsearch\Mapping\Event\ContentIndexCreateEvent;
+use Ibexa\Contracts\Elasticsearch\Mapping\Event\LocationIndexCreateEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+final class CustomIndexDataSubscriber implements EventSubscriberInterface
+{
+    public function onContentDocumentCreate(ContentIndexCreateEvent $event): void
+    {
+        $document = $event->getDocument();
+        $document->fields[] = new Field(
+            'custom_field',
+            'Custom field value',
+            new StringField()
+        );
+    }
+
+    public function onLocationDocumentCreate(LocationIndexCreateEvent $event): void
+    {
+        $document = $event->getDocument();
+        $document->fields[] = new Field(
+            'custom_field',
+            'Custom field value',
+            new StringField()
+        );
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            ContentIndexCreateEvent::class => 'onContentDocumentCreate',
+            LocationIndexCreateEvent::class => 'onLocationDocumentCreate',
+        ];
+    }
+}
diff --git a/code_samples/search/custom/src/EventSubscriber/CustomQueryFilterSubscriber.php b/code_samples/search/custom/src/EventSubscriber/CustomQueryFilterSubscriber.php
new file mode 100644
index 0000000000..fbe91a3be3
--- /dev/null
+++ b/code_samples/search/custom/src/EventSubscriber/CustomQueryFilterSubscriber.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\EventSubscriber;
+
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalAnd;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ObjectStateIdentifier;
+use Ibexa\Contracts\ElasticSearch\Query\Event\QueryFilterEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+final class CustomQueryFilterSubscriber implements EventSubscriberInterface
+{
+    public function onQueryFilter(QueryFilterEvent $event): void
+    {
+        $query = $event->getQuery();
+
+        $additionalCriteria = new ObjectStateIdentifier('locked');
+
+        if ($query->filter !== null) {
+            $query->filter = $additionalCriteria;
+        } else {
+            // Append Criterion to existing filter
+            $query->filter = new LogicalAnd([
+                $query->filter,
+                $additionalCriteria,
+            ]);
+        }
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            QueryFilterEvent::class => 'onQueryFilter',
+        ];
+    }
+}
diff --git a/code_samples/search/elasticsearch/src/GroupResolver/ContentTypeGroupGroupResolver.php b/code_samples/search/custom/src/GroupResolver/ContentTypeGroupGroupResolver.php
similarity index 100%
rename from code_samples/search/elasticsearch/src/GroupResolver/ContentTypeGroupGroupResolver.php
rename to code_samples/search/custom/src/GroupResolver/ContentTypeGroupGroupResolver.php
diff --git a/code_samples/search/elasticsearch/src/Query/Aggregation/Elasticsearch/PriorityAggregationResultExtractor.php b/code_samples/search/custom/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregationResultExtractor.php
similarity index 88%
rename from code_samples/search/elasticsearch/src/Query/Aggregation/Elasticsearch/PriorityAggregationResultExtractor.php
rename to code_samples/search/custom/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregationResultExtractor.php
index 05ac000d36..ab64e1be3f 100644
--- a/code_samples/search/elasticsearch/src/Query/Aggregation/Elasticsearch/PriorityAggregationResultExtractor.php
+++ b/code_samples/search/custom/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregationResultExtractor.php
@@ -4,12 +4,13 @@
 
 namespace App\Query\Aggregation\Elasticsearch;
 
+use App\Query\Aggregation\PriorityRangeAggregation;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation;
 use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult;
 use Ibexa\Contracts\Elasticsearch\Query\AggregationResultExtractor;
 use Ibexa\Contracts\Elasticsearch\Query\LanguageFilter;
 
-final class PriorityAggregationResultExtractor implements AggregationResultExtractor
+final class PriorityRangeAggregationResultExtractor implements AggregationResultExtractor
 {
     public function supports(Aggregation $aggregation, LanguageFilter $languageFilter): bool
     {
diff --git a/code_samples/search/elasticsearch/src/Query/Aggregation/Elasticsearch/PriorityAggregationVisitor.php b/code_samples/search/custom/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregationVisitor.php
similarity index 87%
rename from code_samples/search/elasticsearch/src/Query/Aggregation/Elasticsearch/PriorityAggregationVisitor.php
rename to code_samples/search/custom/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregationVisitor.php
index 10e4da76aa..36c5b2b800 100644
--- a/code_samples/search/elasticsearch/src/Query/Aggregation/Elasticsearch/PriorityAggregationVisitor.php
+++ b/code_samples/search/custom/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregationVisitor.php
@@ -4,11 +4,12 @@
 
 namespace App\Query\Aggregation\Elasticsearch;
 
+use App\Query\Aggregation\PriorityRangeAggregation;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation;
 use Ibexa\Contracts\Elasticsearch\Query\AggregationVisitor;
 use Ibexa\Contracts\Elasticsearch\Query\LanguageFilter;
 
-final class PriorityAggregationVisitor implements AggregationVisitor
+final class PriorityRangeAggregationVisitor implements AggregationVisitor
 {
     public function supports(Aggregation $aggregation, LanguageFilter $languageFilter): bool
     {
@@ -16,7 +17,7 @@ public function supports(Aggregation $aggregation, LanguageFilter $languageFilte
     }
 
     /**
-     * @param PriorityRangeAggregation $aggregation
+     * @param \App\Query\Aggregation\PriorityRangeAggregation $aggregation
      */
     public function visit(AggregationVisitor $dispatcher, Aggregation $aggregation, LanguageFilter $languageFilter): array
     {
diff --git a/code_samples/search/solr/src/Query/Aggregation/Solr/PriorityRangeAggregation.php b/code_samples/search/custom/src/Query/Aggregation/PriorityRangeAggregation.php
similarity index 89%
rename from code_samples/search/solr/src/Query/Aggregation/Solr/PriorityRangeAggregation.php
rename to code_samples/search/custom/src/Query/Aggregation/PriorityRangeAggregation.php
index 78aff43266..8f65e1794b 100644
--- a/code_samples/search/solr/src/Query/Aggregation/Solr/PriorityRangeAggregation.php
+++ b/code_samples/search/custom/src/Query/Aggregation/PriorityRangeAggregation.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Query\Aggregation\Solr;
+namespace App\Query\Aggregation;
 
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\LocationAggregation;
diff --git a/code_samples/search/solr/src/Query/Aggregation/Solr/PriorityAggregationResultExtractor.php b/code_samples/search/custom/src/Query/Aggregation/Solr/PriorityRangeAggregationResultExtractor.php
similarity index 90%
rename from code_samples/search/solr/src/Query/Aggregation/Solr/PriorityAggregationResultExtractor.php
rename to code_samples/search/custom/src/Query/Aggregation/Solr/PriorityRangeAggregationResultExtractor.php
index 10567f6829..ba87eda5cf 100644
--- a/code_samples/search/solr/src/Query/Aggregation/Solr/PriorityAggregationResultExtractor.php
+++ b/code_samples/search/custom/src/Query/Aggregation/Solr/PriorityRangeAggregationResultExtractor.php
@@ -4,6 +4,7 @@
 
 namespace App\Query\Aggregation\Solr;
 
+use App\Query\Aggregation\PriorityRangeAggregation;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range;
 use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult;
@@ -12,7 +13,7 @@
 use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor;
 use stdClass;
 
-final class PriorityAggregationResultExtractor implements AggregationResultExtractor
+final class PriorityRangeAggregationResultExtractor implements AggregationResultExtractor
 {
     public function canVisit(Aggregation $aggregation, array $languageFilter): bool
     {
diff --git a/code_samples/search/solr/src/Query/Aggregation/Solr/PriorityRangeAggregationVisitor.php b/code_samples/search/custom/src/Query/Aggregation/Solr/PriorityRangeAggregationVisitor.php
similarity index 96%
rename from code_samples/search/solr/src/Query/Aggregation/Solr/PriorityRangeAggregationVisitor.php
rename to code_samples/search/custom/src/Query/Aggregation/Solr/PriorityRangeAggregationVisitor.php
index 06e77f63ea..d78f1a58f6 100644
--- a/code_samples/search/solr/src/Query/Aggregation/Solr/PriorityRangeAggregationVisitor.php
+++ b/code_samples/search/custom/src/Query/Aggregation/Solr/PriorityRangeAggregationVisitor.php
@@ -4,6 +4,7 @@
 
 namespace App\Query\Aggregation\Solr;
 
+use App\Query\Aggregation\PriorityRangeAggregation;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation;
 use Ibexa\Contracts\Solr\Query\AggregationVisitor;
 
diff --git a/code_samples/search/solr/src/Query/Criterion/Solr/CameraManufacturerCriterion.php b/code_samples/search/custom/src/Query/Criterion/CameraManufacturerCriterion.php
similarity index 96%
rename from code_samples/search/solr/src/Query/Criterion/Solr/CameraManufacturerCriterion.php
rename to code_samples/search/custom/src/Query/Criterion/CameraManufacturerCriterion.php
index e881c45df4..91f3456369 100644
--- a/code_samples/search/solr/src/Query/Criterion/Solr/CameraManufacturerCriterion.php
+++ b/code_samples/search/custom/src/Query/Criterion/CameraManufacturerCriterion.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Query\Criterion\Solr;
+namespace App\Query\Criterion;
 
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator;
diff --git a/code_samples/search/elasticsearch/src/Query/Criterion/Elasticsearch/CameraManufacturerVisitor.php b/code_samples/search/custom/src/Query/Criterion/Elasticsearch/CameraManufacturerVisitor.php
similarity index 86%
rename from code_samples/search/elasticsearch/src/Query/Criterion/Elasticsearch/CameraManufacturerVisitor.php
rename to code_samples/search/custom/src/Query/Criterion/Elasticsearch/CameraManufacturerVisitor.php
index ea9070b40d..142990bbd7 100644
--- a/code_samples/search/elasticsearch/src/Query/Criterion/Elasticsearch/CameraManufacturerVisitor.php
+++ b/code_samples/search/custom/src/Query/Criterion/Elasticsearch/CameraManufacturerVisitor.php
@@ -4,6 +4,7 @@
 
 namespace App\Query\Criterion\Elasticsearch;
 
+use App\Query\Criterion\CameraManufacturerCriterion;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\CriterionInterface;
 use Ibexa\Contracts\Elasticsearch\Query\CriterionVisitor;
 use Ibexa\Contracts\Elasticsearch\Query\LanguageFilter;
@@ -16,7 +17,7 @@ public function supports(CriterionInterface $criterion, LanguageFilter $language
     }
 
     /**
-     * @param \App\Query\Criterion\Elasticsearch\CameraManufacturerCriterion $criterion
+     * @param \App\Query\Criterion\CameraManufacturerCriterion $criterion
      */
     public function visit(CriterionVisitor $dispatcher, CriterionInterface $criterion, LanguageFilter $languageFilter): array
     {
diff --git a/code_samples/search/solr/src/Query/Criterion/Solr/CameraManufacturerVisitor.php b/code_samples/search/custom/src/Query/Criterion/Solr/CameraManufacturerVisitor.php
similarity index 86%
rename from code_samples/search/solr/src/Query/Criterion/Solr/CameraManufacturerVisitor.php
rename to code_samples/search/custom/src/Query/Criterion/Solr/CameraManufacturerVisitor.php
index c45f1a16bf..f385d5db1d 100644
--- a/code_samples/search/solr/src/Query/Criterion/Solr/CameraManufacturerVisitor.php
+++ b/code_samples/search/custom/src/Query/Criterion/Solr/CameraManufacturerVisitor.php
@@ -4,6 +4,7 @@
 
 namespace App\Query\Criterion\Solr;
 
+use App\Query\Criterion\CameraManufacturerCriterion;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\CriterionInterface;
 use Ibexa\Contracts\Solr\Query\CriterionVisitor;
 
@@ -15,7 +16,7 @@ public function canVisit(CriterionInterface $criterion)
     }
 
     /**
-     * @param \App\Query\Criterion\Solr\CameraManufacturerCriterion $criterion
+     * @param \App\Query\Criterion\CameraManufacturerCriterion $criterion
      */
     public function visit(CriterionInterface $criterion, CriterionVisitor $subVisitor = null)
     {
diff --git a/code_samples/search/elasticsearch/src/Query/SortClause/Elasticsearch/ScoreVisitor.php b/code_samples/search/custom/src/Query/SortClause/Elasticsearch/ScoreVisitor.php
similarity index 95%
rename from code_samples/search/elasticsearch/src/Query/SortClause/Elasticsearch/ScoreVisitor.php
rename to code_samples/search/custom/src/Query/SortClause/Elasticsearch/ScoreVisitor.php
index abc2e906e2..45a35b808c 100644
--- a/code_samples/search/elasticsearch/src/Query/SortClause/Elasticsearch/ScoreVisitor.php
+++ b/code_samples/search/custom/src/Query/SortClause/Elasticsearch/ScoreVisitor.php
@@ -4,6 +4,7 @@
 
 namespace App\Query\SortClause\Elasticsearch;
 
+use App\Query\SortClause\ScoreSortClause;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause;
 use Ibexa\Contracts\Elasticsearch\Query\LanguageFilter;
diff --git a/code_samples/search/solr/src/Query/SortClause/Solr/ScoreSortClause.php b/code_samples/search/custom/src/Query/SortClause/ScoreSortClause.php
similarity index 90%
rename from code_samples/search/solr/src/Query/SortClause/Solr/ScoreSortClause.php
rename to code_samples/search/custom/src/Query/SortClause/ScoreSortClause.php
index 0ae2d69f02..8c316c18ef 100644
--- a/code_samples/search/solr/src/Query/SortClause/Solr/ScoreSortClause.php
+++ b/code_samples/search/custom/src/Query/SortClause/ScoreSortClause.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Query\SortClause\Solr;
+namespace App\Query\SortClause;
 
 use Ibexa\Contracts\Core\Repository\Values\Content\Query;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause;
diff --git a/code_samples/search/solr/src/Query/SortClause/Solr/ScoreVisitor.php b/code_samples/search/custom/src/Query/SortClause/Solr/ScoreVisitor.php
similarity index 82%
rename from code_samples/search/solr/src/Query/SortClause/Solr/ScoreVisitor.php
rename to code_samples/search/custom/src/Query/SortClause/Solr/ScoreVisitor.php
index e38bfd2fc0..0daa03ad69 100644
--- a/code_samples/search/solr/src/Query/SortClause/Solr/ScoreVisitor.php
+++ b/code_samples/search/custom/src/Query/SortClause/Solr/ScoreVisitor.php
@@ -4,6 +4,7 @@
 
 namespace App\Query\SortClause\Solr;
 
+use App\Query\SortClause\ScoreSortClause;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause;
 use Ibexa\Contracts\Solr\Query\SortClauseVisitor;
 
@@ -11,7 +12,7 @@ class ScoreVisitor extends SortClauseVisitor
 {
     public function canVisit(SortClause $sortClause): bool
     {
-        return $sortClause instanceof SortClause\Score;
+        return $sortClause instanceof ScoreSortClause;
     }
 
     public function visit(SortClause $sortClause): string
diff --git a/code_samples/search/solr/src/Search/FieldMapper/WebinarEventTitleFulltextFieldMapper.php b/code_samples/search/custom/src/Search/FieldMapper/WebinarEventTitleFulltextFieldMapper.php
similarity index 100%
rename from code_samples/search/solr/src/Search/FieldMapper/WebinarEventTitleFulltextFieldMapper.php
rename to code_samples/search/custom/src/Search/FieldMapper/WebinarEventTitleFulltextFieldMapper.php
diff --git a/code_samples/search/elasticsearch/config/aggregation_services.yaml b/code_samples/search/elasticsearch/config/aggregation_services.yaml
deleted file mode 100644
index c1ff03481a..0000000000
--- a/code_samples/search/elasticsearch/config/aggregation_services.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-services:
-    App\Query\Aggregation\Elasticsearch\PriorityAggregationVisitor:
-        tags:
-            - { name: ibexa.search.elasticsearch.query.location.aggregation.visitor }
-            - { name: ibexa.search.elasticsearch.query.content.aggregation.visitor }
-    
-    App\Query\Aggregation\Elasticsearch\PriorityAggregationResultExtractor:
-        tags:
-            - { name: ibexa.search.elasticsearch.query.location.aggregation.result.extractor }
-            - { name: ibexa.search.elasticsearch.query.content.aggregation.result.extractor }
diff --git a/code_samples/search/elasticsearch/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregation.php b/code_samples/search/elasticsearch/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregation.php
deleted file mode 100644
index 986b86e09c..0000000000
--- a/code_samples/search/elasticsearch/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregation.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Query\Aggregation\Elasticsearch;
-
-use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation;
-use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\LocationAggregation;
-
-final class PriorityRangeAggregation extends AbstractRangeAggregation implements LocationAggregation
-{
-}
diff --git a/code_samples/search/elasticsearch/src/Query/Criterion/Elasticsearch/CameraManufacturerCriterion.php b/code_samples/search/elasticsearch/src/Query/Criterion/Elasticsearch/CameraManufacturerCriterion.php
deleted file mode 100644
index 139f2a2174..0000000000
--- a/code_samples/search/elasticsearch/src/Query/Criterion/Elasticsearch/CameraManufacturerCriterion.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Query\Criterion\Elasticsearch;
-
-use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
-use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator;
-use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator\Specifications;
-
-final class CameraManufacturerCriterion extends Criterion
-{
-    /**
-     * @param string|string[] $value One or more manufacturer names that must be matched.
-     */
-    public function __construct($value)
-    {
-        parent::__construct(null, null, $value);
-    }
-
-    public function getSpecifications(): array
-    {
-        return [
-            new Specifications(
-                Operator::IN,
-                Specifications::FORMAT_ARRAY,
-                Specifications::TYPE_STRING
-            ),
-            new Specifications(
-                Operator::EQ,
-                Specifications::FORMAT_SINGLE,
-                Specifications::TYPE_STRING
-            ),
-        ];
-    }
-}
diff --git a/code_samples/search/elasticsearch/src/Query/SortClause/Elasticsearch/ScoreSortClause.php b/code_samples/search/elasticsearch/src/Query/SortClause/Elasticsearch/ScoreSortClause.php
deleted file mode 100644
index a0b005f8da..0000000000
--- a/code_samples/search/elasticsearch/src/Query/SortClause/Elasticsearch/ScoreSortClause.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Query\SortClause\Elasticsearch;
-
-use Ibexa\Contracts\Core\Repository\Values\Content\Query;
-use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause;
-
-final class ScoreSortClause extends SortClause
-{
-    public function __construct(string $sortDirection = Query::SORT_ASC)
-    {
-        parent::__construct('_score', $sortDirection);
-    }
-}
diff --git a/code_samples/search/solr/config/aggregation_services.yaml b/code_samples/search/solr/config/aggregation_services.yaml
deleted file mode 100644
index d9d63436a1..0000000000
--- a/code_samples/search/solr/config/aggregation_services.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-services:
-    App\Query\Aggregation\Solr\PriorityRangeAggregationVisitor:
-        tags:
-            - { name: ibexa.search.solr.query.location.aggregation.visitor }
-            - { name: ibexa.search.solr.query.content.aggregation.visitor }
-
-    App\Query\Aggregation\Solr\PriorityAggregationResultExtractor:
-        tags:
-            - { name: ibexa.search.solr.query.location.aggregation.result.extractor }
-            - { name: ibexa.search.solr.query.content.aggregation.result.extractor }
diff --git a/code_samples/search/solr/config/criterion_services.yaml b/code_samples/search/solr/config/criterion_services.yaml
deleted file mode 100644
index 908fd15615..0000000000
--- a/code_samples/search/solr/config/criterion_services.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-services:
-    App\Query\Criterion\Solr\CameraManufacturerVisitor:
-        tags:
-            - { name: ibexa.search.solr.query.content.criterion.visitor }
-            - { name: ibexa.search.solr.query.location.criterion.visitor }
diff --git a/code_samples/search/solr/config/sort_clause_services.yaml b/code_samples/search/solr/config/sort_clause_services.yaml
deleted file mode 100644
index f68e288cac..0000000000
--- a/code_samples/search/solr/config/sort_clause_services.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-services:
-    App\Query\SortClause\Solr\ScoreVisitor:
-        tags:
-            - { name: ibexa.search.solr.query.content.sort_clause.visitor }
-            - { name: ibexa.search.solr.query.location.sort_clause.visitor }
diff --git a/docs/search/extensibility/create_custom_aggregation.md b/docs/search/extensibility/create_custom_aggregation.md
index 59120b6786..b89d82443c 100644
--- a/docs/search/extensibility/create_custom_aggregation.md
+++ b/docs/search/extensibility/create_custom_aggregation.md
@@ -4,39 +4,31 @@ description: Create custom Aggregation to use with Solr and Elasticsearch search
 
 # Create custom Aggregation
 
+## Create aggregation class
+
 To create a custom Aggregation, create an aggregation class.
 In the following example, an aggregation groups the location query results by the location priority:
 
-=== "Solr"
-
-    ``` php
-    --8<--
-    code_samples/search/solr/src/Query/Aggregation/Solr/PriorityRangeAggregation.php
-    --8<--
-    ```
-
-=== "Elasticsearch"
-
-    ``` php
-    --8<--
-    code_samples/search/elasticsearch/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregation.php
-    --8<--
-    ```
+``` php
+--8<--
+code_samples/search/custom/src/Query/Aggregation/PriorityRangeAggregation.php
+--8<--
+```
 
 The `PriorityRangeAggregation` class extends `AbstractRangeAggregation`.
 The name of the class indicates that it aggregates the results by using the Range aggregation.
 
-An aggregation must implement the `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation` interface or inherit one of following abstract classes:
+An aggregation must implement the [`Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation.html) interface or inherit one of following abstract classes:
 
-- `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation`
-- `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation`
-- `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation`
+- [`Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-AbstractRangeAggregation.html)
+- [`Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-AbstractStatsAggregation.html)
+- [`Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-AbstractTermAggregation.html)
 
 An aggregation can also implement one of the following interfaces:
 
-- `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\FieldAggregation`, based on content field
-- `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\LocationAggregation`, based on content location
-- `Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawAggregation`, based on details of the index structure
+- [`Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\FieldAggregation`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-FieldAggregation.html), based on content field
+- [`Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\LocationAggregation`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-LocationAggregation.html), based on content location
+- [`Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawAggregation`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Aggregation-RawAggregation.html), based on details of the index structure
 
 !!! note "Aggregation definition"
 
@@ -55,29 +47,15 @@ The example below uses `RangeAggregationVisitor`:
 === "Solr"
 
     ``` yaml
-    app.search.solr.query.aggregation_visitor.priority_range_aggregation:
-        class: Ibexa\Solr\Query\Common\AggregationVisitor\RangeAggregationVisitor
-        factory: [ '@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\ContentFieldAggregationVisitorFactory', 'createRangeAggregationVisitor' ]
-        arguments:
-            $aggregationClass: 'App\Query\Aggregation\Solr\PriorityRangeAggregation'
-            $searchIndexFieldName: 'priority_i'
-        tags:
-            - { name: ibexa.search.solr.query.content.aggregation.visitor }
-            - { name: ibexa.search.solr.query.location.aggregation.visitor }
+    services:
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 1, 9) =]]
     ```
 
 === "Elasticsearch"
 
     ``` yaml
-    app.search.elasticsearch.query.aggregation_visitor.priority_range_aggregation:
-        class: Ibexa\Elasticsearch\Query\AggregationVisitor\RangeAggregationVisitor
-        factory: [ '@Ibexa\Elasticsearch\Query\AggregationVisitor\Factory\SearchFieldAggregationVisitorFactory', 'createRangeAggregationVisitor' ]
-        arguments:
-            $aggregationClass: 'App\Query\Aggregation\Elasticsearch\PriorityRangeAggregation'
-            $searchIndexFieldName: 'priority_i'
-        tags:
-            - { name: ibexa.search.elasticsearch.query.location.aggregation.visitor }
-            - { name: ibexa.search.elasticsearch.query.content.aggregation.visitor }
+    services:
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 10, 18) =]]
     ```
 
 The visitor is created by `SearchFieldAggregationVisitorFactory`.
@@ -86,13 +64,20 @@ You provide it with two arguments:
 - The aggregation class in `aggregationClass`
 - The field name in search index in `searchIndexFieldName`
 
+In this example, the field is `priority_i` which exists only for locations.
+
 === "Solr"
 
     Tag the service with `ibexa.search.solr.query.location.aggregation.visitor`.
 
+    For content-based aggregations, use the `ibexa.search.solr.query.content.aggregation.visitor` tag.
+
 === "Elasticsearch"
 
-    Tag the service with `ibexa.elasticsearch.query.location.aggregation_visitor`.
+    Tag the service with `ibexa.search.elasticsearch.query.location.aggregation_visitor`.
+
+    For content-based aggregations, use the `ibexa.search.elasticsearch.query.content.aggregation.visitor` tag.
+
 
 For the result extractor, you can use the built-in `RangeAggregationResultExtractor` and provide it with the aggregation class in the `aggregationClass` parameter.
 
@@ -100,49 +85,50 @@ For the result extractor, you can use the built-in `RangeAggregationResultExtrac
 
     Tag the service with `ibexa.search.solr.query.location.aggregation.result.extractor`.
 
+    As `$keyMapper` to transform raw keys into more usable objects or scalar values, use `IntRangeAggregationKeyMapper`
+    or create your own implementing [`RangeAggregationKeyMapper`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Solr-ResultExtractor-AggregationResultExtractor-RangeAggregationKeyMapper.html).
+
     ``` yaml
-    app.search.solr.query.aggregation_result_extractor.priority_range_aggregation:
-        class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor
-        arguments:
-            $aggregationClass: 'App\Query\Aggregation\Solr\PriorityRangeAggregation'
-            $keyMapper: 'Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper\IntRangeAggregationKeyMapper'
-        tags:
-            - { name: ibexa.search.solr.query.location.aggregation.result.extractor }
-            - { name: ibexa.search.solr.query.content.aggregation.result.extractor }
+    services:
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 19, 26) =]]
     ```
 
+    For other cases, a [`TermAggregationKeyMapper`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Solr-ResultExtractor-AggregationResultExtractor-TermAggregationKeyMapper.html) interface is also available.
+
 === "Elasticsearch"
 
     Tag the service with `ibexa.search.elasticsearch.query.location.aggregation.result.extractor`.
 
     ``` yaml
-    app.search.elasticsearch.query.aggregation_result_extractor.priority_range_aggregation:
-        class: Ibexa\Elasticsearch\Query\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor
-        arguments:
-            $aggregationClass: 'App\Query\Aggregation\Elasticsearch\PriorityRangeAggregation'
-        tags:
-            - { name: ibexa.search.elasticsearch.query.location.aggregation.result.extractor }
-            - { name: ibexa.search.elasticsearch.query.content.aggregation.result.extractor }
+    services:
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 27, 33) =]]
     ```
 
 You can use a different type of aggregation, followed by respective visitor and extractor classes:
 
 === "Solr"
 
-    - `Ibexa\Solr\Query\Common\AggregationVisitor\StatsAggregationVisitor`
-    - `Ibexa\Solr\Query\Common\AggregationVisitor\TermAggregationVisitor`
-    - `Ibexa\Solr\ResultExtractor\AggregationResultExtractor\StatsAggregationResultExtractor`
-    - `Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor`
+    - Range
+        - `Ibexa\Solr\Query\Common\AggregationVisitor\RangeAggregationVisitor`
+        - `Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor`
+    - Stats (count, minimum, maximum, average, sum)
+        - `Ibexa\Solr\Query\Common\AggregationVisitor\StatsAggregationVisitor`
+        - `Ibexa\Solr\ResultExtractor\AggregationResultExtractor\StatsAggregationResultExtractor`
+    - Term
+        - `Ibexa\Solr\Query\Common\AggregationVisitor\TermAggregationVisitor`
+        - `Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor`
 
 === "Elasticsearch"
 
-    - `Ibexa\ElasticSearchEngine\Query\AggregationVisitor\RangeAggregationVisitor`
-    - `Ibexa\ElasticSearchEngine\Query\AggregationVisitor\StatsAggregationVisitor`
-    - `Ibexa\ElasticSearchEngine\Query\AggregationVisitor\TermAggregationVisitor`
-
-    - `Ibexa\ElasticSearchEngine\Query\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor`
-    - `Ibexa\ElasticSearchEngine\Query\ResultExtractor\AggregationResultExtractor\StatsAggregationResultExtractor`
-    - `Ibexa\ElasticSearchEngine\Query\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor`
+    - Range
+        - `Ibexa\ElasticSearchEngine\Query\AggregationVisitor\RangeAggregationVisitor`
+        - `Ibexa\ElasticSearchEngine\Query\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor`
+    - Stats (count, minimum, maximum, average, sum)
+        - `Ibexa\ElasticSearchEngine\Query\AggregationVisitor\StatsAggregationVisitor`
+        - `Ibexa\ElasticSearchEngine\Query\ResultExtractor\AggregationResultExtractor\StatsAggregationResultExtractor`
+    - Term
+        - `Ibexa\ElasticSearchEngine\Query\AggregationVisitor\TermAggregationVisitor`
+        - `Ibexa\ElasticSearchEngine\Query\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor`
 
 In a more complex use case, you must create your own visitor and extractor.
 
@@ -150,21 +136,21 @@ In a more complex use case, you must create your own visitor and extractor.
 
 === "Solr"
 
-    The aggregation visitor must implement `Ibexa\Contracts\Solr\Query\AggregationVisitor`:
+    The aggregation visitor must implement [`Ibexa\Contracts\Solr\Query\AggregationVisitor`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Solr-Query-AggregationVisitor.html):
 
     ``` php
     --8<--
-    code_samples/search/solr/src/Query/Aggregation/Solr/PriorityRangeAggregationVisitor.php
+    code_samples/search/custom/src/Query/Aggregation/Solr/PriorityRangeAggregationVisitor.php
     --8<--
     ```
 
 === "Elasticsearch"
 
-    The aggregation visitor must implement `Ibexa\Contracts\ElasticSearchEngine\Query\AggregationVisitor`:
+    The aggregation visitor must implement [`Ibexa\Contracts\ElasticSearchEngine\Query\AggregationVisitor`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Elasticsearch-Query-AggregationVisitor.html):
 
     ``` php
     --8<--
-    code_samples/search/elasticsearch/src/Query/Aggregation/Elasticsearch/PriorityAggregationVisitor.php
+    code_samples/search/custom/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregationVisitor.php
     --8<--
     ```
 
@@ -172,15 +158,40 @@ The `canVisit()` method checks whether the provided aggregation is of the suppor
 
 The `visit()` method returns an array of results.
 
+Finally, register the aggregation visitor as a service.
+
+=== "Solr"
+
+    Tag the aggregation visitor with `ibexa.search.solr.query.location.aggregation.visitor`:
+
+    ``` yaml
+    services:
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 34, 37) =]]
+    ```
+
+    For content-based aggregations, use the `ibexa.search.solr.query.content.aggregation.visitor` tag.
+
+=== "Elasticsearch"
+
+    Tag the aggregation visitor with `ibexa.elasticsearch.query.location.aggregation_visitor`:
+
+    ``` yaml
+    services:
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 42, 45) =]]
+    ```
+
+    For content-based aggregations, use the `ibexa.search.elasticsearch.query.content.aggregation.visitor` tag.
+
+
 ### Create result extractor
 
 === "Solr"
 
-    You must also create a result extractor, which implements  `Ibexa\Solr\ResultExtractor\AggregationResultExtractor` that transforms raw aggregation results from Solr into `AggregationResult` objects:
+    You must also create a result extractor, which implements [`Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Solr-ResultExtractor-AggregationResultExtractor.html) that transforms raw aggregation results from Solr into `AggregationResult` objects:
 
     ``` php
     --8<--
-    code_samples/search/solr/src/Query/Aggregation/Solr/PriorityAggregationResultExtractor.php
+    code_samples/search/custom/src/Query/Aggregation/Solr/PriorityRangeAggregationResultExtractor.php
     --8<--
     ```
 
@@ -190,11 +201,11 @@ The `visit()` method returns an array of results.
 
 === "Elasticsearch"
 
-    You must also create a result extractor, which implements  `Ibexa\Contracts\ElasticSearchEngine\Query\AggregationResultExtractor` that transforms raw aggregation results from Elasticsearch into `AggregationResult` objects:
+    You must also create a result extractor, which implements  [`Ibexa\Contracts\ElasticSearchEngine\Query\AggregationResultExtractor`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Elasticsearch-Query-AggregationResultExtractor.html) that transforms raw aggregation results from Elasticsearch into `AggregationResult` objects:
 
     ``` php
     --8<--
-    code_samples/search/elasticsearch/src/Query/Aggregation/Elasticsearch/PriorityAggregationResultExtractor.php
+    code_samples/search/custom/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregationResultExtractor.php
     --8<--
     ```
 
@@ -203,28 +214,26 @@ The `visit()` method returns an array of results.
     The `extract()` method converts the [raw data provided by the search engine](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations.html) to a `RangeAggregationResult` object.
 
 
-Finally, register both the aggregation visitor and the result extractor as services.
+Finally, register the result extractor as a service.
 
 === "Solr"
 
-    Tag the aggregation visitor with `ibexa.search.solr.query.location.aggregation.visitor` and the result extractor with `ibexa.search.solr.query.location.aggregation.result.extractor`:
+    Tag the result extractor with `ibexa.search.solr.query.location.aggregation.result.extractor`:
 
     ``` yaml
-    --8<--
-    code_samples/search/solr/config/aggregation_services.yaml
-    --8<--
+    services:
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 38, 41) =]]
     ```
 
-    For content-based aggregations, use the `ibexa.search.solr.query.content.aggregation.visitor` and `ibexa.search.solr.query.content.aggregation.result.extractor` tags respectively.
+    For content-based aggregations, use the `ibexa.search.solr.query.content.aggregation.result.extractor` tag.
 
 === "Elasticsearch"
 
-    Tag the aggregation visitor with `ibexa.elasticsearch.query.location.aggregation_visitor` and the result extractor with `ibexa.elasticsearch.query.location.aggregation_result_extractor`:
+    Tag the result extractor with `ibexa.elasticsearch.query.location.aggregation_result_extractor`:
 
     ``` yaml
-    --8<--
-    code_samples/search/elasticsearch/config/aggregation_services.yaml
-    --8<--
+    services:
+    [[= include_file('code_samples/search/custom/config/aggregation_services.yaml', 46, 49) =]]
     ```
 
-    For content-based aggregations, use the `ibexa.search.elasticsearch.query.content.aggregation.visitor` and `ibexa.search.elasticsearch.query.content.aggregation.result.extractor` tags respectively.
+    For content-based aggregations, use the `ibexa.search.elasticsearch.query.content.aggregation.result.extractor` tag.
diff --git a/docs/search/extensibility/create_custom_search_criterion.md b/docs/search/extensibility/create_custom_search_criterion.md
index 7cdd58980b..eea7f735e8 100644
--- a/docs/search/extensibility/create_custom_search_criterion.md
+++ b/docs/search/extensibility/create_custom_search_criterion.md
@@ -10,21 +10,11 @@ To provide support for a custom Search Criterion, do the following.
 
 First, create a `CameraManufacturerCriterion.php` file that contains the Criterion class:
 
-=== "Solr"
-
-    ``` php
-    --8<--
-    code_samples/search/solr/src/Query/Criterion/Solr/CameraManufacturerCriterion.php
-    --8<--
-    ```
-
-=== "Elasticsearch"
-
-    ``` php
-    --8<--
-    code_samples/search/elasticsearch/src/Query/Criterion/Elasticsearch/CameraManufacturerCriterion.php
-    --8<--
-    ```
+``` php
+--8<--
+code_samples/search/custom/src/Query/Criterion/CameraManufacturerCriterion.php
+--8<--
+```
 
 ## Create Criterion visitor
 
@@ -34,7 +24,7 @@ Then, add a `CameraManufacturerVisitor` class, implementing `CriterionVisitor`:
 
     ``` php
     --8<--
-    code_samples/search/solr/src/Query/Criterion/Solr/CameraManufacturerVisitor.php
+    code_samples/search/custom/src/Query/Criterion/Solr/CameraManufacturerVisitor.php
     --8<--
     ```
 
@@ -42,27 +32,30 @@ Then, add a `CameraManufacturerVisitor` class, implementing `CriterionVisitor`:
 
     ``` php
     --8<--
-    code_samples/search/elasticsearch/src/Query/Criterion/Elasticsearch/CameraManufacturerVisitor.php
+    code_samples/search/custom/src/Query/Criterion/Elasticsearch/CameraManufacturerVisitor.php
     --8<--
     ```
 
 Finally, register the visitor as a service.
 
 Search Criteria can be valid for both Content and Location search.
-To choose the search type, use either `content` or `location` in the tag when registering the visitor as a service::
+To choose the search type, use either `content` or `location` in the tag when registering the visitor as a service:
 
 === "Solr"
 
     ``` yaml
-    --8<--
-    code_samples/search/solr/config/criterion_services.yaml
-    --8<--
+    services:
+    [[= include_file('code_samples/search/custom/config/criterion_services.yaml', 1, 5) =]]
     ```
 
 === "Elasticsearch"
 
     ``` yaml
-    --8<--
-    code_samples/search/elasticsearch/config/criterion_services.yaml
-    --8<--
+    services:
+    [[= include_file('code_samples/search/custom/config/criterion_services.yaml', 6, 10) =]]
     ```
+
+This example pretends a new `exif_camera_manufacturer_id` data is indexed.
+For more information about indexing new additional data,
+see [Solr document field mappers](solr_document_field_mappers.md)
+or [Index custom Elasticsearch data](index_custom_elasticsearch_data.md).
diff --git a/docs/search/extensibility/create_custom_sort_clause.md b/docs/search/extensibility/create_custom_sort_clause.md
index a372b43872..259f421d39 100644
--- a/docs/search/extensibility/create_custom_sort_clause.md
+++ b/docs/search/extensibility/create_custom_sort_clause.md
@@ -10,21 +10,11 @@ To create a custom Sort Clause, do the following.
 
 First, add a `ScoreSortClause.php` file with the Sort Clause class:
 
-=== "Solr"
-
-    ``` php
-    --8<--
-    code_samples/search/solr/src/Query/SortClause/Solr/ScoreSortClause.php
-    --8<--
-    ```
-
-=== "Elasticsearch"
-
-    ``` php
-    --8<--
-    code_samples/search/elasticsearch/src/Query/SortClause/Elasticsearch/ScoreSortClause.php
-    --8<--
-    ```
+``` php
+--8<--
+code_samples/search/custom/src/Query/SortClause/ScoreSortClause.php
+--8<--
+```
 
 ## Create Sort Clause visitor
 
@@ -34,7 +24,7 @@ Then, add a `ScoreVisitor` class that implements `SortClauseVisitor`:
 
     ``` php
     --8<--
-    code_samples/search/solr/src/Query/SortClause/Solr/ScoreVisitor.php
+    code_samples/search/custom/src/Query/SortClause/Solr/ScoreVisitor.php
     --8<--
     ```
 
@@ -42,7 +32,7 @@ Then, add a `ScoreVisitor` class that implements `SortClauseVisitor`:
 
     ``` php
     --8<--
-    code_samples/search/elasticsearch/src/Query/SortClause/Elasticsearch/ScoreVisitor.php
+    code_samples/search/custom/src/Query/SortClause/Elasticsearch/ScoreVisitor.php
     --8<--
     ```
 
@@ -58,15 +48,13 @@ To choose the search type, use either `content` or `location` in the tag when re
 === "Solr"
 
     ``` yaml
-    --8<--
-    code_samples/search/solr/config/sort_clause_services.yaml
-    --8<--
+    services:
+    [[= include_file('code_samples/search/custom/config/sort_clause_services.yaml', 1, 5) =]]
     ```
 
 === "Elasticsearch"
 
     ``` yaml
-    --8<--
-    code_samples/search/elasticsearch/config/sort_clause_services.yaml
-    --8<--
+    services:
+    [[= include_file('code_samples/search/custom/config/sort_clause_services.yaml', 6, 10) =]]
     ```
diff --git a/docs/search/extensibility/customize_elasticsearch_index_structure.md b/docs/search/extensibility/customize_elasticsearch_index_structure.md
index d64cf1b257..df85aa3c35 100644
--- a/docs/search/extensibility/customize_elasticsearch_index_structure.md
+++ b/docs/search/extensibility/customize_elasticsearch_index_structure.md
@@ -21,7 +21,7 @@ The strategies are:
 - `NullGroupResolver` - groups all documents into a single group.
 - `LanguageGroupResolver` - groups documents by language code.
 - `ContentTypeGroupResolver`- groups documents by content type ID.
-- `CompositeGroupResolver` - allows combining multiple group resolves together to have a more granular index.
+- `CompositeGroupResolver` - allows combining multiple group resolves together to have a more granular index (default).
 
 The default strategy is the composite of language and content type ID, resulting in indexes in the form of `<repository>_<document_type>_<language>_<content_type_id>`.
 
@@ -44,13 +44,13 @@ This resolver must implement `Ibexa\Contracts\Elasticsearch\ElasticSearch\Index\
 In this example, create a `ContentTypeGroupGroupResolver` based on the content type Group ID of the document:
 
 ``` php
-[[= include_file('code_samples/search/elasticsearch/src/GroupResolver/ContentTypeGroupGroupResolver.php') =]]
+[[= include_file('code_samples/search/custom/src/GroupResolver/ContentTypeGroupGroupResolver.php') =]]
 ```
 
 Register the resolver as a service:
 
 ``` yaml
-[[= include_file('code_samples/search/elasticsearch/config/group_resolver_services.yaml') =]]
+[[= include_file('code_samples/search/custom/config/group_resolver_services.yaml') =]]
 ```
 
 ### Configure indexing strategy
@@ -58,6 +58,5 @@ Register the resolver as a service:
 Finally, in configuration indicate that Elasticsearch should use your custom indexing strategy:
 
 ``` yaml
-[[= include_file('code_samples/search/elasticsearch/config/packages/elasticsearch.yaml') =]]
+[[= include_file('code_samples/search/custom/config/packages/elasticsearch.yaml') =]]
 ```
-
diff --git a/docs/search/extensibility/index_custom_elasticsearch_data.md b/docs/search/extensibility/index_custom_elasticsearch_data.md
index 053f4c84e0..75a79ac137 100644
--- a/docs/search/extensibility/index_custom_elasticsearch_data.md
+++ b/docs/search/extensibility/index_custom_elasticsearch_data.md
@@ -9,61 +9,23 @@ Besides what is indexed automatically, you can add additional data to the Elasti
 
 To do so, subscribe to one of the following events:
 
-- `Ibexa\Contracts\ElasticSearchEngine\Mapping\Event\ContentIndexCreateEvent`
-- `Ibexa\Contracts\ElasticSearchEngine\Mapping\Event\LocationIndexCreateEvent`
+- [`Ibexa\Contracts\ElasticSearchEngine\Mapping\Event\ContentIndexCreateEvent`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Elasticsearch-Mapping-Event-ContentIndexCreateEvent.html)
+- [`Ibexa\Contracts\ElasticSearchEngine\Mapping\Event\LocationIndexCreateEvent`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Elasticsearch-Mapping-Event-LocationIndexCreateEvent.html)
 
 These events are called when the index is created for the content and location documents.
 
 You can pass the event to a subscriber which gives you access to the document that you can modify.
 
-In the following example, when an index in created for a content or a location document, the event subscriber adds a `custom_field` of the type `StringField` to the index:
+In the following example, when an index in created for a content or a location document, the event subscriber adds a `custom_field` of the type [`StringField`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Search-FieldType-StringField.html) to the index:
 
 ``` php hl_lines="19 20 21"
-<?php
-
-declare(strict_types=1);
-
-namespace App\EventSubscriber;
-
-use Ibexa\Contracts\Core\Search\Field;
-use Ibexa\Contracts\Core\Search\FieldType\StringField;
-use Ibexa\Contracts\Elasticsearch\Mapping\Event\ContentIndexCreateEvent;
-use Ibexa\Contracts\Elasticsearch\Mapping\Event\LocationIndexCreateEvent;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-final class CustomIndexDataSubscriber implements EventSubscriberInterface
-{
-    public function onContentDocumentCreate(ContentIndexCreateEvent $event): void
-    {
-        $document = $event->getDocument();
-        $document->fields[] = new Field(
-            'custom_field',
-            'Custom field value',
-            new StringField()
-        );
-    }
-
-    public function onLocationDocumentCreate(LocationIndexCreateEvent $event): void
-    {
-        $document = $event->getDocument();
-        $document->fields[] = new Field(
-            'custom_field',
-            'Custom field value',
-            new StringField()
-        );
-    }
-
-    public static function getSubscribedEvents(): array
-    {
-        return [
-            ContentIndexCreateEvent::class => 'onContentDocumentCreate',
-            LocationIndexCreateEvent::class => 'onLocationDocumentCreate'
-        ];
-    }
-}
+--8<--
+code_samples/search/custom/src/EventSubscriber/CustomIndexDataSubscriber.php
+--8<--
 ```
 
-Remember to register the subscriber as a service:
+If you're not using [Symfony's autoconfiguration]([[= symfony_doc =]]/service_container.html#the-autoconfigure-option)
+for event subscribers, register it as a service:
 
 ``` yaml
 services:
diff --git a/docs/search/extensibility/manipulate_elasticsearch_query.md b/docs/search/extensibility/manipulate_elasticsearch_query.md
index 98573ad949..d8f5cefa93 100644
--- a/docs/search/extensibility/manipulate_elasticsearch_query.md
+++ b/docs/search/extensibility/manipulate_elasticsearch_query.md
@@ -5,53 +5,20 @@ description: Manipulate the search query when using the Elasticsearch search eng
 # Manipulate Elasticsearch query
 
 You can customize the search query before it's executed.
-To do it, subscribe to `Ibexa\Contracts\ElasticSearchEngine\Query\Event\QueryFilterEvent`.
+To do it, subscribe to [`Ibexa\Contracts\Elasticsearch\Query\Event\QueryFilterEvent`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Elasticsearch-Query-Event-QueryFilterEvent.html).
 
-The following example shows how to add an additional Search Criterion to all queries.
+The following example shows how to add a Search Criterion to all queries.
 
 Depending on your configuration, this might impact all search queries, including those used for search and content tree in the back office.
 
 ``` php hl_lines="34"
-<?php
-
-declare(strict_types=1);
-
-namespace App\EventSubscriber;
-
-use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalAnd;
-use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ObjectStateIdentifier;
-use Ibexa\Contracts\ElasticSearch\Query\Event\QueryFilterEvent;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-final class CustomQueryFilterSubscriber implements EventSubscriberInterface
-{
-    public function onQueryFilter(QueryFilterEvent $event): void
-    {
-        $query = $event->getQuery();
-
-        $additionalCriteria = new ObjectStateIdentifier('locked');
-
-        if ($query->filter !== null) {
-            $query->filter = $additionalCriteria;
-        } else {
-            // Append Criterion to existing filter
-            $query->filter = new LogicalAnd([
-                $query->filter,
-                $additionalCriteria
-            ]);
-        }
-    }
-
-    public static function getSubscribedEvents(): array
-    {
-        return [
-            QueryFilterEvent::class => 'onQueryFilter'
-        ];
-    }
-}
+--8<--
+code_samples/search/custom/src/EventSubscriber/CustomQueryFilterSubscriber.php
+--8<--
 ```
 
-Remember to register the subscriber as a service:
+If you're not using [Symfony's autoconfiguration]([[= symfony_doc =]]/service_container.html#the-autoconfigure-option)
+for event subscribers, register it as a service:
 
 ``` yaml
 services:
diff --git a/docs/search/extensibility/solr_document_field_mappers.md b/docs/search/extensibility/solr_document_field_mappers.md
index 2038b421d1..582f29d9b0 100644
--- a/docs/search/extensibility/solr_document_field_mappers.md
+++ b/docs/search/extensibility/solr_document_field_mappers.md
@@ -29,15 +29,15 @@ You can create the field mapper class anywhere inside your bundle, as long as yo
 There are three different field mappers.
 Each mapper implements two methods, by the same name, but accepting different arguments:
 
-- `ContentFieldMapper`
-    - `::accept(Content $content)`
-    - `::mapFields(Content $content)`
-- `ContentTranslationFieldMapper`
-    - `::accept(Content $content, $languageCode)`
-    - `::mapFields(Content $content, $languageCode)`
-- `LocationFieldMapper`
-    - `::accept(Location $content)`
-    - `::mapFields(Location $content)`
+- [`ContentFieldMapper`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Solr-FieldMapper-ContentTranslationFieldMapper.html)
+    - [`::accept(Content $content)`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Solr-FieldMapper-ContentTranslationFieldMapper.html#method_accept)
+    - [`::mapFields(Content $content)`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Solr-FieldMapper-ContentTranslationFieldMapper.html#method_mapFields)
+- [`ContentTranslationFieldMapper`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Solr-FieldMapper-ContentTranslationFieldMapper.html)
+    - [`::accept(Content $content, $languageCode)`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Solr-FieldMapper-ContentTranslationFieldMapper.html#method_accept)
+    - [`::mapFields(Content $content, $languageCode)`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Solr-FieldMapper-ContentTranslationFieldMapper.html#method_mapFields)
+- [`LocationFieldMapper`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Solr-FieldMapper-LocationFieldMapper.html)
+    - [`::accept(Location $content)`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Solr-FieldMapper-LocationFieldMapper.html#method_accept)
+    - [`::mapFields(Location $content)`](../../api/php_api/php_api_reference/classes/Ibexa-Contracts-Solr-FieldMapper-LocationFieldMapper.html#method_mapFields)
 
 Mappers can be used on the extension points by registering them with the [service container](php_api.md#service-container) by using service tags, as follows:
 
@@ -57,13 +57,13 @@ The example relies on a use case of indexing webinar data on the webinar events,
 The field mapper could then look like this:
 
 ```php
-[[= include_file('code_samples/search/solr/src/Search/FieldMapper/WebinarEventTitleFulltextFieldMapper.php') =]]
+[[= include_file('code_samples/search/custom/src/Search/FieldMapper/WebinarEventTitleFulltextFieldMapper.php') =]]
 ```
 
 You index full text data only on the content document, therefore, you would register the service like this:
 
 ``` yaml
-[[= include_file('code_samples/search/solr/config/field_mapper_services.yaml') =]]
+[[= include_file('code_samples/search/custom/config/field_mapper_services.yaml') =]]
 ```
 
 !!! caution "Permission issues when using Repository API in document field mappers"
diff --git a/docs/search/search_engines/elastic_search/configure_elastic_search.md b/docs/search/search_engines/elastic_search/configure_elastic_search.md
index 133ece726c..37df214ff7 100644
--- a/docs/search/search_engines/elastic_search/configure_elastic_search.md
+++ b/docs/search/search_engines/elastic_search/configure_elastic_search.md
@@ -492,7 +492,7 @@ For information about configuring an analyzer for each specific language, see [E
 An adoption of the [English analyzer](https://www.elastic.co/guide/en/elasticsearch/reference/7.17/analysis-lang-analyzer.html#english-analyzer) in [[= product_name =]] configuration looks like this:
 
 ```yaml hl_lines="3-5 15-23 35 41-52 94 99"
-[[= include_file('code_samples/search/elasticsearch/config/packages/elasticsearch-en.yaml') =]]
+[[= include_file('code_samples/search/custom/config/packages/elasticsearch-en.yaml') =]]
 ```
 
 Then, you must bind this language template to your Elasticsearch connection.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 6c7781a0be..427c3cab5e 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -351,49 +351,49 @@ parameters:
 			path: code_samples/page/page_listener/src/Block/Listener/MyBlockListener.php
 
 		-
-			message: "#^Method App\\\\Query\\\\Aggregation\\\\Elasticsearch\\\\PriorityAggregationResultExtractor\\:\\:extract\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
+			message: "#^Method App\\\\Query\\\\Aggregation\\\\Elasticsearch\\\\PriorityRangeAggregationResultExtractor\\:\\:extract\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: code_samples/search/elasticsearch/src/Query/Aggregation/Elasticsearch/PriorityAggregationResultExtractor.php
+			path: code_samples/search/custom/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregationResultExtractor.php
 
 		-
 			message: "#^Method App\\\\Query\\\\Criterion\\\\Elasticsearch\\\\CameraManufacturerVisitor\\:\\:visit\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: code_samples/search/elasticsearch/src/Query/Criterion/Elasticsearch/CameraManufacturerVisitor.php
+			path: code_samples/search/custom/src/Query/Criterion/Elasticsearch/CameraManufacturerVisitor.php
 
 		-
 			message: "#^Method App\\\\Query\\\\SortClause\\\\Elasticsearch\\\\ScoreVisitor\\:\\:visit\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
-			path: code_samples/search/elasticsearch/src/Query/SortClause/Elasticsearch/ScoreVisitor.php
+			path: code_samples/search/custom/src/Query/SortClause/Elasticsearch/ScoreVisitor.php
 
 		-
 			message: "#^Argument of an invalid type stdClass supplied for foreach, only iterables are supported\\.$#"
 			count: 1
-			path: code_samples/search/solr/src/Query/Aggregation/Solr/PriorityAggregationResultExtractor.php
+			path: code_samples/search/custom/src/Query/Aggregation/Solr/PriorityRangeAggregationResultExtractor.php
 
 		-
-			message: "#^Method App\\\\Query\\\\Aggregation\\\\Solr\\\\PriorityAggregationResultExtractor\\:\\:canVisit\\(\\) has parameter \\$languageFilter with no value type specified in iterable type array\\.$#"
+			message: "#^Method App\\\\Query\\\\Aggregation\\\\Solr\\\\PriorityRangeAggregationResultExtractor\\:\\:canVisit\\(\\) has parameter \\$languageFilter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: code_samples/search/solr/src/Query/Aggregation/Solr/PriorityAggregationResultExtractor.php
+			path: code_samples/search/custom/src/Query/Aggregation/Solr/PriorityRangeAggregationResultExtractor.php
 
 		-
-			message: "#^Method App\\\\Query\\\\Aggregation\\\\Solr\\\\PriorityAggregationResultExtractor\\:\\:extract\\(\\) has parameter \\$languageFilter with no value type specified in iterable type array\\.$#"
+			message: "#^Method App\\\\Query\\\\Aggregation\\\\Solr\\\\PriorityRangeAggregationResultExtractor\\:\\:extract\\(\\) has parameter \\$languageFilter with no value type specified in iterable type array\\.$#"
 			count: 1
-			path: code_samples/search/solr/src/Query/Aggregation/Solr/PriorityAggregationResultExtractor.php
+			path: code_samples/search/custom/src/Query/Aggregation/Solr/PriorityRangeAggregationResultExtractor.php
 
 		-
 			message: "#^Method App\\\\Query\\\\Aggregation\\\\Solr\\\\PriorityRangeAggregationVisitor\\:\\:formatRangeValue\\(\\) has parameter \\$value with no type specified\\.$#"
 			count: 1
-			path: code_samples/search/solr/src/Query/Aggregation/Solr/PriorityRangeAggregationVisitor.php
+			path: code_samples/search/custom/src/Query/Aggregation/Solr/PriorityRangeAggregationVisitor.php
 
 		-
 			message: "#^Method App\\\\Query\\\\Aggregation\\\\Solr\\\\PriorityRangeAggregationVisitor\\:\\:visit\\(\\) should return array\\<string\\> but returns array\\<string, array\\<string, array\\<string, string\\>\\>\\|string\\>\\.$#"
 			count: 1
-			path: code_samples/search/solr/src/Query/Aggregation/Solr/PriorityRangeAggregationVisitor.php
+			path: code_samples/search/custom/src/Query/Aggregation/Solr/PriorityRangeAggregationVisitor.php
 
 		-
 			message: "#^Parameter \\#2 \\$array of function array_map expects array, array\\<bool\\|float\\|int\\|string\\>\\|bool\\|float\\|int\\|string given\\.$#"
 			count: 1
-			path: code_samples/search/solr/src/Query/Criterion/Solr/CameraManufacturerVisitor.php
+			path: code_samples/search/custom/src/Query/Criterion/Solr/CameraManufacturerVisitor.php
 
 		-
 			message: "#^Call to an undefined method Ibexa\\\\FieldTypePage\\\\FieldType\\\\Page\\\\Block\\\\Renderer\\\\RenderRequestInterface\\:\\:getParameters\\(\\)\\.$#"