diff --git a/doc/release-notes/12617-cvv-performance.md b/doc/release-notes/12617-cvv-performance.md
new file mode 100644
index 00000000000..a1ab7f42517
--- /dev/null
+++ b/doc/release-notes/12617-cvv-performance.md
@@ -0,0 +1 @@
+The loading time for the dataset metadata and template editing pages has been significantly improved relative to the v 6.4+ performance when support for ~8K ISO 63903 langauge codes were added to the citation metadatablock.
\ No newline at end of file
diff --git a/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyAutocompleteBean.java b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyAutocompleteBean.java
new file mode 100644
index 00000000000..e41778c93e7
--- /dev/null
+++ b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyAutocompleteBean.java
@@ -0,0 +1,62 @@
+package edu.harvard.iq.dataverse;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Named;
+
+@ViewScoped
+@Named("ControlledVocabularyAutocompleteBean")
+public class ControlledVocabularyAutocompleteBean implements Serializable {
+
+    private final Set<Long> slowModeFieldTypeIds = new HashSet<>();
+
+    public boolean isSlowMode(Long fieldTypeId) {
+        return fieldTypeId != null && slowModeFieldTypeIds.contains(fieldTypeId);
+    }
+
+    public void switchToSlowMode(Long fieldTypeId) {
+        if (fieldTypeId != null) {
+            slowModeFieldTypeIds.add(fieldTypeId);
+        }
+    }
+
+    public List<ControlledVocabularyValue> complete(String query) {
+        UIComponent component = UIComponent.getCurrentComponent(FacesContext.getCurrentInstance());
+        DatasetField dsf = (DatasetField) component.getAttributes().get("dsf");
+        DatasetFieldType dsft = (DatasetFieldType) component.getAttributes().get("dsft");
+
+        if (dsf != null) {
+            dsft = dsf.getDatasetFieldType();
+        }
+
+        if (dsft == null || dsft.getControlledVocabularyValues() == null || query == null) {
+            return Collections.emptyList();
+        }
+
+        List<ControlledVocabularyValue> results = new ArrayList<>();
+        String queryLower = query.toLowerCase();
+        String mdLangCode = null;
+
+        if (dsf != null && dsf.getDatasetVersion() != null && dsf.getDatasetVersion().getDataset() != null) {
+            mdLangCode = dsf.getDatasetVersion().getDataset().getMetadataLanguage();
+        }
+
+        for (ControlledVocabularyValue cvv : dsft.getControlledVocabularyValues()) {
+            String localeStrValue = cvv.getLocaleStrValue(mdLangCode);
+            if (localeStrValue != null && localeStrValue.toLowerCase().contains(queryLower)) {
+                results.add(cvv);
+            }
+            if (results.size() >= 101) {
+                break;
+            }
+        }
+        return results;
+    }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
index 0191b178795..c024bfdc73c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
@@ -4,6 +4,7 @@
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.json.JsonLDTerm;
 
+import java.util.ArrayList;
 import java.util.Collection;
 
 import java.io.Serializable;
@@ -97,7 +98,7 @@ public void setId(Long id) {
     private String searchValue;
     
     @Transient
-    private List<String> listValues;
+    private List<ControlledVocabularyValue> listValues = new ArrayList<>();
 
     @Transient
     private Map<String, ControlledVocabularyValue> controlledVocabularyValuesByStrValue;
@@ -424,11 +425,11 @@ public void setSearchValue(String searchValue) {
         this.searchValue = searchValue;
     }
 
-    public List<String> getListValues() {
+    public List<ControlledVocabularyValue> getListValues() {
         return listValues;
     }
 
-    public void setListValues(List<String> listValues) {
+    public void setListValues(List<ControlledVocabularyValue> listValues) {
         this.listValues = listValues;
     }
     /**
diff --git a/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java b/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
index 279944beaa7..25e1f9198d7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
@@ -12,12 +12,16 @@
 import edu.harvard.iq.dataverse.util.JsfHelper;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
 import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.logging.Logger;
 import jakarta.ejb.EJB;
 import jakarta.ejb.EJBException;
 import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
 import jakarta.faces.view.ViewScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
@@ -263,5 +267,4 @@ public String getInstructionsLabelFor(String fieldType) {
         String fieldInstructions = template.getInstructionsMap().get(fieldType);
         return (fieldInstructions!=null && !fieldInstructions.isBlank()) ? fieldInstructions : BundleUtil.getStringFromBundle("template.instructions.empty.label");
     }
-
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java b/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
index bc92959a5ac..59f653118d7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
@@ -15,11 +15,16 @@
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Logger;
 import jakarta.ejb.EJB;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
 import jakarta.faces.view.ViewScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
@@ -51,7 +56,7 @@ public class AdvancedSearchPage implements java.io.Serializable {
     private String dvFieldAlias;
     private String dvFieldDescription;
     private String dvFieldAffiliation;
-    private List<String> dvFieldSubject;
+    private List<ControlledVocabularyValue> dvFieldSubject = new ArrayList<>();
     private String dsPublicationDate;
     private String dsPersistentId;
     private String fileFieldName;
@@ -111,8 +116,8 @@ private String constructDatasetQuery() {
                 queryStrings.add(constructQuery(dsfType.getSolrField().getNameSearchable(), dsfType.getSearchValue(), getCVocConf().containsKey(dsfType.getId())));
             } else if (dsfType.getListValues() != null && !dsfType.getListValues().isEmpty()) {
                 List<String> listQueryStrings = new ArrayList<>();
-                for (String value : dsfType.getListValues()) {
-                    listQueryStrings.add(dsfType.getSolrField().getNameSearchable() + ":" + "\"" + value + "\"");
+                for (ControlledVocabularyValue cvv : dsfType.getListValues()) {
+                    listQueryStrings.add(dsfType.getSolrField().getNameSearchable() + ":" + "\"" + cvv.getStrValue() + "\"");
                 }
                 queryStrings.add(constructQuery(listQueryStrings, false));
             }
@@ -146,8 +151,8 @@ private String constructDataverseQuery() {
 
         if (dvFieldSubject != null && !dvFieldSubject.isEmpty()) {
             List<String> listQueryStrings = new ArrayList<>();
-            for (String value : dvFieldSubject) {
-                listQueryStrings.add(SearchFields.DATAVERSE_SUBJECT + ":" + "\"" + value + "\"");
+            for (ControlledVocabularyValue cvv : dvFieldSubject) {
+                listQueryStrings.add(SearchFields.DATAVERSE_SUBJECT + ":" + "\"" + cvv.getStrValue() + "\"");
             }
             queryStrings.add(constructQuery(listQueryStrings, false));
         }
@@ -252,11 +257,11 @@ public void setDvFieldAffiliation(String dvFieldAffiliation) {
         this.dvFieldAffiliation = dvFieldAffiliation;
     }
 
-    public List<String> getDvFieldSubject() {
+    public List<ControlledVocabularyValue> getDvFieldSubject() {
         return dvFieldSubject;
     }
 
-    public void setDvFieldSubject(List<String> dvFieldSubject) {
+    public void setDvFieldSubject(List<ControlledVocabularyValue> dvFieldSubject) {
         this.dvFieldSubject = dvFieldSubject;
     }
 
@@ -265,6 +270,10 @@ public Collection<ControlledVocabularyValue> getDvFieldSubjectValues() {
         return subjectType.getControlledVocabularyValues();
     }
 
+    public DatasetFieldType getSubjectDatasetFieldType() {
+        return datasetFieldService.findByName(DatasetFieldConstant.subject);
+    }
+
     public String getDsPublicationDate() {
         return dsPublicationDate;
     }
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 0825816048d..0da3380fb47 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -3298,3 +3298,9 @@ abstractPaginatedCommand.errors.negativePaginationParam=The {0} parameter cannot
 #UpdateDatasetLicenseCommand.java
 updateDatasetLicenseCommand.errors.licenseNotActive=License {0} cannot be set because it is not active.
 updateDatasetLicenseCommand.errors.customTermsOfUseNotProvided=Terms of use text should be provided in custom terms.
+
+# Controlled Vocabulary Autocomplete
+controlledvocabulary.autocomplete.watermark=Start typing to search...
+controlledvocabulary.autocomplete.moreText=Use a longer search term to see more values.
+controlledvocabulary.showAll=Load all {0} choices
+controlledvocabulary.showAll.tooltip=This is slow to load but allows you to scroll through the entire list of choices
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 37246ddf40f..bd061b857f8 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -7,6 +7,7 @@
                 xmlns:p="http://primefaces.org/ui"
                 xmlns:o="http://omnifaces.org/ui"
                 xmlns:jsf="http://xmlns.jcp.org/jsf">
+                <ui:param name="editBean" value="#{facesContext.viewRoot.viewId.contains('dataset') ? DatasetPage : (facesContext.viewRoot.viewId.contains('template') ? TemplatePage : null)}"/>
         <p:fragment>
            <p:autoUpdate/>
         <ui:repeat value="#{DatasetPage.vocabScripts}" var="vocabScriptUrl">
@@ -297,25 +298,50 @@
                                                     </div>
                                                 </p:repeat>
                                                 <ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
+                                                    <c:set var="vocabSize" value="#{dsf.datasetFieldType.controlledVocabularyValues.size()}"/>
                                                     <div class="form-group dataset-field-values">
                                                         <div class="form-col-container col-sm-9 edit-field">
-                                                            <p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
-                                                                             id="unique1" rendered="#{!dsf.datasetFieldType.allowMultiples}" filter="#{(dsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" filterMatchMode="contains">
-                                                                <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
-                                                                <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"/>
-                                                            </p:selectOneMenu>
-                                                            <!--
-                                                            <p:outputPanel id="selectedValsList" style="padding-top:.5em;">
-                                                                <ui:repeat value="#{dsf.controlledVocabularyValues}" var="cvv" rendered="#{!empty dsf.controlledVocabularyValues}">
-                                                                   <h:outputText value="#{cvv.getLocaleStrValue(mdLangCode)}"  style="margin-right:.5em;display:inline-block;"/>
-                                                                </ui:repeat>
-                                                            </p:outputPanel>
-                                                            -->
-                                                            <p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" styleClass="form-control"
-                                                                                  filter="#{(dsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" filterMatchMode="contains" label="#{bundle.select}"  multiple="true" showHeader="#{(dsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" 
-                                                                                  id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples}">
-                                                                <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"/>
-                                                            </p:selectCheckboxMenu>
+                                                                <h:panelGroup id="vocab_widget_container" layout="block">
+                                                                <p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
+                                                                                 id="unique1" rendered="#{!dsf.datasetFieldType.allowMultiples and (vocabSize lt 501 or ControlledVocabularyAutocompleteBean.isSlowMode(dsf.datasetFieldType.id))}" filter="#{(vocabSize ge 10 and vocabSize le 500) ? 'true':'false'}" filterMatchMode="contains">
+                                                                    <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
+                                                                    <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"/>
+                                                                </p:selectOneMenu>
+                                                                <p:autoComplete value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter"
+                                                                                 id="unique1_autocomplete" rendered="#{!dsf.datasetFieldType.allowMultiples and vocabSize gt 500 and not ControlledVocabularyAutocompleteBean.isSlowMode(dsf.datasetFieldType.id)}"
+                                                                                 completeMethod="#{ControlledVocabularyAutocompleteBean.complete}"
+                                                                                 var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
+                                                                                 forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
+                                                                                 maxResults="100" moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
+                                                                                 placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
+                                                                    <f:attribute name="dsf" value="#{dsf}"/>
+                                                                </p:autoComplete>
+                                                                <p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" styleClass="form-control"
+                                                                                      filter="#{(vocabSize ge 10 and vocabSize le 500) ? 'true':'false'}" filterMatchMode="contains" label="#{bundle.select}"  multiple="true" showHeader="#{(vocabSize ge 10) ? 'true':'false'}"
+                                                                                      panelStyleClass="#{vocabSize gt 500 ? 'no-selectall' : ''}"
+                                                                                      id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples and (vocabSize lt 501 or ControlledVocabularyAutocompleteBean.isSlowMode(dsf.datasetFieldType.id))}">
+                                                                    <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"/>
+                                                                </p:selectCheckboxMenu>
+                                                                <p:autoComplete value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
+                                                                                 id="unique2_autocomplete" rendered="#{dsf.datasetFieldType.allowMultiples and vocabSize gt 500 and not ControlledVocabularyAutocompleteBean.isSlowMode(dsf.datasetFieldType.id)}"
+                                                                                 completeMethod="#{ControlledVocabularyAutocompleteBean.complete}"
+                                                                                 var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
+                                                                                 forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
+                                                                                 multiple="true" maxResults="100" moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
+                                                                                 placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
+                                                                    <f:attribute name="dsf" value="#{dsf}"/>
+                                                                </p:autoComplete>
+                                                                <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
+                                                                               styleClass="vocab-slow-link"
+                                                                               rendered="#{vocabSize gt 500 and not ControlledVocabularyAutocompleteBean.isSlowMode(dsf.datasetFieldType.id)}"
+                                                                               actionListener="#{ControlledVocabularyAutocompleteBean.switchToSlowMode(dsf.datasetFieldType.id)}"
+                                                                               process="@this vocab_widget_container"
+                                                                               update="vocab_widget_container">
+                                                                    <h:outputFormat value="#{bundle['controlledvocabulary.showAll']}">
+                                                                        <f:param value="#{vocabSize}"/>
+                                                                    </h:outputFormat>
+                                                                </p:commandLink>
+                                                            </h:panelGroup>
                                                             <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty dsf.validationMessage}">
                                                                 <span class="ui-message-error-detail">#{dsf.validationMessage}</span>
                                                             </div>
@@ -380,30 +406,50 @@
                                                             </ui:fragment>
                                                             <!-- MOVED SELECT ONE TO dataFieldForEdit -->
                                                             <div jsf:rendered="#{subdsf.datasetFieldType.controlledVocabulary}" data-cvoc-managed-field="#{settingsWrapper.isCvocField(subdsf.datasetFieldType.id)? subdsf.datasetFieldType.name : ''}">
-                                                                <p:selectOneMenu id="cvv" value="#{subdsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;"
-                                                                                 rendered="#{!subdsf.datasetFieldType.allowMultiples}" filter="#{(subdsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" filterMatchMode="contains" >
-                                                                    <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
-                                                                    <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}" />
-                                                                </p:selectOneMenu>
-                                                                <!--
-                                                                <p:outputPanel id="selectedValsListCompound" style="padding-top:.5em;">
-                                                                    <ui:repeat value="#{subdsf.controlledVocabularyValues}" var="cvv" rendered="#{!empty subdsf.controlledVocabularyValues}">
-                                                                        <h:outputText value="#{cvv.getLocaleStrValue(mdLangCode)}"  style="margin-right:.5em;display:inline-block;"/>
-                                                                    </ui:repeat>
-                                                                </p:outputPanel>
-                                                                -->
-                                                                <ui:remove>
-                                                                <!-- Todo: If there are instances of multi-val cvv in a compound field, some addition will probably be needed for accessibility -
-                                                                     to associate this field with the label above (as was done in this commit for the single value cvv in a compound field case).
-                                                                     I did that by inspecting the html source produced, so skipping this unless/until I find an example. 
-                                                                -->
-                                                                </ui:remove> 
+                                                                <c:set var="subVocabSize" value="#{subdsf.datasetFieldType.controlledVocabularyValues.size()}"/>
+                                                                <h:panelGroup id="vocab_widget_sub_container" layout="block">
+                                                                   <p:selectOneMenu id="cvv" value="#{subdsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;"
+                                                                                     rendered="#{!subdsf.datasetFieldType.allowMultiples and (subVocabSize lt 501 or ControlledVocabularyAutocompleteBean.isSlowMode(subdsf.datasetFieldType.id))}" filter="#{(subVocabSize ge 10 and subVocabSize le 500) ? 'true':'false'}" filterMatchMode="contains">
+                                                                        <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
+                                                                        <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}" />
+                                                                    </p:selectOneMenu>
+                                                                    <p:autoComplete id="cvv_autocomplete" value="#{subdsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter"
+                                                                                     rendered="#{!subdsf.datasetFieldType.allowMultiples and subVocabSize gt 500 and not ControlledVocabularyAutocompleteBean.isSlowMode(subdsf.datasetFieldType.id)}"
+                                                                                     completeMethod="#{ControlledVocabularyAutocompleteBean.complete}"
+                                                                                     var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
+                                                                                     forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
+                                                                                     maxResults="100" moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
+                                                                                     placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
+                                                                        <f:attribute name="dsf" value="#{subdsf}"/>
+                                                                    </p:autoComplete>
+                                                                    
                                                                     <p:selectCheckboxMenu value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
-                                                                                          rendered="#{subdsf.datasetFieldType.allowMultiples}" label="#{bundle.select}" multiple="true"
-                                                                                          filter="#{(subdsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" filterMatchMode="contains" 
-                                                                                          showHeader="#{(subdsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}">
+                                                                                          rendered="#{subdsf.datasetFieldType.allowMultiples and (subVocabSize lt 501 or ControlledVocabularyAutocompleteBean.isSlowMode(subdsf.datasetFieldType.id))}" label="#{bundle.select}" multiple="true"
+                                                                                          filter="#{(subVocabSize ge 10 and subVocabSize le 500) ? 'true':'false'}" filterMatchMode="contains" 
+                                                                                          showHeader="#{(subVocabSize ge 10) ? 'true':'false'}"
+                                                                                          panelStyleClass="#{subVocabSize gt 500 ? 'no-selectall' : ''}">
                                                                         <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}" />
                                                                     </p:selectCheckboxMenu>
+                                                                    <p:autoComplete id="cvv_multi_autocomplete" value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
+                                                                                     rendered="#{subdsf.datasetFieldType.allowMultiples and subVocabSize gt 500 and not ControlledVocabularyAutocompleteBean.isSlowMode(subdsf.datasetFieldType.id)}"
+                                                                                     completeMethod="#{ControlledVocabularyAutocompleteBean.complete}"
+                                                                                     var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
+                                                                                     forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
+                                                                                     multiple="true" maxResults="100" moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
+                                                                                     placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
+                                                                        <f:attribute name="dsf" value="#{subdsf}"/>
+                                                                    </p:autoComplete>
+                                                                    <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
+                                                                                   styleClass="vocab-slow-link"
+                                                                                   rendered="#{subVocabSize gt 500 and not ControlledVocabularyAutocompleteBean.isSlowMode(subdsf.datasetFieldType.id)}"
+                                                                                   actionListener="#{ControlledVocabularyAutocompleteBean.switchToSlowMode(subdsf.datasetFieldType.id)}"
+                                                                                   process="@this vocab_widget_sub_container"
+                                                                                   update="vocab_widget_sub_container">
+                                                                        <h:outputFormat value="#{bundle['controlledvocabulary.showAll']}">
+                                                                            <f:param value="#{subVocabSize}"/>
+                                                                        </h:outputFormat>
+                                                                    </p:commandLink>
+                                                                </h:panelGroup>
 
                                                                 <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty subdsf.validationMessage}">
                                                                     <span class="ui-message-error-detail">#{subdsf.validationMessage}</span>
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 7fe66f7dcff..6538930f793 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -109,6 +109,22 @@ td.col-select-width, th.col-select-width {width:36px;}
 .clear-both {clear:both;}
 
 table.selectManyCheckboxBlock input {margin-right:4px;}
+
+/* Controlled Vocabulary Autocomplete / Slow Mode */
+.vocab-slow-link {
+    font-size: 0.85em;
+    color: #666;
+    display: block;
+    margin-top: 4px;
+    text-align: right;
+}
+.vocab-slow-link:hover {
+    color: #333;
+    text-decoration: underline;
+}
+body .no-selectall .ui-selectcheckboxmenu-header .ui-chkbox {
+    display: none;
+}
 table.selectManyCheckboxBlock label {font-weight:normal;}
 .normal-text {font-weight:normal;}
 .normal-text input {margin-right:4px;}
diff --git a/src/main/webapp/search/advanced.xhtml b/src/main/webapp/search/advanced.xhtml
index c921fe930d5..5ac2b7cc91b 100644
--- a/src/main/webapp/search/advanced.xhtml
+++ b/src/main/webapp/search/advanced.xhtml
@@ -90,12 +90,41 @@
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.subject.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
-                                        <div class="ui-inputfield form-control select-scroll-block">
-                                            <p:selectManyCheckbox value="#{AdvancedSearchPage.dvFieldSubject}" layout="pageDirection">
-                                                <f:selectItems value="#{AdvancedSearchPage.dvFieldSubjectValues}" var="cvv"
-                                                               itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"/>
-                                            </p:selectManyCheckbox>
-                                        </div>
+                                            <h:panelGroup id="vocab_widget_subject" layout="block">
+                                                <c:set var="vocabSize" value="#{AdvancedSearchPage.dvFieldSubjectValues.size()}"/>
+                                                <p:selectCheckboxMenu value="#{AdvancedSearchPage.dvFieldSubject}"
+                                                                      converter="controlledVocabularyValueConverter"
+                                                                      styleClass="form-control"
+                                                                      filter="#{(vocabSize ge 10 and vocabSize le 500) ? 'true':'false'}" filterMatchMode="contains" 
+                                                                      label="#{bundle.select}" multiple="true" 
+                                                                      showHeader="#{(vocabSize ge 10) ? 'true':'false'}"
+                                                                      panelStyleClass="#{vocabSize gt 500 ? 'no-selectall' : ''}"
+                                                                      rendered="#{vocabSize lt 501 or ControlledVocabularyAutocompleteBean.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}">
+                                                    <f:selectItems value="#{AdvancedSearchPage.dvFieldSubjectValues}" var="cvv"
+                                                                   itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
+                                                </p:selectCheckboxMenu>
+                                                <p:autoComplete value="#{AdvancedSearchPage.dvFieldSubject}"
+                                                                 id="dvFieldSubject_autocomplete"
+                                                                 converter="controlledVocabularyValueConverter"
+                                                                 rendered="#{vocabSize gt 500 and not ControlledVocabularyAutocompleteBean.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
+                                                                 completeMethod="#{ControlledVocabularyAutocompleteBean.complete}"
+                                                                 var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"
+                                                                 forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
+                                                                 multiple="true" maxResults="100" moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
+                                                                 placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
+                                                    <f:attribute name="dsft" value="#{AdvancedSearchPage.subjectDatasetFieldType}"/>
+                                                </p:autoComplete>
+                                                <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
+                                                               styleClass="vocab-slow-link"
+                                                               rendered="#{vocabSize gt 500 and not ControlledVocabularyAutocompleteBean.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
+                                                               actionListener="#{ControlledVocabularyAutocompleteBean.switchToSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
+                                                               process="@this vocab_widget_subject"
+                                                               update="vocab_widget_subject">
+                                                    <h:outputFormat value="#{bundle['controlledvocabulary.showAll']}">
+                                                        <f:param value="#{vocabSize}"/>
+                                                    </h:outputFormat>
+                                                </p:commandLink>
+                                            </h:panelGroup>
                                     </div>
                                 </div>
                             </div>
@@ -133,12 +162,41 @@
                                                         <f:passThroughAttribute name="data-cvoc-placeholder" value=""/>
                                                     </p:inputText>
                                                 </ui:fragment>
-                                                <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{!empty item.controlledVocabularyValues}">
-                                                    <p:selectManyCheckbox value="#{item.listValues}" layout="pageDirection">
+                                                <h:panelGroup id="vocab_widget_mdb" layout="block">
+                                                    <c:set var="vocabSize" value="#{item.controlledVocabularyValues.size()}"/>
+                                                    <p:selectCheckboxMenu value="#{item.listValues}"
+                                                                          converter="controlledVocabularyValueConverter"
+                                                                          styleClass="form-control"
+                                                                          filter="#{(vocabSize ge 10 and vocabSize le 500) ? 'true':'false'}" filterMatchMode="contains" 
+                                                                          label="#{bundle.select}" multiple="true" 
+                                                                          showHeader="#{(vocabSize ge 10) ? 'true':'false'}"
+                                                                          panelStyleClass="#{vocabSize gt 500 ? 'no-selectall' : ''}"
+                                                                          rendered="#{!empty item.controlledVocabularyValues and (vocabSize lt 501 or ControlledVocabularyAutocompleteBean.isSlowMode(item.id))}">
                                                         <f:selectItems value="#{item.controlledVocabularyValues}" var="cvs"
-                                                                       itemLabel="#{cvs.localeStrValue}" itemValue="#{cvs.strValue}"/>
-                                                    </p:selectManyCheckbox>
-                                                </div>
+                                                                       itemLabel="#{cvs.localeStrValue}" itemValue="#{cvs}"/>
+                                                    </p:selectCheckboxMenu>
+                                                    <p:autoComplete value="#{item.listValues}"
+                                                                     id="searchValue_autocomplete"
+                                                                     converter="controlledVocabularyValueConverter"
+                                                                     rendered="#{!empty item.controlledVocabularyValues and vocabSize gt 500 and not ControlledVocabularyAutocompleteBean.isSlowMode(item.id)}"
+                                                                     completeMethod="#{ControlledVocabularyAutocompleteBean.complete}"
+                                                                     var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"
+                                                                     forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
+                                                                     multiple="true" maxResults="100" moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
+                                                                     placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
+                                                        <f:attribute name="dsft" value="#{item}"/>
+                                                    </p:autoComplete>
+                                                    <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
+                                                                   styleClass="vocab-slow-link"
+                                                                   rendered="#{!empty item.controlledVocabularyValues and vocabSize gt 500 and not ControlledVocabularyAutocompleteBean.isSlowMode(item.id)}"
+                                                                   actionListener="#{ControlledVocabularyAutocompleteBean.switchToSlowMode(item.id)}"
+                                                                   process="@this vocab_widget_mdb"
+                                                                   update="vocab_widget_mdb">
+                                                        <h:outputFormat value="#{bundle['controlledvocabulary.showAll']}">
+                                                            <f:param value="#{vocabSize}"/>
+                                                        </h:outputFormat>
+                                                    </p:commandLink>
+                                                </h:panelGroup>
                                             </div>
                                         </div>
                                     </ui:repeat>