diff --git a/ignore-lte-php7.4-errors.neon b/ignore-lte-php7.4-errors.neon
index 22e0ed626..c0a225bba 100644
--- a/ignore-lte-php7.4-errors.neon
+++ b/ignore-lte-php7.4-errors.neon
@@ -1,6 +1,6 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Anonymous function should return array but returns array\\<string\\>\\|false\\.$#"
+			message: "#^Anonymous function should return array\\<string\\> but returns array\\<string\\>\\|false\\.$#"
 			count: 1
 			path: tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationResultExtractorTest.php
diff --git a/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsContentFields.php b/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsContentFields.php
index cc6edab7d..de960d506 100644
--- a/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsContentFields.php
+++ b/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsContentFields.php
@@ -74,7 +74,7 @@ public function mapFields(Content $content, $languageCode)
             }
 
             foreach ($contentType->fieldDefinitions as $fieldDefinition) {
-                if ($fieldDefinition->id !== $field->fieldDefinitionId) {
+                if ($fieldDefinition->id !== $field->fieldDefinitionId || !$fieldDefinition->isSearchable) {
                     continue;
                 }
 
diff --git a/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentFulltextFields.php b/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentFulltextFields.php
index 6e63753c0..ddf4e4520 100644
--- a/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentFulltextFields.php
+++ b/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentFulltextFields.php
@@ -128,7 +128,7 @@ private function doMapFields(Content $content, ContentType $contentType, $langua
             }
 
             foreach ($contentType->fieldDefinitions as $fieldDefinition) {
-                if ($fieldDefinition->id !== $field->fieldDefinitionId) {
+                if ($fieldDefinition->id !== $field->fieldDefinitionId || !$fieldDefinition->isSearchable) {
                     continue;
                 }
 
@@ -140,7 +140,7 @@ private function doMapFields(Content $content, ContentType $contentType, $langua
                         continue;
                     }
 
-                    if (!$indexField->type instanceof FieldType\FullTextField || !$fieldDefinition->isSearchable) {
+                    if (!$indexField->type instanceof FieldType\FullTextField) {
                         continue;
                     }