diff --git a/materio/conf/schema.xml b/materio/conf/schema.xml
index cb0d7a6..185d88b 100644
--- a/materio/conf/schema.xml
+++ b/materio/conf/schema.xml
@@ -49,7 +49,7 @@
     that avoids logging every request
 -->
 
-<schema name="drupal-8.3.8-solr-8.x" version="1.6">
+<schema name="drupal-4.1.1-solr-8.x-0" version="1.6">
   <!-- attribute "name" is the name of this schema and is only used for display purposes.
        version="x.y" is Solr's version number for the schema syntax and
        semantics.  It should not normally be changed by applications.
@@ -154,6 +154,10 @@
   <field name="boost_document" type="pfloat" indexed="true" stored="false" multiValued="false" docValues="true"/>
   <field name="boost_term" type="boost_term_payload" indexed="true" stored="false" multiValued="true"/>
 
+  <!-- Currently the suggester context filter query (suggest.cfq) accesses the tags using the stored values, neither the indexed terms nor the docValues.
+       Therefore the dynamicField sm_* isn't suitable at the moment -->
+  <field name="sm_context_tags" type="string" indexed="true" stored="true" multiValued="true" docValues="false"/>
+
   <!-- Dynamic field definitions.  If a field name is not found, dynamicFields
        will be used if the name matches any of the patterns.
        RESTRICTION: the glob-like pattern in the name attribute must have
diff --git a/materio/conf/solrconfig.xml b/materio/conf/solrconfig.xml
index cdcebc1..710372d 100644
--- a/materio/conf/solrconfig.xml
+++ b/materio/conf/solrconfig.xml
@@ -11,7 +11,7 @@
      For more details about configurations options that may appear in
      this file, see http://wiki.apache.org/solr/SolrConfigXml.
 -->
-<config name="drupal-8.3.8-solr-8.x" >
+<config name="drupal-4.1.1-solr-8.x-0" >
   <!-- In all configuration below, a prefix of "solr." for class names
        is an alias that causes solr to search appropriate packages,
        including org.apache.solr.(search|update|request|core|analysis)
@@ -38,7 +38,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>${solr.luceneMatchVersion:LUCENE_70}</luceneMatchVersion>
+  <luceneMatchVersion>${solr.luceneMatchVersion:LUCENE_80}</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in
diff --git a/materio/conf/solrcore.properties b/materio/conf/solrcore.properties
index 6b2b17e..3e371ec 100644
--- a/materio/conf/solrcore.properties
+++ b/materio/conf/solrcore.properties
@@ -1,13 +1,13 @@
 solr.replication.master=false
 solr.replication.slave=false
 solr.replication.pollInterval=00:00:60
-solr.replication.masterUrl=http://localhost:8985/solr
+solr.replication.masterUrl=http://localhost:8983/solr
 solr.replication.confFiles=schema.xml,schema_extra_types.xml,schema_extra_fields.xml,elevate.xml,stopwords_en.txt,synonyms_en.txt,protwords_en.txt,accents_en.txt,stopwords_fr.txt,synonyms_fr.txt,nouns_fr.txt,protwords_fr.txt,accents_fr.txt,stopwords_und.txt,synonyms_und.txt,protwords_und.txt,accents_und.txt
 solr.mlt.timeAllowed=2000
-solr.luceneMatchVersion=8.0
 solr.selectSearchHandler.timeAllowed=-1
 solr.autoCommit.MaxDocs=-1
 solr.autoCommit.MaxTime=15000
 solr.autoSoftCommit.MaxDocs=-1
 solr.autoSoftCommit.MaxTime=-1
 solr.install.dir=../../..
+solr.luceneMatchVersion=8.0
diff --git a/materio_autocomplete/conf/schema.xml b/materio_autocomplete/conf/schema.xml
index cb0d7a6..185d88b 100644
--- a/materio_autocomplete/conf/schema.xml
+++ b/materio_autocomplete/conf/schema.xml
@@ -49,7 +49,7 @@
     that avoids logging every request
 -->
 
-<schema name="drupal-8.3.8-solr-8.x" version="1.6">
+<schema name="drupal-4.1.1-solr-8.x-0" version="1.6">
   <!-- attribute "name" is the name of this schema and is only used for display purposes.
        version="x.y" is Solr's version number for the schema syntax and
        semantics.  It should not normally be changed by applications.
@@ -154,6 +154,10 @@
   <field name="boost_document" type="pfloat" indexed="true" stored="false" multiValued="false" docValues="true"/>
   <field name="boost_term" type="boost_term_payload" indexed="true" stored="false" multiValued="true"/>
 
+  <!-- Currently the suggester context filter query (suggest.cfq) accesses the tags using the stored values, neither the indexed terms nor the docValues.
+       Therefore the dynamicField sm_* isn't suitable at the moment -->
+  <field name="sm_context_tags" type="string" indexed="true" stored="true" multiValued="true" docValues="false"/>
+
   <!-- Dynamic field definitions.  If a field name is not found, dynamicFields
        will be used if the name matches any of the patterns.
        RESTRICTION: the glob-like pattern in the name attribute must have
diff --git a/materio_autocomplete/conf/solrconfig.xml b/materio_autocomplete/conf/solrconfig.xml
index cdcebc1..710372d 100644
--- a/materio_autocomplete/conf/solrconfig.xml
+++ b/materio_autocomplete/conf/solrconfig.xml
@@ -11,7 +11,7 @@
      For more details about configurations options that may appear in
      this file, see http://wiki.apache.org/solr/SolrConfigXml.
 -->
-<config name="drupal-8.3.8-solr-8.x" >
+<config name="drupal-4.1.1-solr-8.x-0" >
   <!-- In all configuration below, a prefix of "solr." for class names
        is an alias that causes solr to search appropriate packages,
        including org.apache.solr.(search|update|request|core|analysis)
@@ -38,7 +38,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>${solr.luceneMatchVersion:LUCENE_70}</luceneMatchVersion>
+  <luceneMatchVersion>${solr.luceneMatchVersion:LUCENE_80}</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in
diff --git a/materio_autocomplete/conf/solrcore.properties b/materio_autocomplete/conf/solrcore.properties
index 6b2b17e..3e371ec 100644
--- a/materio_autocomplete/conf/solrcore.properties
+++ b/materio_autocomplete/conf/solrcore.properties
@@ -1,13 +1,13 @@
 solr.replication.master=false
 solr.replication.slave=false
 solr.replication.pollInterval=00:00:60
-solr.replication.masterUrl=http://localhost:8985/solr
+solr.replication.masterUrl=http://localhost:8983/solr
 solr.replication.confFiles=schema.xml,schema_extra_types.xml,schema_extra_fields.xml,elevate.xml,stopwords_en.txt,synonyms_en.txt,protwords_en.txt,accents_en.txt,stopwords_fr.txt,synonyms_fr.txt,nouns_fr.txt,protwords_fr.txt,accents_fr.txt,stopwords_und.txt,synonyms_und.txt,protwords_und.txt,accents_und.txt
 solr.mlt.timeAllowed=2000
-solr.luceneMatchVersion=8.0
 solr.selectSearchHandler.timeAllowed=-1
 solr.autoCommit.MaxDocs=-1
 solr.autoCommit.MaxTime=15000
 solr.autoSoftCommit.MaxDocs=-1
 solr.autoSoftCommit.MaxTime=-1
 solr.install.dir=../../..
+solr.luceneMatchVersion=8.0