diff --git a/src/main/java/com/databasepreservation/common/client/ViewerConstants.java b/src/main/java/com/databasepreservation/common/client/ViewerConstants.java
index 2d6117bc..5f96bb3a 100644
--- a/src/main/java/com/databasepreservation/common/client/ViewerConstants.java
+++ b/src/main/java/com/databasepreservation/common/client/ViewerConstants.java
@@ -245,8 +245,8 @@ public class ViewerConstants {
   public static final String SOLR_DYN_LOCATION_RPT = "_srpt";
   public static final String SOLR_DYN_LONG = "_l";
   public static final String SOLR_DYN_STRING = "_s";
-  public static final String SOLR_DYN_TEXT_GENERAL = "_t";
-  public static final String SOLR_DYN_TEXT_MULTI = "_txt";
+  public static final String SOLR_DYN_TEXT_GENERAL = "_t_sort";
+  public static final String SOLR_DYN_TEXT_MULTI = "_txt_sort";
   public static final String SOLR_DYN_NEST_MULTI = "_nst";
   public static final String SOLR_DYN_MIMETYPE = "_mimetype";
   public static final String SOLR_DYN_FILE_EXTENSION = "_fileExtension";
diff --git a/src/main/java/com/databasepreservation/common/server/index/schema/AbstractSolrCollection.java b/src/main/java/com/databasepreservation/common/server/index/schema/AbstractSolrCollection.java
index 19765972..45b5e1bb 100644
--- a/src/main/java/com/databasepreservation/common/server/index/schema/AbstractSolrCollection.java
+++ b/src/main/java/com/databasepreservation/common/server/index/schema/AbstractSolrCollection.java
@@ -20,9 +20,10 @@
 import org.roda.core.data.exceptions.NotFoundException;
 import org.roda.core.data.exceptions.RequestNotValidException;
 
-import com.databasepreservation.common.server.index.utils.SolrUtils;
+import com.databasepreservation.common.client.ViewerConstants;
 import com.databasepreservation.common.client.index.IsIndexed;
 import com.databasepreservation.common.exceptions.ViewerException;
+import com.databasepreservation.common.server.index.utils.SolrUtils;
 
 public abstract class AbstractSolrCollection<M extends IsIndexed> implements SolrCollection<M> {
 
@@ -40,8 +41,10 @@ public List<Field> getFields() {
   public List<DynamicField> getDynamicFields() {
     List<DynamicField> ret = new ArrayList<>();
 
-    ret.add(new DynamicField("*_txt", Field.TYPE_TEXT).setIndexed(true).setStored(true).setMultiValued(true));
-    ret.add(new DynamicField("*_nst", Field.TYPE_TEXT).setIndexed(false).setStored(false).setMultiValued(true));
+    ret.add(new DynamicField("*" + ViewerConstants.SOLR_DYN_TEXT_MULTI, Field.TYPE_TEXT).setIndexed(true)
+      .setStored(true).setMultiValued(true));
+    ret.add(new DynamicField("*" + ViewerConstants.SOLR_DYN_NEST_MULTI, Field.TYPE_TEXT).setIndexed(false)
+      .setStored(false).setMultiValued(true));
 
     return ret;
   }