diff --git a/materio_base_en/conf/schema.xml b/materio_base_en/conf/schema.xml
index ffbc80d..539b1fe 100644
--- a/materio_base_en/conf/schema.xml
+++ b/materio_base_en/conf/schema.xml
@@ -187,8 +187,8 @@
                 generateNumberParts="1"
                 catenateWords="1"
                 catenateNumbers="1"
-                catenateAll="0"
-                splitOnCaseChange="0"
+                catenateAll="1"
+                splitOnCaseChange="1"
                 preserveOriginal="1"/>
         <filter class="solr.LengthFilterFactory" min="2" max="100" />
         <filter class="solr.LowerCaseFilterFactory"/>
@@ -207,10 +207,10 @@
                 protected="protwords.txt"
                 generateWordParts="1"
                 generateNumberParts="1"
-                catenateWords="0"
-                catenateNumbers="0"
-                catenateAll="0"
-                splitOnCaseChange="0"
+                catenateWords="1"
+                catenateNumbers="1"
+                catenateAll="1"
+                splitOnCaseChange="1"
                 preserveOriginal="1"/>
         <filter class="solr.LengthFilterFactory" min="2" max="100" />
         <filter class="solr.LowerCaseFilterFactory"/>
@@ -229,9 +229,9 @@
                 protected="protwords.txt"
                 generateWordParts="1"
                 generateNumberParts="1"
-                catenateWords="0"
-                catenateNumbers="0"
-                catenateAll="0"
+                catenateWords="1"
+                catenateNumbers="1"
+                catenateAll="1"
                 splitOnCaseChange="1"
                 preserveOriginal="1"/>
         <filter class="solr.LengthFilterFactory" min="2" max="100" />
@@ -252,8 +252,8 @@
                 generateNumberParts="1"
                 catenateWords="1"
                 catenateNumbers="1"
-                catenateAll="0"
-                splitOnCaseChange="0"/>
+                catenateAll="1"
+                splitOnCaseChange="1"/>
         <filter class="solr.LengthFilterFactory" min="2" max="100" />
         <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>
@@ -268,10 +268,10 @@
                 protected="protwords.txt"
                 generateWordParts="1"
                 generateNumberParts="1"
-                catenateWords="0"
-                catenateNumbers="0"
-                catenateAll="0"
-                splitOnCaseChange="0"/>
+                catenateWords="1"
+                catenateNumbers="1"
+                catenateAll="1"
+                splitOnCaseChange="1"/>
         <filter class="solr.LengthFilterFactory" min="2" max="100" />
         <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>
@@ -286,10 +286,10 @@
                 protected="protwords.txt"
                 generateWordParts="1"
                 generateNumberParts="1"
-                catenateWords="0"
-                catenateNumbers="0"
-                catenateAll="0"
-                splitOnCaseChange="0"/>
+                catenateWords="1"
+                catenateNumbers="1"
+                catenateAll="1"
+                splitOnCaseChange="1"/>
         <filter class="solr.LengthFilterFactory" min="2" max="100" />
         <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>
diff --git a/materio_base_fr/conf/schema.xml b/materio_base_fr/conf/schema.xml
index 7b7fc58..e646d95 100644
--- a/materio_base_fr/conf/schema.xml
+++ b/materio_base_fr/conf/schema.xml
@@ -187,8 +187,8 @@
                 generateNumberParts="1"
                 catenateWords="1"
                 catenateNumbers="1"
-                catenateAll="0"
-                splitOnCaseChange="0"
+                catenateAll="1"
+                splitOnCaseChange="1"
                 preserveOriginal="1"/>
         <filter class="solr.LengthFilterFactory" min="2" max="100" />
         <filter class="solr.LowerCaseFilterFactory"/>
@@ -207,10 +207,10 @@
                 protected="protwords.txt"
                 generateWordParts="1"
                 generateNumberParts="1"
-                catenateWords="0"
-                catenateNumbers="0"
-                catenateAll="0"
-                splitOnCaseChange="0"
+                catenateWords="1"
+                catenateNumbers="1"
+                catenateAll="1"
+                splitOnCaseChange="1"
                 preserveOriginal="1"/>
         <filter class="solr.LengthFilterFactory" min="2" max="100" />
         <filter class="solr.LowerCaseFilterFactory"/>
@@ -229,9 +229,9 @@
                 protected="protwords.txt"
                 generateWordParts="1"
                 generateNumberParts="1"
-                catenateWords="0"
-                catenateNumbers="0"
-                catenateAll="0"
+                catenateWords="1"
+                catenateNumbers="1"
+                catenateAll="1"
                 splitOnCaseChange="1"
                 preserveOriginal="1"/>
         <filter class="solr.LengthFilterFactory" min="2" max="100" />
@@ -252,8 +252,8 @@
                 generateNumberParts="1"
                 catenateWords="1"
                 catenateNumbers="1"
-                catenateAll="0"
-                splitOnCaseChange="0"/>
+                catenateAll="1"
+                splitOnCaseChange="1"/>
         <filter class="solr.LengthFilterFactory" min="2" max="100" />
         <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>
@@ -268,9 +268,9 @@
                 protected="protwords.txt"
                 generateWordParts="1"
                 generateNumberParts="1"
-                catenateWords="0"
-                catenateNumbers="0"
-                catenateAll="0"
+                catenateWords="1"
+                catenateNumbers="1"
+                catenateAll="1"
                 splitOnCaseChange="0"/>
         <filter class="solr.LengthFilterFactory" min="2" max="100" />
         <filter class="solr.LowerCaseFilterFactory"/>
@@ -286,10 +286,10 @@
                 protected="protwords.txt"
                 generateWordParts="1"
                 generateNumberParts="1"
-                catenateWords="0"
-                catenateNumbers="0"
-                catenateAll="0"
-                splitOnCaseChange="0"/>
+                catenateWords="1"
+                catenateNumbers="1"
+                catenateAll="1"
+                splitOnCaseChange="1"/>
         <filter class="solr.LengthFilterFactory" min="2" max="100" />
         <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>