diff --git a/dspace-api/src/test/data/dspaceFolder/config/local.cfg b/dspace-api/src/test/data/dspaceFolder/config/local.cfg
index 644a8570bf0..6462ba1dc48 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/local.cfg
+++ b/dspace-api/src/test/data/dspaceFolder/config/local.cfg
@@ -308,4 +308,4 @@ signposting.enabled = true
 # Test configuration has only EN locale (submission-forms.xml)
 webui.supported.locales = en
 
-autocomplete.custom.format.solr-subject_ac = \\|\\|\\|
\ No newline at end of file
+autocomplete.custom.separator.solr-subject_ac = \\|\\|\\|
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionRestController.java
index c25c7588abb..eb007bf9acb 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionRestController.java
@@ -46,7 +46,7 @@
 @RequestMapping("/api/suggestions")
 public class SuggestionRestController extends AbstractDSpaceRestRepository {
 
-    private static final String AUTOCOMPLETE_CUSTOM_CFG_FORMAT_PREFIX = "autocomplete.custom.format.";
+    private static final String AUTOCOMPLETE_CUSTOM_CFG_FORMAT_PREFIX = "autocomplete.custom.separator.";
     private static final String AUTOCOMPLETE_CUSTOM_SOLR_PREFIX = "solr-";
 
     @Autowired
@@ -147,7 +147,7 @@ private VocabularyEntryRest formatValue(VocabularyEntryRest ver, String autocomp
             return ver;
         }
 
-        // Load separator from the configuration `autocomplete.custom.format.<autocompleteCustom>
+        // Load separator from the configuration `autocomplete.custom.separator.<autocompleteCustom>
         String separator = configurationService.getProperty(AUTOCOMPLETE_CUSTOM_CFG_FORMAT_PREFIX + autocompleteCustom);
         if (StringUtils.isEmpty(separator)) {
             return ver;
diff --git a/dspace/config/clarin-dspace.cfg b/dspace/config/clarin-dspace.cfg
index 5404d9a9cae..e7693bf96bf 100644
--- a/dspace/config/clarin-dspace.cfg
+++ b/dspace/config/clarin-dspace.cfg
@@ -289,7 +289,11 @@ elg.download-location.exposed = 0
 #download.email.cc = ${info.recipient}
 download.email.cc = ${mail.admin}
 
+#### Submission forms ####
+# `autocomplete.custom.separator.*` is a special separator used to distinguish values
+# in the results from the current Solr index. For example, `solr-subject_ac` is a special index for subjects,
+# and its values look like this: `value1 ||| VALUE1`. The correct value is the second one.
 # `//` is because of special character
-autocomplete.custom.format.solr-subject_ac = \\|\\|\\|
-autocomplete.custom.format.solr-publisher_ac = \\|\\|\\|
-autocomplete.custom.format.solr-dataProvider_ac = \\|\\|\\|
\ No newline at end of file
+autocomplete.custom.separator.solr-subject_ac = \\|\\|\\|
+autocomplete.custom.separator.solr-publisher_ac = \\|\\|\\|
+autocomplete.custom.separator.solr-dataProvider_ac = \\|\\|\\|
\ No newline at end of file