diff --git a/sapl/base/search_indexes.py b/sapl/base/search_indexes.py
index 4f2b7a553..b0479d401 100644
--- a/sapl/base/search_indexes.py
+++ b/sapl/base/search_indexes.py
@@ -118,7 +118,7 @@ class TextExtractField(CharField):
 
 class DocumentoAcessorioIndex(CelerySearchIndex, Indexable):
     model = DocumentoAcessorio
-    index_date = DateTimeField(model_attr='data')
+    data = DateTimeField(model_attr='data', null=True)
     text = TextExtractField(
         document=True, use_template=True,
         model_attr=(
@@ -144,7 +144,7 @@ class DocumentoAcessorioIndex(CelerySearchIndex, Indexable):
 
 class NormaJuridicaIndex(DocumentoAcessorioIndex):
     model = NormaJuridica
-    index_date = DateTimeField(model_attr='data')
+    data = DateTimeField(model_attr='data', null=True)
     text = TextExtractField(
         document=True, use_template=True,
         model_attr=(
@@ -159,7 +159,7 @@ class NormaJuridicaIndex(DocumentoAcessorioIndex):
 
 class MateriaLegislativaIndex(DocumentoAcessorioIndex):
     model = MateriaLegislativa
-    index_date = DateTimeField(model_attr='data_apresentacao')
+    data = DateTimeField(model_attr='data_apresentacao')
     text = TextExtractField(
         document=True, use_template=True,
         model_attr=(
diff --git a/solr/sapl_configset/conf/managed-schema b/solr/sapl_configset/conf/managed-schema
index e924eb5a3..771c83a51 100644
--- a/solr/sapl_configset/conf/managed-schema
+++ b/solr/sapl_configset/conf/managed-schema
@@ -120,7 +120,7 @@
     <field name="django_ct" type="string" indexed="true" stored="true" multiValued="false"/>
     <field name="django_id" type="string" indexed="true" stored="true" multiValued="false"/>
     <field name="text" type="text_pt" indexed="true" stored="true" multiValued="false" />
-    <field name="index_date" type="pdate" indexed="true" stored="true" multiValued="false" docValues="true" />
+    <field name="data" type="pdate" required="false" indexed="true" stored="true" multiValued="false" docValues="true" />
     <field name="last_update" type="pdate" indexed="true" stored="true" default="NOW" docValues="true" />
 
     <!-- This can be enabled, in case the client does not know what fields may be searched. It isn't enabled by default
diff --git a/solr/sapl_configset/conf/saplconfigset.zip b/solr/sapl_configset/conf/saplconfigset.zip
index a8266bff6..bca803662 100644
Binary files a/solr/sapl_configset/conf/saplconfigset.zip and b/solr/sapl_configset/conf/saplconfigset.zip differ