From 735979b3a2dd032d015f32392129d87348237aae Mon Sep 17 00:00:00 2001
From: Markus Friedrich <markus.friedrich@dkd.de>
Date: Mon, 6 Dec 2021 14:33:13 +0100
Subject: [PATCH] [BUGFIX:BP:11.1] Fix autosuggest with non-ascii terms

The introduced ASCII folding filters or language depending normalization
filters lead to issue with the auto suggest function due to the
differing stemming behaviour.

To fix this issue the original token is preserved if possible, this e.g.
allows suggestions for search terms with and without accents. As this
extension might lead to unwanted duplicates a new field textSpellExact
is introduced, which considers non-ascii characters as given.

Resolves: #3096
---
 Documentation/Appendix/DynamicFieldTypes.rst  |  2 ++
 .../Configuration/Reference/TxSolrSuggest.rst |  3 ++
 .../ext_solr_11_1_0/conf/arabic/schema.xml    | 26 ++++++++++++++
 .../ext_solr_11_1_0/conf/armenian/schema.xml  | 19 +++++++++++
 .../ext_solr_11_1_0/conf/basque/schema.xml    | 22 ++++++++++++
 .../conf/brazilian_portuguese/schema.xml      | 23 +++++++++++++
 .../ext_solr_11_1_0/conf/bulgarian/schema.xml | 25 ++++++++++++++
 .../ext_solr_11_1_0/conf/burmese/schema.xml   | 13 +++++++
 .../ext_solr_11_1_0/conf/catalan/schema.xml   | 23 +++++++++++++
 .../ext_solr_11_1_0/conf/chinese/schema.xml   | 17 ++++++++++
 .../ext_solr_11_1_0/conf/czech/schema.xml     | 22 ++++++++++++
 .../ext_solr_11_1_0/conf/danish/schema.xml    | 20 +++++++++++
 .../ext_solr_11_1_0/conf/dutch/schema.xml     | 24 +++++++++++--
 .../ext_solr_11_1_0/conf/english/schema.xml   | 26 ++++++++++++--
 .../ext_solr_11_1_0/conf/finnish/schema.xml   | 24 +++++++++++--
 .../ext_solr_11_1_0/conf/french/schema.xml    | 25 ++++++++++++--
 .../ext_solr_11_1_0/conf/galician/schema.xml  | 24 +++++++++++++
 .../conf/general_schema_fields.xml            |  7 ++++
 .../ext_solr_11_1_0/conf/generic/schema.xml   | 22 ++++++++++++
 .../ext_solr_11_1_0/conf/german/schema.xml    | 34 +++++++++++++++++--
 .../ext_solr_11_1_0/conf/greek/schema.xml     | 22 ++++++++++++
 .../ext_solr_11_1_0/conf/hindi/schema.xml     | 26 ++++++++++++++
 .../ext_solr_11_1_0/conf/hungarian/schema.xml | 27 +++++++++++++--
 .../conf/indonesian/schema.xml                | 24 +++++++++++++
 .../ext_solr_11_1_0/conf/irish/schema.xml     | 27 +++++++++++++--
 .../ext_solr_11_1_0/conf/italian/schema.xml   | 26 ++++++++++++--
 .../ext_solr_11_1_0/conf/japanese/schema.xml  | 16 +++++++++
 .../ext_solr_11_1_0/conf/khmer/schema.xml     | 10 ++++++
 .../ext_solr_11_1_0/conf/korean/schema.xml    | 16 +++++++++
 .../ext_solr_11_1_0/conf/lao/schema.xml       | 10 ++++++
 .../ext_solr_11_1_0/conf/latvia/schema.xml    | 22 ++++++++++++
 .../ext_solr_11_1_0/conf/norwegian/schema.xml | 22 ++++++++++++
 .../ext_solr_11_1_0/conf/persian/schema.xml   | 26 ++++++++++++++
 .../ext_solr_11_1_0/conf/polish/schema.xml    | 29 ++++++++++++++--
 .../conf/portuguese/schema.xml                | 26 ++++++++++++--
 .../ext_solr_11_1_0/conf/romanian/schema.xml  | 22 ++++++++++++
 .../ext_solr_11_1_0/conf/russian/schema.xml   | 22 ++++++++++++
 .../ext_solr_11_1_0/conf/serbian/schema.xml   | 24 +++++++++++++
 .../ext_solr_11_1_0/conf/spanish/schema.xml   | 26 ++++++++++++--
 .../ext_solr_11_1_0/conf/swedish/schema.xml   | 22 ++++++++++++
 .../ext_solr_11_1_0/conf/thai/schema.xml      | 22 ++++++++++++
 .../ext_solr_11_1_0/conf/turkish/schema.xml   | 26 ++++++++++++--
 .../ext_solr_11_1_0/conf/ukrainian/schema.xml | 23 +++++++++++++
 43 files changed, 892 insertions(+), 25 deletions(-)

diff --git a/Documentation/Appendix/DynamicFieldTypes.rst b/Documentation/Appendix/DynamicFieldTypes.rst
index 418789f64f..f4f5734173 100644
--- a/Documentation/Appendix/DynamicFieldTypes.rst
+++ b/Documentation/Appendix/DynamicFieldTypes.rst
@@ -73,6 +73,8 @@ Extension               Type                                 Multivalue  Comment
 \*_textExactM           textExact                            Yes
 \*_textSpellS           textSpell                            No
 \*_textSpellM           textSpell                            Yes
+\*_textSpellExactS      textSpellExact                       No
+\*_textSpellExactM      textSpellExact                       Yes
 \*_phoneticS            Phonetic                             No
 \*_phoneticM            Phonetic                             Yes
 \*_point                point                                No
diff --git a/Documentation/Configuration/Reference/TxSolrSuggest.rst b/Documentation/Configuration/Reference/TxSolrSuggest.rst
index 3e8dfe4819..d0ced5300a 100644
--- a/Documentation/Configuration/Reference/TxSolrSuggest.rst
+++ b/Documentation/Configuration/Reference/TxSolrSuggest.rst
@@ -34,6 +34,9 @@ suggestField
 
 Sets the Solr index field used to get suggestions from. A general advice is to use a field without stemming on it. For practical reasons this is currently the spell checker field.
 
+Note: With EXT:solr 11.1.0 ASCII folding and language depending normalization filters were introduced, but due to the special behaviour of the auto suggestions ascii-terms were not treated correctly. So with 11.1.3 the untouched tokens are also kept, as this might lead to duplicate
+suggestions, a new field for exact suggestions is introduced, if you want to avoid duplicates and use stricter suggestions, just configure `spellExact` as suggest field. 
+
 forceHttps
 ----------
 
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/arabic/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/arabic/schema.xml
index d9dd07fa2b..ddf1ac1bdb 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/arabic/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/arabic/schema.xml
@@ -202,4 +202,30 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+			<filter class="solr.ArabicNormalizationFilterFactory"/>
+			<filter class="solr.ArabicStemFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}"/>
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.ArabicNormalizationFilterFactory"/>
+			<filter class="solr.ArabicStemFilterFactory"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
+
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/armenian/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/armenian/schema.xml
index 7a521df46a..045f177c65 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/armenian/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/armenian/schema.xml
@@ -169,4 +169,23 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+			<filter class="solr.LowerCaseFilterFactory"/>
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+			<filter class="solr.LowerCaseFilterFactory"/>
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
+
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/basque/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/basque/schema.xml
index da0498eb2b..597187c285 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/basque/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/basque/schema.xml
@@ -184,4 +184,26 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/brazilian_portuguese/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/brazilian_portuguese/schema.xml
index b7963545fb..d7b4413688 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/brazilian_portuguese/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/brazilian_portuguese/schema.xml
@@ -187,4 +187,27 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
+
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/bulgarian/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/bulgarian/schema.xml
index 9af49c84d3..b605ad4597 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/bulgarian/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/bulgarian/schema.xml
@@ -189,4 +189,29 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.BulgarianStemFilterFactory"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.BulgarianStemFilterFactory"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
+
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/burmese/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/burmese/schema.xml
index b80efca392..78e768cbd6 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/burmese/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/burmese/schema.xml
@@ -105,4 +105,17 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.ICUTokenizerFactory"/>
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.FlattenGraphFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.ICUTokenizerFactory" />
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+		</analyzer>
+	</fieldType>
+
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/catalan/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/catalan/schema.xml
index 9db4f411cf..881f38b3ea 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/catalan/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/catalan/schema.xml
@@ -182,4 +182,27 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
+
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/chinese/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/chinese/schema.xml
index 3df75c99a8..4fef73e942 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/chinese/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/chinese/schema.xml
@@ -116,4 +116,21 @@
 			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
 		</analyzer>
 	</fieldType>
+
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+			<filter class="solr.CJKWidthFilterFactory"/>
+			<filter class="solr.CJKBigramFilterFactory" han="true" hiragana="true" katakana="true" hangul="true" outputUnigrams="false"/>
+			<filter class="solr.LowerCaseFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+			<filter class="solr.CJKWidthFilterFactory"/>
+			<filter class="solr.CJKBigramFilterFactory" han="true" hiragana="true" katakana="true" hangul="true" outputUnigrams="false" />
+			<filter class="solr.LowerCaseFilterFactory"/>
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/czech/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/czech/schema.xml
index ef99e752cf..1a201446d0 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/czech/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/czech/schema.xml
@@ -184,4 +184,26 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.CzechStemFilterFactory"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.CzechStemFilterFactory"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/danish/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/danish/schema.xml
index fa326295bf..175483404b 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/danish/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/danish/schema.xml
@@ -213,4 +213,24 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/dutch/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/dutch/schema.xml
index 178191d381..735b3fc2a4 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/dutch/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/dutch/schema.xml
@@ -176,7 +176,7 @@
 			<filter class="solr.LowerCaseFilterFactory"/>
 
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 		<analyzer type="query">
@@ -186,9 +186,29 @@
 
 			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/english/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/english/schema.xml
index e9375dff39..4abcd5a970 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/english/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/english/schema.xml
@@ -177,7 +177,30 @@
 
 			<!-- no synonyms here because we do not want to add them as spell suggestion -->
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
+
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<!-- no synonyms here because we do not want to add them as spell suggestion -->
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 		<analyzer type="query">
@@ -187,7 +210,6 @@
 
 			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 	</fieldType>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/finnish/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/finnish/schema.xml
index 2244a624f7..041eee5ef5 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/finnish/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/finnish/schema.xml
@@ -176,7 +176,7 @@
 			<filter class="solr.LowerCaseFilterFactory"/>
 
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 		<analyzer type="query">
@@ -186,9 +186,29 @@
 
 			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/french/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/french/schema.xml
index 26369cbdff..08adfc852c 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/french/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/french/schema.xml
@@ -178,7 +178,7 @@
 			<filter class="solr.LowerCaseFilterFactory"/>
 			<filter class="solr.ElisionFilterFactory"/>
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 		<analyzer type="query">
@@ -188,10 +188,31 @@
 			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
 
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 			<filter class="solr.ElisionFilterFactory"/>
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+			<filter class="solr.ElisionFilterFactory"/>
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.ElisionFilterFactory"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/galician/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/galician/schema.xml
index 29dd54c21c..ccd24b7d8a 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/galician/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/galician/schema.xml
@@ -189,4 +189,28 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.GalicianStemFilterFactory"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.GalicianStemFilterFactory"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/general_schema_fields.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/general_schema_fields.xml
index e8a73135dc..5afdce5ee2 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/general_schema_fields.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/general_schema_fields.xml
@@ -170,6 +170,11 @@
 	<copyField source="subTitle" dest="spell" />
 	<copyField source="content"  dest="spell" />
 
+	<field name="spellExact" type="textSpellExact" indexed="true" stored="false" multiValued="true" />
+	<copyField source="title"    dest="spellExact" />
+	<copyField source="subTitle" dest="spellExact" />
+	<copyField source="content"  dest="spellExact" />
+
 	<field name="sortTitle" type="string" indexed="true" stored="false" docValues="true" />
 	<copyField source="title" dest="sortTitle" />
 
@@ -243,6 +248,8 @@
 
 	<dynamicField name="*_textSpellS" type="textSpell" indexed="true" stored="true" multiValued="false" />
 	<dynamicField name="*_textSpellM" type="textSpell" indexed="true" stored="true" multiValued="true" />
+	<dynamicField name="*_textSpellExactS" type="textSpellExact" indexed="true" stored="true" multiValued="false" />
+	<dynamicField name="*_textSpellExactM" type="textSpellExact" indexed="true" stored="true" multiValued="true" />
 
 	<dynamicField name="*_textEdgeNgramS" type="textEdgeNgram" indexed="true" stored="true" multiValued="false" />
 	<dynamicField name="*_textEdgeNgramM" type="textEdgeNgram" indexed="true" stored="true" multiValued="true" />
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/generic/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/generic/schema.xml
index 1e90bc8326..544c8ed855 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/generic/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/generic/schema.xml
@@ -180,4 +180,26 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/german/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/german/schema.xml
index 9f2904268b..c93b5ddd57 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/german/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/german/schema.xml
@@ -207,7 +207,7 @@
 
 			<!-- no synonyms here because we do not want to add them as spell suggestion -->
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
@@ -218,10 +218,40 @@
 
 			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.DictionaryCompoundWordTokenFilterFactory"
+				dictionary="german/german-common-nouns.txt"
+				minWordSize="5"
+				minSubwordSize="4"
+				maxSubwordSize="15"
+				onlyLongestMatch="false"
+			/>
+
+			<!-- no synonyms here because we do not want to add them as spell suggestion -->
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/greek/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/greek/schema.xml
index 9f276171d7..d2f2375bde 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/greek/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/greek/schema.xml
@@ -188,4 +188,26 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.GreekLowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.GreekLowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/hindi/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/hindi/schema.xml
index 3bcc638910..926888be52 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/hindi/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/hindi/schema.xml
@@ -197,4 +197,30 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.IndicNormalizationFilterFactory"/>
+			<filter class="solr.HindiNormalizationFilterFactory"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.IndicNormalizationFilterFactory"/>
+			<filter class="solr.HindiNormalizationFilterFactory"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/hungarian/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/hungarian/schema.xml
index 713116a089..3dd9946b5f 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/hungarian/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/hungarian/schema.xml
@@ -10,7 +10,7 @@
 	status report - tx_solr_report_SchemaStatus - checking against this
 	name property, that status check must be updated as well.
 -->
-<schema name="tx_solr-11-1-0--20210721" version="1.6">
+<schema name="tx_solr-11-5-0--20211001" version="1.6">
 	<!-- attribute "name" is the name of this schema and is only used for display purposes.
 		Applications should change this to reflect the nature of the search collection.
 		version="1.4" is Solr's version number for the schema syntax and semantics.  It should
@@ -172,7 +172,29 @@
 			<filter class="solr.LowerCaseFilterFactory"/>
 
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
+
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 		<analyzer type="query">
@@ -182,7 +204,6 @@
 
 			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 	</fieldType>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/indonesian/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/indonesian/schema.xml
index c0762f3b88..a08d859247 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/indonesian/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/indonesian/schema.xml
@@ -187,4 +187,28 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.IndonesianStemFilterFactory" stemDerivational="true" />
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.IndonesianStemFilterFactory" stemDerivational="true" />
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/irish/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/irish/schema.xml
index 82f4c8d57f..f6e8084d0b 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/irish/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/irish/schema.xml
@@ -174,7 +174,7 @@
 
 			<!-- no synonyms here because we do not want to add them as spell suggestion -->
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
@@ -185,10 +185,33 @@
 
 			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.IrishLowerCaseFilterFactory"/>
+
+			<!-- no synonyms here because we do not want to add them as spell suggestion -->
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.IrishLowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/italian/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/italian/schema.xml
index a958f54090..35f5d5e4fb 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/italian/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/italian/schema.xml
@@ -176,7 +176,7 @@
 			<filter class="solr.LowerCaseFilterFactory"/>
 
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
@@ -187,10 +187,32 @@
 
 			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/japanese/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/japanese/schema.xml
index e7d1757356..51c6166acb 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/japanese/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/japanese/schema.xml
@@ -117,4 +117,20 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+			<filter class="solr.CJKWidthFilterFactory"/>
+			<filter class="solr.CJKBigramFilterFactory" han="true" hiragana="true" katakana="true" hangul="true" outputUnigrams="false"/>
+			<filter class="solr.LowerCaseFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+			<filter class="solr.CJKWidthFilterFactory"/>
+			<filter class="solr.CJKBigramFilterFactory" han="true" hiragana="true" katakana="true" hangul="true" outputUnigrams="false" />
+			<filter class="solr.LowerCaseFilterFactory"/>
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/khmer/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/khmer/schema.xml
index 17b9501ac5..4c51f83f62 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/khmer/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/khmer/schema.xml
@@ -99,4 +99,14 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.ICUTokenizerFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.ICUTokenizerFactory" />
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/korean/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/korean/schema.xml
index a27ac21c79..c1e83c8081 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/korean/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/korean/schema.xml
@@ -117,4 +117,20 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+			<filter class="solr.CJKWidthFilterFactory"/>
+			<filter class="solr.CJKBigramFilterFactory" han="true" hiragana="true" katakana="true" hangul="true" outputUnigrams="false"/>
+			<filter class="solr.LowerCaseFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+			<filter class="solr.CJKWidthFilterFactory"/>
+			<filter class="solr.CJKBigramFilterFactory" han="true" hiragana="true" katakana="true" hangul="true" outputUnigrams="false" />
+			<filter class="solr.LowerCaseFilterFactory"/>
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/lao/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/lao/schema.xml
index b52e78beff..809ae279c6 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/lao/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/lao/schema.xml
@@ -99,4 +99,14 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.ICUTokenizerFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.ICUTokenizerFactory" />
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/latvia/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/latvia/schema.xml
index 8e09c87288..cb71db6e92 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/latvia/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/latvia/schema.xml
@@ -183,4 +183,26 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/norwegian/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/norwegian/schema.xml
index f87a9c3698..a046892fe6 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/norwegian/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/norwegian/schema.xml
@@ -198,4 +198,26 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/persian/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/persian/schema.xml
index b5aef0d211..1a1e157e50 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/persian/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/persian/schema.xml
@@ -192,4 +192,30 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.ArabicNormalizationFilterFactory"/>
+			<filter class="solr.PersianNormalizationFilterFactory"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.ArabicNormalizationFilterFactory"/>
+			<filter class="solr.PersianNormalizationFilterFactory"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/polish/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/polish/schema.xml
index 170554390b..edd2ecc3c9 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/polish/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/polish/schema.xml
@@ -178,7 +178,7 @@
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
 
 			<filter class="solr.StempelPolishStemFilterFactory"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 		<analyzer type="query">
@@ -189,11 +189,36 @@
 			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
 			<filter class="solr.FlattenGraphFilterFactory"/>
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 
 			<filter class="solr.StempelPolishStemFilterFactory"/>
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.StempelPolishStemFilterFactory"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.FlattenGraphFilterFactory"/>
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.StempelPolishStemFilterFactory"/>
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/portuguese/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/portuguese/schema.xml
index de25fb29bb..ae6be23a09 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/portuguese/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/portuguese/schema.xml
@@ -172,7 +172,7 @@
 			<filter class="solr.LowerCaseFilterFactory"/>
 
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
@@ -183,10 +183,32 @@
 
 			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/romanian/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/romanian/schema.xml
index 2c1b6a9f80..da6bd18d7c 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/romanian/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/romanian/schema.xml
@@ -179,4 +179,26 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/russian/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/russian/schema.xml
index e5db2aa1a9..b8776bcc15 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/russian/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/russian/schema.xml
@@ -184,4 +184,26 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/serbian/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/serbian/schema.xml
index c3228563cb..e12393b04a 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/serbian/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/serbian/schema.xml
@@ -188,4 +188,28 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+			<filter class="solr.SerbianNormalizationFilterFactory" haircut="bald"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+			<filter class="solr.SerbianNormalizationFilterFactory" haircut="bald"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/spanish/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/spanish/schema.xml
index 7f97892aab..16d75d327a 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/spanish/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/spanish/schema.xml
@@ -177,7 +177,7 @@
 			<filter class="solr.LowerCaseFilterFactory"/>
 
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
@@ -188,10 +188,32 @@
 
 			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/swedish/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/swedish/schema.xml
index 9dd2f54b4d..a2eb073c6b 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/swedish/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/swedish/schema.xml
@@ -200,4 +200,26 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/thai/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/thai/schema.xml
index 058d9712a2..c4ecaefb82 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/thai/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/thai/schema.xml
@@ -149,4 +149,26 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.ThaiTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.ThaiTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/turkish/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/turkish/schema.xml
index 013095fabc..3cf469af6b 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/turkish/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/turkish/schema.xml
@@ -172,7 +172,7 @@
 			<filter class="solr.TurkishLowerCaseFilterFactory"/>
 
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
@@ -183,10 +183,32 @@
 
 			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
 			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
-			<filter class="solr.ASCIIFoldingFilterFactory"/>
+			<filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="true"/>
 
 			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.TurkishLowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.TurkishLowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
 </schema>
diff --git a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/ukrainian/schema.xml b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/ukrainian/schema.xml
index 730d8f1ffc..d9e3dd0730 100644
--- a/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/ukrainian/schema.xml
+++ b/Resources/Private/Solr/configsets/ext_solr_11_1_0/conf/ukrainian/schema.xml
@@ -183,4 +183,27 @@
 		</analyzer>
 	</fieldType>
 
+	<!-- Setup simple analysis for more exact spell checking, considers non-ascii charaters as they are -->
+	<fieldType name="textSpellExact" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+		<analyzer type="index">
+			<tokenizer class="solr.StandardTokenizerFactory"/>
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+		<analyzer type="query">
+			<tokenizer class="solr.StandardTokenizerFactory" />
+
+			<filter class="solr.LowerCaseFilterFactory"/>
+
+			<filter class="solr.ManagedSynonymGraphFilterFactory" managed="${solr.core.name}" />
+			<filter class="solr.ManagedStopFilterFactory" managed="${solr.core.name}"/>
+
+			<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+		</analyzer>
+	</fieldType>
+
 </schema>