From 99eaa4668dd99e13e759b138739a14d80f378dad Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Tue, 11 Aug 2026 16:40:37 -0400
Subject: [PATCH 1/8] autocomplete for large cvv

---
 .../edu/harvard/iq/dataverse/DatasetPage.java |  74 ++++++++
 .../dataverse/search/AdvancedSearchPage.java  |  80 +++++++++
 src/main/java/propertyFiles/Bundle.properties |   6 +
 src/main/webapp/metadataFragment.xhtml        | 162 ++++++++++++++----
 src/main/webapp/resources/css/structure.css   |  12 ++
 src/main/webapp/search/advanced.xhtml         | 112 ++++++++++--
 6 files changed, 398 insertions(+), 48 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 2c78873fa71..499776fe620 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -7041,4 +7041,78 @@ public void setRequestedCSL(String requestedCSL) {
     public void validateEmbargoReason(FacesContext context, UIComponent component, Object value) {
         FileUtil.validateEmbargoReason(context, component, value, removeEmbargo);
     }
+
+    private final Map<String, Integer> autocompleteLimits = new HashMap<>();
+    private final Map<String, String> autocompleteLastQueries = new HashMap<>();
+    private final Set<Long> slowModeFieldTypeIds = new HashSet<>();
+
+    public List<ControlledVocabularyValue> completeControlledVocabularyValue(String query) {
+        UIComponent component = UIComponent.getCurrentComponent(FacesContext.getCurrentInstance());
+        DatasetField dsf = (DatasetField) component.getAttributes().get("dsf");
+        if (dsf == null || dsf.getDatasetFieldType() == null || dsf.getDatasetFieldType().getControlledVocabularyValues() == null) {
+            return Collections.emptyList();
+        }
+
+        String clientId = component.getClientId();
+        String lastQuery = autocompleteLastQueries.get(clientId);
+        Integer limit = autocompleteLimits.get(clientId);
+
+        if (limit == null || !StringUtils.equals(StringUtils.trimToEmpty(query), StringUtils.trimToEmpty(lastQuery))) {
+            limit = 100;
+            autocompleteLimits.put(clientId, limit);
+        }
+        autocompleteLastQueries.put(clientId, query != null ? query : "");
+
+        List<ControlledVocabularyValue> results = new ArrayList<>();
+        String queryLower = query.toLowerCase();
+        String mdLangCode = null;
+        if (dsf.getDatasetVersion() != null && dsf.getDatasetVersion().getDataset() != null) {
+            mdLangCode = dsf.getDatasetVersion().getDataset().getMetadataLanguage();
+        }
+
+        for (ControlledVocabularyValue cvv : dsf.getDatasetFieldType().getControlledVocabularyValues()) {
+            if (cvv.getLocaleStrValue(mdLangCode).toLowerCase().contains(queryLower)) {
+                results.add(cvv);
+            }
+            if (results.size() >= limit + 1) {
+                break;
+            }
+        }
+        return results;
+    }
+
+    public void onMoreText() {
+        Map<String, String> params = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
+        String clientId = params.get("autocompleteClientId");
+        String query = params.get("autocompleteQuery");
+        String widgetVar = params.get("autocompleteWidgetVar");
+        if (clientId != null) {
+            Integer limit = autocompleteLimits.get(clientId);
+            if (limit == null) {
+                limit = 100;
+            }
+            autocompleteLimits.put(clientId, limit + 100);
+            autocompleteLastQueries.put(clientId, query != null ? query : "");
+
+            if (widgetVar != null) {
+                PrimeFaces.current().ajax().addCallbackParam("widgetVar", widgetVar);
+                PrimeFaces.current().ajax().addCallbackParam("query", query);
+                PrimeFaces.current().ajax().addCallbackParam("scrollPos", params.get("autocompleteScrollPos"));
+            }
+        }
+    }
+
+    public Map<String, Integer> getAutocompleteLimits() {
+        return autocompleteLimits;
+    }
+
+    public boolean isSlowMode(Long fieldTypeId) {
+        return fieldTypeId != null && slowModeFieldTypeIds.contains(fieldTypeId);
+    }
+
+    public void switchToSlowMode(Long fieldTypeId) {
+        if (fieldTypeId != null) {
+            slowModeFieldTypeIds.add(fieldTypeId);
+        }
+    }
 }
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..8b6d7048726 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
@@ -15,17 +15,22 @@
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 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;
 import jakarta.json.JsonObject;
 
 import org.apache.commons.lang3.StringUtils;
+import org.primefaces.PrimeFaces;
 
 @ViewScoped
 @Named("AdvancedSearchPage")
@@ -265,6 +270,81 @@ public Collection<ControlledVocabularyValue> getDvFieldSubjectValues() {
         return subjectType.getControlledVocabularyValues();
     }
 
+    public DatasetFieldType getSubjectDatasetFieldType() {
+        return datasetFieldService.findByName(DatasetFieldConstant.subject);
+    }
+
+    private final Map<String, Integer> autocompleteLimits = new HashMap<>();
+    private final Map<String, String> autocompleteLastQueries = new HashMap<>();
+    private final Set<Long> slowModeFieldTypeIds = new java.util.HashSet<>();
+
+    public List<ControlledVocabularyValue> completeControlledVocabularyValue(String query) {
+        UIComponent component = UIComponent.getCurrentComponent(FacesContext.getCurrentInstance());
+        DatasetFieldType dsft = (DatasetFieldType) component.getAttributes().get("dsft");
+        if (dsft == null || dsft.getControlledVocabularyValues() == null || query == null) {
+            return Collections.emptyList();
+        }
+
+        String clientId = component.getClientId();
+        String lastQuery = autocompleteLastQueries.get(clientId);
+        Integer limit = autocompleteLimits.get(clientId);
+
+        if (limit == null || !StringUtils.equals(StringUtils.trimToEmpty(query), StringUtils.trimToEmpty(lastQuery))) {
+            limit = 100;
+            autocompleteLimits.put(clientId, limit);
+        }
+        autocompleteLastQueries.put(clientId, query != null ? query : "");
+
+        List<ControlledVocabularyValue> results = new ArrayList<>();
+        String queryLower = query.toLowerCase();
+
+        for (ControlledVocabularyValue cvv : dsft.getControlledVocabularyValues()) {
+            String localeLabel = cvv.getLocaleStrValue();
+            if (localeLabel != null && localeLabel.toLowerCase().contains(queryLower)) {
+                results.add(cvv);
+            }
+            if (results.size() >= limit + 1) {
+                break;
+            }
+        }
+        return results;
+    }
+
+    public void onMoreText() {
+        Map<String, String> params = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
+        String clientId = params.get("autocompleteClientId");
+        String query = params.get("autocompleteQuery");
+        String widgetVar = params.get("autocompleteWidgetVar");
+        if (clientId != null) {
+            Integer limit = autocompleteLimits.get(clientId);
+            if (limit == null) {
+                limit = 100;
+            }
+            autocompleteLimits.put(clientId, limit + 100);
+            autocompleteLastQueries.put(clientId, query != null ? query : "");
+
+            if (widgetVar != null) {
+                PrimeFaces.current().ajax().addCallbackParam("widgetVar", widgetVar);
+                PrimeFaces.current().ajax().addCallbackParam("query", query);
+                PrimeFaces.current().ajax().addCallbackParam("scrollPos", params.get("autocompleteScrollPos"));
+            }
+        }
+    }
+
+    public Map<String, Integer> getAutocompleteLimits() {
+        return autocompleteLimits;
+    }
+
+    public boolean isSlowMode(Long fieldTypeId) {
+        return fieldTypeId != null && slowModeFieldTypeIds.contains(fieldTypeId);
+    }
+
+    public void switchToSlowMode(Long fieldTypeId) {
+        if (fieldTypeId != null) {
+            slowModeFieldTypeIds.add(fieldTypeId);
+        }
+    }
+
     public String getDsPublicationDate() {
         return dsPublicationDate;
     }
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 0825816048d..182aa1865e1 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=Only the first 100 matches shown. Type to filter or click to load more.
+controlledvocabulary.showAll=See all entries (slow)
+controlledvocabulary.showAll.tooltip=Load the full list. This may be slow for large vocabularies.
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 37246ddf40f..ac392997131 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -299,23 +299,45 @@
                                                 <ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
                                                     <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_#{dsf.datasetFieldType.id}" 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 (dsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or DatasetPage.isSlowMode(dsf.datasetFieldType.id))}" 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:autoComplete value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter"
+                                                                                 id="unique1_autocomplete" rendered="#{!dsf.datasetFieldType.allowMultiples and dsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not DatasetPage.isSlowMode(dsf.datasetFieldType.id)}"
+                                                                                 completeMethod="#{DatasetPage.completeControlledVocabularyValue}"
+                                                                                 var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
+                                                                                 forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
+                                                                                 maxResults="#{DatasetPage.autocompleteLimits[component.clientId] == null ? 100 : DatasetPage.autocompleteLimits[component.clientId]}"
+                                                                                 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="#{(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 and (dsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or DatasetPage.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 dsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not DatasetPage.isSlowMode(dsf.datasetFieldType.id)}"
+                                                                                 completeMethod="#{DatasetPage.completeControlledVocabularyValue}"
+                                                                                 var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
+                                                                                 forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
+                                                                                 multiple="true" maxResults="#{DatasetPage.autocompleteLimits[component.clientId] == null ? 100 : DatasetPage.autocompleteLimits[component.clientId]}"
+                                                                                 moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
+                                                                                 placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
+                                                                    <f:attribute name="dsf" value="#{dsf}"/>
+                                                                </p:autoComplete>
+                                                                <p:commandLink value="#{bundle['controlledvocabulary.showAll']}"
+                                                                               title="#{bundle['controlledvocabulary.showAll.tooltip']}"
+                                                                               styleClass="vocab-slow-link"
+                                                                               rendered="#{dsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not DatasetPage.isSlowMode(dsf.datasetFieldType.id)}"
+                                                                               actionListener="#{DatasetPage.switchToSlowMode(dsf.datasetFieldType.id)}"
+                                                                               process="@this"
+                                                                               update="@parent"/>
+                                                            </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 +402,47 @@
                                                             </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> 
+                                                                <h:panelGroup id="vocab_widget_sub_#{subdsf.datasetFieldType.id}" 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 (subdsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or DatasetPage.isSlowMode(subdsf.datasetFieldType.id))}" 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:autoComplete id="cvv_autocomplete" value="#{subdsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter"
+                                                                                     rendered="#{!subdsf.datasetFieldType.allowMultiples and subdsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not DatasetPage.isSlowMode(subdsf.datasetFieldType.id)}"
+                                                                                     completeMethod="#{DatasetPage.completeControlledVocabularyValue}"
+                                                                                     var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
+                                                                                     forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
+                                                                                     maxResults="#{DatasetPage.autocompleteLimits[component.clientId] == null ? 100 : DatasetPage.autocompleteLimits[component.clientId]}"
+                                                                                     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"
+                                                                                          rendered="#{subdsf.datasetFieldType.allowMultiples and (subdsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or DatasetPage.isSlowMode(subdsf.datasetFieldType.id))}" 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'}">
                                                                         <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 subdsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not DatasetPage.isSlowMode(subdsf.datasetFieldType.id)}"
+                                                                                     completeMethod="#{DatasetPage.completeControlledVocabularyValue}"
+                                                                                     var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
+                                                                                     forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
+                                                                                     multiple="true" maxResults="#{DatasetPage.autocompleteLimits[component.clientId] == null ? 100 : DatasetPage.autocompleteLimits[component.clientId]}"
+                                                                                     moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
+                                                                                     placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
+                                                                        <f:attribute name="dsf" value="#{subdsf}"/>
+                                                                    </p:autoComplete>
+                                                                    <p:commandLink value="#{bundle['controlledvocabulary.showAll']}"
+                                                                                   title="#{bundle['controlledvocabulary.showAll.tooltip']}"
+                                                                                   styleClass="vocab-slow-link"
+                                                                                   rendered="#{subdsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not DatasetPage.isSlowMode(subdsf.datasetFieldType.id)}"
+                                                                                   actionListener="#{DatasetPage.switchToSlowMode(subdsf.datasetFieldType.id)}"
+                                                                                   process="@this"
+                                                                                   update="@parent"/>
+                                                                </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>
@@ -437,6 +476,57 @@
                 </div>
             </ui:repeat>
         </div>
+        <p:remoteCommand name="loadMoreResults" actionListener="#{DatasetPage.onMoreText()}"
+                         oncomplete="if(args.widgetVar && PF(args.widgetVar)) {
+                             var widget = PF(args.widgetVar);
+                             var scrollPos = args.scrollPos;
+                             var query = args.query;
+
+                             var originalHide = widget.hide;
+                             widget.hide = function() {}; // Disable hide temporarily
+
+                             var originalHandleResponse = widget.handleResponse;
+                             widget.handleResponse = function(data) {
+                                 this.hide = originalHide; // Restore hide
+                                 originalHandleResponse.apply(this, arguments);
+                                 this.panel.scrollTop(scrollPos);
+                                 this.handleResponse = originalHandleResponse;
+                             };
+                             widget.input.focus();
+                             widget.search(query);
+                         }" />
+        <script>
+            //<![CDATA[
+            $(document).off('mousedown.autocomplete-moretext mouseup.autocomplete-moretext click.autocomplete-moretext').on('mousedown.autocomplete-moretext mouseup.autocomplete-moretext click.autocomplete-moretext', '.ui-autocomplete-moretext', function(e) {
+                e.preventDefault();
+                e.stopPropagation();
+                if (e.type !== 'mousedown') return false;
+
+                var panel = $(this).closest('.ui-autocomplete-panel');
+                var clientId = panel.attr('id').replace(/_panel$/, '');
+                var widget = null;
+                var widgetVar = null;
+                for (var property in PF()) {
+                    if (PF()[property] instanceof PrimeFaces.widget.AutoComplete && PF()[property].id === clientId) {
+                        widget = PF()[property];
+                        widgetVar = property;
+                        break;
+                    }
+                }
+                if (widget && typeof loadMoreResults === 'function') {
+                    var query = widget.input.val();
+                    var scrollPos = panel.scrollTop();
+                    loadMoreResults([
+                        {name: 'autocompleteClientId', value: clientId},
+                        {name: 'autocompleteQuery', value: query},
+                        {name: 'autocompleteWidgetVar', value: widgetVar},
+                        {name: 'autocompleteScrollPos', value: scrollPos}
+                    ]);
+                }
+                return false;
+            });
+            //]]>
+        </script>
         </p:fragment>
     </ui:fragment>
  <script>
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 7fe66f7dcff..2eaa300c8bc 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -109,6 +109,18 @@ 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;
+}
+.vocab-slow-link:hover {
+    color: #333;
+    text-decoration: underline;
+}
 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..6057933f621 100644
--- a/src/main/webapp/search/advanced.xhtml
+++ b/src/main/webapp/search/advanced.xhtml
@@ -90,12 +90,32 @@
                                               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">
+                                            <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{AdvancedSearchPage.dvFieldSubjectValues.size() lt 501 or AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}">
+                                                <p:selectManyCheckbox value="#{AdvancedSearchPage.dvFieldSubject}" layout="pageDirection">
+                                                    <f:selectItems value="#{AdvancedSearchPage.dvFieldSubjectValues}" var="cvv"
+                                                                   itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"/>
+                                                </p:selectManyCheckbox>
+                                            </div>
+                                            <p:autoComplete value="#{AdvancedSearchPage.dvFieldSubject}"
+                                                             id="dvFieldSubject_autocomplete"
+                                                             rendered="#{AdvancedSearchPage.dvFieldSubjectValues.size() gt 500 and not AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
+                                                             completeMethod="#{AdvancedSearchPage.completeControlledVocabularyValue}"
+                                                             var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"
+                                                             forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
+                                                             multiple="true" maxResults="#{AdvancedSearchPage.autocompleteLimits[component.clientId] == null ? 100 : AdvancedSearchPage.autocompleteLimits[component.clientId]}"
+                                                             moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
+                                                             placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
+                                                <f:attribute name="dsft" value="#{AdvancedSearchPage.subjectDatasetFieldType}"/>
+                                            </p:autoComplete>
+                                            <p:commandLink value="#{bundle['controlledvocabulary.showAll']}"
+                                                           title="#{bundle['controlledvocabulary.showAll.tooltip']}"
+                                                           styleClass="vocab-slow-link"
+                                                           rendered="#{AdvancedSearchPage.dvFieldSubjectValues.size() gt 500 and not AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
+                                                           actionListener="#{AdvancedSearchPage.switchToSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
+                                                           process="@this"
+                                                           update="@parent"/>
+                                        </h:panelGroup>
                                     </div>
                                 </div>
                             </div>
@@ -133,12 +153,32 @@
                                                         <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">
-                                                        <f:selectItems value="#{item.controlledVocabularyValues}" var="cvs"
-                                                                       itemLabel="#{cvs.localeStrValue}" itemValue="#{cvs.strValue}"/>
-                                                    </p:selectManyCheckbox>
-                                                </div>
+                                                <h:panelGroup id="vocab_widget_mdb" layout="block">
+                                                    <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{!empty item.controlledVocabularyValues and (item.controlledVocabularyValues.size() lt 501 or AdvancedSearchPage.isSlowMode(item.id))}">
+                                                        <p:selectManyCheckbox value="#{item.listValues}" layout="pageDirection">
+                                                            <f:selectItems value="#{item.controlledVocabularyValues}" var="cvs"
+                                                                           itemLabel="#{cvs.localeStrValue}" itemValue="#{cvs.strValue}"/>
+                                                        </p:selectManyCheckbox>
+                                                    </div>
+                                                    <p:autoComplete value="#{item.listValues}"
+                                                                     id="searchValue_autocomplete"
+                                                                     rendered="#{!empty item.controlledVocabularyValues and item.controlledVocabularyValues.size() gt 500 and not AdvancedSearchPage.isSlowMode(item.id)}"
+                                                                     completeMethod="#{AdvancedSearchPage.completeControlledVocabularyValue}"
+                                                                     var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"
+                                                                     forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
+                                                                     multiple="true" maxResults="#{AdvancedSearchPage.autocompleteLimits[component.clientId] == null ? 100 : AdvancedSearchPage.autocompleteLimits[component.clientId]}"
+                                                                     moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
+                                                                     placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
+                                                        <f:attribute name="dsft" value="#{item}"/>
+                                                    </p:autoComplete>
+                                                    <p:commandLink value="#{bundle['controlledvocabulary.showAll']}"
+                                                                   title="#{bundle['controlledvocabulary.showAll.tooltip']}"
+                                                                   styleClass="vocab-slow-link"
+                                                                   rendered="#{!empty item.controlledVocabularyValues and item.controlledVocabularyValues.size() gt 500 and not AdvancedSearchPage.isSlowMode(item.id)}"
+                                                                   actionListener="#{AdvancedSearchPage.switchToSlowMode(item.id)}"
+                                                                   process="@this"
+                                                                   update="@parent"/>
+                                                </h:panelGroup>
                                             </div>
                                         </div>
                                     </ui:repeat>
@@ -249,10 +289,58 @@
                         <div class="button-block">
                             <p:commandButton styleClass="btn btn-default" value="#{bundle.find}" action="#{AdvancedSearchPage.find()}"/>
                         </div>
+                        <p:remoteCommand name="loadMoreResults" actionListener="#{AdvancedSearchPage.onMoreText()}"
+                                         oncomplete="if(args.widgetVar && PF(args.widgetVar)) {
+                                             var widget = PF(args.widgetVar);
+                                             var scrollPos = args.scrollPos;
+                                             var query = args.query;
+
+                                             var originalHide = widget.hide;
+                                             widget.hide = function() {}; // Disable hide temporarily
+
+                                             var originalHandleResponse = widget.handleResponse;
+                                             widget.handleResponse = function(data) {
+                                                 this.hide = originalHide; // Restore hide
+                                                 originalHandleResponse.apply(this, arguments);
+                                                 this.panel.scrollTop(scrollPos);
+                                                 this.handleResponse = originalHandleResponse;
+                                             };
+                                             widget.input.focus();
+                                             widget.search(query);
+                                         }" />
                     </h:form>
                 </div>
                 <script>
                     //<![CDATA[
+                    $(document).off('mousedown.autocomplete-moretext mouseup.autocomplete-moretext click.autocomplete-moretext').on('mousedown.autocomplete-moretext mouseup.autocomplete-moretext click.autocomplete-moretext', '.ui-autocomplete-moretext', function(e) {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        if (e.type !== 'mousedown') return false;
+
+                        var panel = $(this).closest('.ui-autocomplete-panel');
+                        var clientId = panel.attr('id').replace(/_panel$/, '');
+                        var widget = null;
+                        var widgetVar = null;
+                        for (var property in PF()) {
+                            if (PF()[property] instanceof PrimeFaces.widget.AutoComplete && PF()[property].id === clientId) {
+                                widget = PF()[property];
+                                widgetVar = property;
+                                break;
+                            }
+                        }
+                        if (widget && typeof loadMoreResults === 'function') {
+                            var query = widget.input.val();
+                            var scrollPos = panel.scrollTop();
+                            loadMoreResults([
+                                {name: 'autocompleteClientId', value: clientId},
+                                {name: 'autocompleteQuery', value: query},
+                                {name: 'autocompleteWidgetVar', value: widgetVar},
+                                {name: 'autocompleteScrollPos', value: scrollPos}
+                            ]);
+                        }
+                        return false;
+                    });
+
                     $(document).ready(function() {
                         //The select2 widget used in external vocab scripts has trouble determining the width of an input field if it is initially hidden
                         //Starting with the metadatablocks displayed and collapsing them here is a work-around to fix that.

From 1fff73d4c92321a26afc51ae39c0e05e39789232 Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Thu, 13 Aug 2026 09:29:03 -0400
Subject: [PATCH 2/8] allow switch to original widget

---
 .../edu/harvard/iq/dataverse/DatasetPage.java |  39 +------
 .../harvard/iq/dataverse/TemplatePage.java    |  40 +++++++
 .../dataverse/search/AdvancedSearchPage.java  |  43 +-------
 src/main/java/propertyFiles/Bundle.properties |   1 -
 src/main/webapp/metadataFragment.xhtml        |  98 ++++-------------
 src/main/webapp/search/advanced.xhtml         | 104 +++++-------------
 6 files changed, 92 insertions(+), 233 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 499776fe620..138a4c05cfa 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -7042,8 +7042,6 @@ public void validateEmbargoReason(FacesContext context, UIComponent component, O
         FileUtil.validateEmbargoReason(context, component, value, removeEmbargo);
     }
 
-    private final Map<String, Integer> autocompleteLimits = new HashMap<>();
-    private final Map<String, String> autocompleteLastQueries = new HashMap<>();
     private final Set<Long> slowModeFieldTypeIds = new HashSet<>();
 
     public List<ControlledVocabularyValue> completeControlledVocabularyValue(String query) {
@@ -7053,16 +7051,6 @@ public List<ControlledVocabularyValue> completeControlledVocabularyValue(String
             return Collections.emptyList();
         }
 
-        String clientId = component.getClientId();
-        String lastQuery = autocompleteLastQueries.get(clientId);
-        Integer limit = autocompleteLimits.get(clientId);
-
-        if (limit == null || !StringUtils.equals(StringUtils.trimToEmpty(query), StringUtils.trimToEmpty(lastQuery))) {
-            limit = 100;
-            autocompleteLimits.put(clientId, limit);
-        }
-        autocompleteLastQueries.put(clientId, query != null ? query : "");
-
         List<ControlledVocabularyValue> results = new ArrayList<>();
         String queryLower = query.toLowerCase();
         String mdLangCode = null;
@@ -7074,38 +7062,13 @@ public List<ControlledVocabularyValue> completeControlledVocabularyValue(String
             if (cvv.getLocaleStrValue(mdLangCode).toLowerCase().contains(queryLower)) {
                 results.add(cvv);
             }
-            if (results.size() >= limit + 1) {
+            if (results.size() >= 100) {
                 break;
             }
         }
         return results;
     }
 
-    public void onMoreText() {
-        Map<String, String> params = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
-        String clientId = params.get("autocompleteClientId");
-        String query = params.get("autocompleteQuery");
-        String widgetVar = params.get("autocompleteWidgetVar");
-        if (clientId != null) {
-            Integer limit = autocompleteLimits.get(clientId);
-            if (limit == null) {
-                limit = 100;
-            }
-            autocompleteLimits.put(clientId, limit + 100);
-            autocompleteLastQueries.put(clientId, query != null ? query : "");
-
-            if (widgetVar != null) {
-                PrimeFaces.current().ajax().addCallbackParam("widgetVar", widgetVar);
-                PrimeFaces.current().ajax().addCallbackParam("query", query);
-                PrimeFaces.current().ajax().addCallbackParam("scrollPos", params.get("autocompleteScrollPos"));
-            }
-        }
-    }
-
-    public Map<String, Integer> getAutocompleteLimits() {
-        return autocompleteLimits;
-    }
-
     public boolean isSlowMode(Long fieldTypeId) {
         return fieldTypeId != null && slowModeFieldTypeIds.contains(fieldTypeId);
     }
diff --git a/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java b/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
index 279944beaa7..aabbdd8a22a 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;
@@ -264,4 +268,40 @@ public String getInstructionsLabelFor(String fieldType) {
         return (fieldInstructions!=null && !fieldInstructions.isBlank()) ? fieldInstructions : BundleUtil.getStringFromBundle("template.instructions.empty.label");
     }
 
+    private final java.util.Set<Long> slowModeFieldTypeIds = new java.util.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> completeControlledVocabularyValue(String query) {
+        UIComponent component = UIComponent.getCurrentComponent(FacesContext.getCurrentInstance());
+        DatasetField dsf = (DatasetField) component.getAttributes().get("dsf");
+        if (dsf == null || dsf.getDatasetFieldType() == null || dsf.getDatasetFieldType().getControlledVocabularyValues() == null) {
+            return Collections.emptyList();
+        }
+
+        List<ControlledVocabularyValue> results = new ArrayList<>();
+        String queryLower = query.toLowerCase();
+        String mdLangCode = null;
+        if (dsf.getDatasetVersion() != null && dsf.getDatasetVersion().getDataset() != null) {
+            mdLangCode = dsf.getDatasetVersion().getDataset().getMetadataLanguage();
+        }
+
+        for (ControlledVocabularyValue cvv : dsf.getDatasetFieldType().getControlledVocabularyValues()) {
+            if (cvv.getLocaleStrValue(mdLangCode).toLowerCase().contains(queryLower)) {
+                results.add(cvv);
+            }
+            if (results.size() >= 100) {
+                break;
+            }
+        }
+        return results;
+    }
 }
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 8b6d7048726..381c2a72b35 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
@@ -17,6 +17,7 @@
 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;
@@ -30,7 +31,6 @@
 import jakarta.json.JsonObject;
 
 import org.apache.commons.lang3.StringUtils;
-import org.primefaces.PrimeFaces;
 
 @ViewScoped
 @Named("AdvancedSearchPage")
@@ -274,9 +274,7 @@ public DatasetFieldType getSubjectDatasetFieldType() {
         return datasetFieldService.findByName(DatasetFieldConstant.subject);
     }
 
-    private final Map<String, Integer> autocompleteLimits = new HashMap<>();
-    private final Map<String, String> autocompleteLastQueries = new HashMap<>();
-    private final Set<Long> slowModeFieldTypeIds = new java.util.HashSet<>();
+    private final Set<Long> slowModeFieldTypeIds = new HashSet<>();
 
     public List<ControlledVocabularyValue> completeControlledVocabularyValue(String query) {
         UIComponent component = UIComponent.getCurrentComponent(FacesContext.getCurrentInstance());
@@ -285,16 +283,6 @@ public List<ControlledVocabularyValue> completeControlledVocabularyValue(String
             return Collections.emptyList();
         }
 
-        String clientId = component.getClientId();
-        String lastQuery = autocompleteLastQueries.get(clientId);
-        Integer limit = autocompleteLimits.get(clientId);
-
-        if (limit == null || !StringUtils.equals(StringUtils.trimToEmpty(query), StringUtils.trimToEmpty(lastQuery))) {
-            limit = 100;
-            autocompleteLimits.put(clientId, limit);
-        }
-        autocompleteLastQueries.put(clientId, query != null ? query : "");
-
         List<ControlledVocabularyValue> results = new ArrayList<>();
         String queryLower = query.toLowerCase();
 
@@ -303,38 +291,13 @@ public List<ControlledVocabularyValue> completeControlledVocabularyValue(String
             if (localeLabel != null && localeLabel.toLowerCase().contains(queryLower)) {
                 results.add(cvv);
             }
-            if (results.size() >= limit + 1) {
+            if (results.size() >= 100) {
                 break;
             }
         }
         return results;
     }
 
-    public void onMoreText() {
-        Map<String, String> params = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
-        String clientId = params.get("autocompleteClientId");
-        String query = params.get("autocompleteQuery");
-        String widgetVar = params.get("autocompleteWidgetVar");
-        if (clientId != null) {
-            Integer limit = autocompleteLimits.get(clientId);
-            if (limit == null) {
-                limit = 100;
-            }
-            autocompleteLimits.put(clientId, limit + 100);
-            autocompleteLastQueries.put(clientId, query != null ? query : "");
-
-            if (widgetVar != null) {
-                PrimeFaces.current().ajax().addCallbackParam("widgetVar", widgetVar);
-                PrimeFaces.current().ajax().addCallbackParam("query", query);
-                PrimeFaces.current().ajax().addCallbackParam("scrollPos", params.get("autocompleteScrollPos"));
-            }
-        }
-    }
-
-    public Map<String, Integer> getAutocompleteLimits() {
-        return autocompleteLimits;
-    }
-
     public boolean isSlowMode(Long fieldTypeId) {
         return fieldTypeId != null && slowModeFieldTypeIds.contains(fieldTypeId);
     }
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 182aa1865e1..ccca004c697 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -3301,6 +3301,5 @@ updateDatasetLicenseCommand.errors.customTermsOfUseNotProvided=Terms of use text
 
 # Controlled Vocabulary Autocomplete
 controlledvocabulary.autocomplete.watermark=Start typing to search...
-controlledvocabulary.autocomplete.moreText=Only the first 100 matches shown. Type to filter or click to load more.
 controlledvocabulary.showAll=See all entries (slow)
 controlledvocabulary.showAll.tooltip=Load the full list. This may be slow for large vocabularies.
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index ac392997131..e7209c0b5e3 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">
@@ -299,44 +300,41 @@
                                                 <ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
                                                     <div class="form-group dataset-field-values">
                                                         <div class="form-col-container col-sm-9 edit-field">
-                                                            <h:panelGroup id="vocab_widget_#{dsf.datasetFieldType.id}" layout="block">
+                                                                <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 (dsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or DatasetPage.isSlowMode(dsf.datasetFieldType.id))}" filter="#{(dsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" filterMatchMode="contains">
+                                                                                 id="unique1" rendered="#{!dsf.datasetFieldType.allowMultiples and (dsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or editBean.isSlowMode(dsf.datasetFieldType.id))}" 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:autoComplete value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter"
-                                                                                 id="unique1_autocomplete" rendered="#{!dsf.datasetFieldType.allowMultiples and dsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not DatasetPage.isSlowMode(dsf.datasetFieldType.id)}"
+                                                                                 id="unique1_autocomplete" rendered="#{!dsf.datasetFieldType.allowMultiples and dsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(dsf.datasetFieldType.id)}"
                                                                                  completeMethod="#{DatasetPage.completeControlledVocabularyValue}"
                                                                                  var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
                                                                                  forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
-                                                                                 maxResults="#{DatasetPage.autocompleteLimits[component.clientId] == null ? 100 : DatasetPage.autocompleteLimits[component.clientId]}"
-                                                                                 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="#{(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 and (dsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or DatasetPage.isSlowMode(dsf.datasetFieldType.id))}">
+                                                                                      id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples and (dsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or editBean.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 dsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not DatasetPage.isSlowMode(dsf.datasetFieldType.id)}"
+                                                                                 id="unique2_autocomplete" rendered="#{dsf.datasetFieldType.allowMultiples and dsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(dsf.datasetFieldType.id)}"
                                                                                  completeMethod="#{DatasetPage.completeControlledVocabularyValue}"
                                                                                  var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
                                                                                  forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
-                                                                                 multiple="true" maxResults="#{DatasetPage.autocompleteLimits[component.clientId] == null ? 100 : DatasetPage.autocompleteLimits[component.clientId]}"
-                                                                                 moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
+                                                                                 multiple="true"
                                                                                  placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
                                                                     <f:attribute name="dsf" value="#{dsf}"/>
                                                                 </p:autoComplete>
                                                                 <p:commandLink value="#{bundle['controlledvocabulary.showAll']}"
                                                                                title="#{bundle['controlledvocabulary.showAll.tooltip']}"
                                                                                styleClass="vocab-slow-link"
-                                                                               rendered="#{dsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not DatasetPage.isSlowMode(dsf.datasetFieldType.id)}"
-                                                                               actionListener="#{DatasetPage.switchToSlowMode(dsf.datasetFieldType.id)}"
+                                                                               rendered="#{dsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(dsf.datasetFieldType.id)}"
+                                                                               actionListener="#{editBean.switchToSlowMode(dsf.datasetFieldType.id)}"
                                                                                process="@this"
-                                                                               update="@parent"/>
+                                                                               update="vocab_widget_container"/>
                                                             </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>
@@ -402,46 +400,43 @@
                                                             </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 : ''}">
-                                                                <h:panelGroup id="vocab_widget_sub_#{subdsf.datasetFieldType.id}" 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 (subdsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or DatasetPage.isSlowMode(subdsf.datasetFieldType.id))}" filter="#{(subdsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" filterMatchMode="contains" >
+                                                                <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 (subdsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or editBean.isSlowMode(subdsf.datasetFieldType.id))}" 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:autoComplete id="cvv_autocomplete" value="#{subdsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter"
-                                                                                     rendered="#{!subdsf.datasetFieldType.allowMultiples and subdsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not DatasetPage.isSlowMode(subdsf.datasetFieldType.id)}"
+                                                                                     rendered="#{!subdsf.datasetFieldType.allowMultiples and subdsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(subdsf.datasetFieldType.id)}"
                                                                                      completeMethod="#{DatasetPage.completeControlledVocabularyValue}"
                                                                                      var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
                                                                                      forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
-                                                                                     maxResults="#{DatasetPage.autocompleteLimits[component.clientId] == null ? 100 : DatasetPage.autocompleteLimits[component.clientId]}"
-                                                                                     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 and (subdsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or DatasetPage.isSlowMode(subdsf.datasetFieldType.id))}" label="#{bundle.select}" multiple="true"
+                                                                                          rendered="#{subdsf.datasetFieldType.allowMultiples and (subdsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or editBean.isSlowMode(subdsf.datasetFieldType.id))}" 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'}">
                                                                         <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 subdsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not DatasetPage.isSlowMode(subdsf.datasetFieldType.id)}"
+                                                                                     rendered="#{subdsf.datasetFieldType.allowMultiples and subdsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(subdsf.datasetFieldType.id)}"
                                                                                      completeMethod="#{DatasetPage.completeControlledVocabularyValue}"
                                                                                      var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
                                                                                      forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
-                                                                                     multiple="true" maxResults="#{DatasetPage.autocompleteLimits[component.clientId] == null ? 100 : DatasetPage.autocompleteLimits[component.clientId]}"
-                                                                                     moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
+                                                                                     multiple="true"
                                                                                      placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
                                                                         <f:attribute name="dsf" value="#{subdsf}"/>
                                                                     </p:autoComplete>
                                                                     <p:commandLink value="#{bundle['controlledvocabulary.showAll']}"
                                                                                    title="#{bundle['controlledvocabulary.showAll.tooltip']}"
                                                                                    styleClass="vocab-slow-link"
-                                                                                   rendered="#{subdsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not DatasetPage.isSlowMode(subdsf.datasetFieldType.id)}"
-                                                                                   actionListener="#{DatasetPage.switchToSlowMode(subdsf.datasetFieldType.id)}"
+                                                                                   rendered="#{subdsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(subdsf.datasetFieldType.id)}"
+                                                                                   actionListener="#{editBean.switchToSlowMode(subdsf.datasetFieldType.id)}"
                                                                                    process="@this"
-                                                                                   update="@parent"/>
+                                                                                   update="vocab_widget_sub_container"/>
                                                                 </h:panelGroup>
 
                                                                 <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty subdsf.validationMessage}">
@@ -476,57 +471,6 @@
                 </div>
             </ui:repeat>
         </div>
-        <p:remoteCommand name="loadMoreResults" actionListener="#{DatasetPage.onMoreText()}"
-                         oncomplete="if(args.widgetVar && PF(args.widgetVar)) {
-                             var widget = PF(args.widgetVar);
-                             var scrollPos = args.scrollPos;
-                             var query = args.query;
-
-                             var originalHide = widget.hide;
-                             widget.hide = function() {}; // Disable hide temporarily
-
-                             var originalHandleResponse = widget.handleResponse;
-                             widget.handleResponse = function(data) {
-                                 this.hide = originalHide; // Restore hide
-                                 originalHandleResponse.apply(this, arguments);
-                                 this.panel.scrollTop(scrollPos);
-                                 this.handleResponse = originalHandleResponse;
-                             };
-                             widget.input.focus();
-                             widget.search(query);
-                         }" />
-        <script>
-            //<![CDATA[
-            $(document).off('mousedown.autocomplete-moretext mouseup.autocomplete-moretext click.autocomplete-moretext').on('mousedown.autocomplete-moretext mouseup.autocomplete-moretext click.autocomplete-moretext', '.ui-autocomplete-moretext', function(e) {
-                e.preventDefault();
-                e.stopPropagation();
-                if (e.type !== 'mousedown') return false;
-
-                var panel = $(this).closest('.ui-autocomplete-panel');
-                var clientId = panel.attr('id').replace(/_panel$/, '');
-                var widget = null;
-                var widgetVar = null;
-                for (var property in PF()) {
-                    if (PF()[property] instanceof PrimeFaces.widget.AutoComplete && PF()[property].id === clientId) {
-                        widget = PF()[property];
-                        widgetVar = property;
-                        break;
-                    }
-                }
-                if (widget && typeof loadMoreResults === 'function') {
-                    var query = widget.input.val();
-                    var scrollPos = panel.scrollTop();
-                    loadMoreResults([
-                        {name: 'autocompleteClientId', value: clientId},
-                        {name: 'autocompleteQuery', value: query},
-                        {name: 'autocompleteWidgetVar', value: widgetVar},
-                        {name: 'autocompleteScrollPos', value: scrollPos}
-                    ]);
-                }
-                return false;
-            });
-            //]]>
-        </script>
         </p:fragment>
     </ui:fragment>
  <script>
diff --git a/src/main/webapp/search/advanced.xhtml b/src/main/webapp/search/advanced.xhtml
index 6057933f621..917938512a2 100644
--- a/src/main/webapp/search/advanced.xhtml
+++ b/src/main/webapp/search/advanced.xhtml
@@ -90,32 +90,31 @@
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['advanced.search.dataverses.subject.tip']}"></span>
                                     </label>
                                     <div class="col-sm-6">
-                                        <h:panelGroup id="vocab_widget_subject" layout="block">
-                                            <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{AdvancedSearchPage.dvFieldSubjectValues.size() lt 501 or AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}">
-                                                <p:selectManyCheckbox value="#{AdvancedSearchPage.dvFieldSubject}" layout="pageDirection">
-                                                    <f:selectItems value="#{AdvancedSearchPage.dvFieldSubjectValues}" var="cvv"
-                                                                   itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"/>
-                                                </p:selectManyCheckbox>
-                                            </div>
-                                            <p:autoComplete value="#{AdvancedSearchPage.dvFieldSubject}"
-                                                             id="dvFieldSubject_autocomplete"
-                                                             rendered="#{AdvancedSearchPage.dvFieldSubjectValues.size() gt 500 and not AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
-                                                             completeMethod="#{AdvancedSearchPage.completeControlledVocabularyValue}"
-                                                             var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"
-                                                             forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
-                                                             multiple="true" maxResults="#{AdvancedSearchPage.autocompleteLimits[component.clientId] == null ? 100 : AdvancedSearchPage.autocompleteLimits[component.clientId]}"
-                                                             moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
-                                                             placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
-                                                <f:attribute name="dsft" value="#{AdvancedSearchPage.subjectDatasetFieldType}"/>
-                                            </p:autoComplete>
-                                            <p:commandLink value="#{bundle['controlledvocabulary.showAll']}"
-                                                           title="#{bundle['controlledvocabulary.showAll.tooltip']}"
-                                                           styleClass="vocab-slow-link"
-                                                           rendered="#{AdvancedSearchPage.dvFieldSubjectValues.size() gt 500 and not AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
-                                                           actionListener="#{AdvancedSearchPage.switchToSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
-                                                           process="@this"
-                                                           update="@parent"/>
-                                        </h:panelGroup>
+                                            <h:panelGroup id="vocab_widget_subject" layout="block">
+                                                <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{AdvancedSearchPage.dvFieldSubjectValues.size() lt 501 or AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}">
+                                                    <p:selectManyCheckbox value="#{AdvancedSearchPage.dvFieldSubject}" layout="pageDirection">
+                                                        <f:selectItems value="#{AdvancedSearchPage.dvFieldSubjectValues}" var="cvv"
+                                                                       itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"/>
+                                                    </p:selectManyCheckbox>
+                                                </div>
+                                                <p:autoComplete value="#{AdvancedSearchPage.dvFieldSubject}"
+                                                                 id="dvFieldSubject_autocomplete"
+                                                                 rendered="#{AdvancedSearchPage.dvFieldSubjectValues.size() gt 500 and not AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
+                                                                 completeMethod="#{AdvancedSearchPage.completeControlledVocabularyValue}"
+                                                                 var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"
+                                                                 forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
+                                                                 multiple="true"
+                                                                 placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
+                                                    <f:attribute name="dsft" value="#{AdvancedSearchPage.subjectDatasetFieldType}"/>
+                                                </p:autoComplete>
+                                                <p:commandLink value="#{bundle['controlledvocabulary.showAll']}"
+                                                               title="#{bundle['controlledvocabulary.showAll.tooltip']}"
+                                                               styleClass="vocab-slow-link"
+                                                               rendered="#{AdvancedSearchPage.dvFieldSubjectValues.size() gt 500 and not AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
+                                                               actionListener="#{AdvancedSearchPage.switchToSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
+                                                               process="@this"
+                                                               update="vocab_widget_subject"/>
+                                            </h:panelGroup>
                                     </div>
                                 </div>
                             </div>
@@ -166,8 +165,7 @@
                                                                      completeMethod="#{AdvancedSearchPage.completeControlledVocabularyValue}"
                                                                      var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"
                                                                      forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
-                                                                     multiple="true" maxResults="#{AdvancedSearchPage.autocompleteLimits[component.clientId] == null ? 100 : AdvancedSearchPage.autocompleteLimits[component.clientId]}"
-                                                                     moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
+                                                                     multiple="true"
                                                                      placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
                                                         <f:attribute name="dsft" value="#{item}"/>
                                                     </p:autoComplete>
@@ -177,7 +175,7 @@
                                                                    rendered="#{!empty item.controlledVocabularyValues and item.controlledVocabularyValues.size() gt 500 and not AdvancedSearchPage.isSlowMode(item.id)}"
                                                                    actionListener="#{AdvancedSearchPage.switchToSlowMode(item.id)}"
                                                                    process="@this"
-                                                                   update="@parent"/>
+                                                                   update="vocab_widget_mdb"/>
                                                 </h:panelGroup>
                                             </div>
                                         </div>
@@ -289,58 +287,10 @@
                         <div class="button-block">
                             <p:commandButton styleClass="btn btn-default" value="#{bundle.find}" action="#{AdvancedSearchPage.find()}"/>
                         </div>
-                        <p:remoteCommand name="loadMoreResults" actionListener="#{AdvancedSearchPage.onMoreText()}"
-                                         oncomplete="if(args.widgetVar && PF(args.widgetVar)) {
-                                             var widget = PF(args.widgetVar);
-                                             var scrollPos = args.scrollPos;
-                                             var query = args.query;
-
-                                             var originalHide = widget.hide;
-                                             widget.hide = function() {}; // Disable hide temporarily
-
-                                             var originalHandleResponse = widget.handleResponse;
-                                             widget.handleResponse = function(data) {
-                                                 this.hide = originalHide; // Restore hide
-                                                 originalHandleResponse.apply(this, arguments);
-                                                 this.panel.scrollTop(scrollPos);
-                                                 this.handleResponse = originalHandleResponse;
-                                             };
-                                             widget.input.focus();
-                                             widget.search(query);
-                                         }" />
                     </h:form>
                 </div>
                 <script>
                     //<![CDATA[
-                    $(document).off('mousedown.autocomplete-moretext mouseup.autocomplete-moretext click.autocomplete-moretext').on('mousedown.autocomplete-moretext mouseup.autocomplete-moretext click.autocomplete-moretext', '.ui-autocomplete-moretext', function(e) {
-                        e.preventDefault();
-                        e.stopPropagation();
-                        if (e.type !== 'mousedown') return false;
-
-                        var panel = $(this).closest('.ui-autocomplete-panel');
-                        var clientId = panel.attr('id').replace(/_panel$/, '');
-                        var widget = null;
-                        var widgetVar = null;
-                        for (var property in PF()) {
-                            if (PF()[property] instanceof PrimeFaces.widget.AutoComplete && PF()[property].id === clientId) {
-                                widget = PF()[property];
-                                widgetVar = property;
-                                break;
-                            }
-                        }
-                        if (widget && typeof loadMoreResults === 'function') {
-                            var query = widget.input.val();
-                            var scrollPos = panel.scrollTop();
-                            loadMoreResults([
-                                {name: 'autocompleteClientId', value: clientId},
-                                {name: 'autocompleteQuery', value: query},
-                                {name: 'autocompleteWidgetVar', value: widgetVar},
-                                {name: 'autocompleteScrollPos', value: scrollPos}
-                            ]);
-                        }
-                        return false;
-                    });
-
                     $(document).ready(function() {
                         //The select2 widget used in external vocab scripts has trouble determining the width of an input field if it is initially hidden
                         //Starting with the metadatablocks displayed and collapsing them here is a work-around to fix that.

From 3422b9ac682ad0241b7fd752e937822f2766e16b Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Thu, 13 Aug 2026 15:41:33 -0400
Subject: [PATCH 3/8] moreText, style/text changes, drop filtering in slow
 select

---
 .../edu/harvard/iq/dataverse/DatasetPage.java |  2 +-
 .../harvard/iq/dataverse/TemplatePage.java    |  2 +-
 .../dataverse/search/AdvancedSearchPage.java  |  2 +-
 src/main/java/propertyFiles/Bundle.properties |  5 ++-
 src/main/webapp/metadataFragment.xhtml        | 42 +++++++++++--------
 src/main/webapp/resources/css/structure.css   |  1 +
 src/main/webapp/search/advanced.xhtml         | 22 ++++++----
 7 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 138a4c05cfa..a8f8585b4e1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -7062,7 +7062,7 @@ public List<ControlledVocabularyValue> completeControlledVocabularyValue(String
             if (cvv.getLocaleStrValue(mdLangCode).toLowerCase().contains(queryLower)) {
                 results.add(cvv);
             }
-            if (results.size() >= 100) {
+            if (results.size() >= 101) {
                 break;
             }
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java b/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
index aabbdd8a22a..be20fc57c6d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
@@ -298,7 +298,7 @@ public List<ControlledVocabularyValue> completeControlledVocabularyValue(String
             if (cvv.getLocaleStrValue(mdLangCode).toLowerCase().contains(queryLower)) {
                 results.add(cvv);
             }
-            if (results.size() >= 100) {
+            if (results.size() >= 101) {
                 break;
             }
         }
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 381c2a72b35..010a9b2fe58 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
@@ -291,7 +291,7 @@ public List<ControlledVocabularyValue> completeControlledVocabularyValue(String
             if (localeLabel != null && localeLabel.toLowerCase().contains(queryLower)) {
                 results.add(cvv);
             }
-            if (results.size() >= 100) {
+            if (results.size() >= 101) {
                 break;
             }
         }
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index ccca004c697..0da3380fb47 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -3301,5 +3301,6 @@ updateDatasetLicenseCommand.errors.customTermsOfUseNotProvided=Terms of use text
 
 # Controlled Vocabulary Autocomplete
 controlledvocabulary.autocomplete.watermark=Start typing to search...
-controlledvocabulary.showAll=See all entries (slow)
-controlledvocabulary.showAll.tooltip=Load the full list. This may be slow for large vocabularies.
+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 e7209c0b5e3..bd30c1dba8a 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -302,39 +302,43 @@
                                                         <div class="form-col-container col-sm-9 edit-field">
                                                                 <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 (dsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or editBean.isSlowMode(dsf.datasetFieldType.id))}" filter="#{(dsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" filterMatchMode="contains">
+                                                                                 id="unique1" rendered="#{!dsf.datasetFieldType.allowMultiples and (dsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or editBean.isSlowMode(dsf.datasetFieldType.id))}" filter="#{(dsf.datasetFieldType.controlledVocabularyValues.size() ge 10 and dsf.datasetFieldType.controlledVocabularyValues.size() 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 dsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(dsf.datasetFieldType.id)}"
-                                                                                 completeMethod="#{DatasetPage.completeControlledVocabularyValue}"
+                                                                                 completeMethod="#{editBean.completeControlledVocabularyValue}"
                                                                                  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="#{(dsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" filterMatchMode="contains" label="#{bundle.select}"  multiple="true" showHeader="#{(dsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}"
+                                                                                      filter="#{(dsf.datasetFieldType.controlledVocabularyValues.size() ge 10 and dsf.datasetFieldType.controlledVocabularyValues.size() le 500) ? 'true':'false'}" filterMatchMode="contains" label="#{bundle.select}"  multiple="true" showHeader="#{(dsf.datasetFieldType.controlledVocabularyValues.size() ge 10) ? 'true':'false'}"
                                                                                       id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples and (dsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or editBean.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 dsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(dsf.datasetFieldType.id)}"
-                                                                                 completeMethod="#{DatasetPage.completeControlledVocabularyValue}"
+                                                                                 completeMethod="#{editBean.completeControlledVocabularyValue}"
                                                                                  var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
                                                                                  forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
-                                                                                 multiple="true"
+                                                                                 multiple="true" maxResults="100" moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
                                                                                  placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
                                                                     <f:attribute name="dsf" value="#{dsf}"/>
                                                                 </p:autoComplete>
-                                                                <p:commandLink value="#{bundle['controlledvocabulary.showAll']}"
-                                                                               title="#{bundle['controlledvocabulary.showAll.tooltip']}"
+                                                                <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
                                                                                styleClass="vocab-slow-link"
                                                                                rendered="#{dsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(dsf.datasetFieldType.id)}"
                                                                                actionListener="#{editBean.switchToSlowMode(dsf.datasetFieldType.id)}"
                                                                                process="@this"
-                                                                               update="vocab_widget_container"/>
+                                                                               update="vocab_widget_container">
+                                                                    <h:outputFormat value="#{bundle['controlledvocabulary.showAll']}">
+                                                                        <f:param value="#{dsf.datasetFieldType.controlledVocabularyValues.size()}"/>
+                                                                    </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>
@@ -402,41 +406,45 @@
                                                             <div jsf:rendered="#{subdsf.datasetFieldType.controlledVocabulary}" data-cvoc-managed-field="#{settingsWrapper.isCvocField(subdsf.datasetFieldType.id)? subdsf.datasetFieldType.name : ''}">
                                                                 <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 (subdsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or editBean.isSlowMode(subdsf.datasetFieldType.id))}" filter="#{(subdsf.datasetFieldType.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" filterMatchMode="contains" >
+                                                                                     rendered="#{!subdsf.datasetFieldType.allowMultiples and (subdsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or editBean.isSlowMode(subdsf.datasetFieldType.id))}" filter="#{(subdsf.datasetFieldType.controlledVocabularyValues.size() ge 10 and subdsf.datasetFieldType.controlledVocabularyValues.size() 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 subdsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(subdsf.datasetFieldType.id)}"
-                                                                                     completeMethod="#{DatasetPage.completeControlledVocabularyValue}"
+                                                                                     completeMethod="#{editBean.completeControlledVocabularyValue}"
                                                                                      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 and (subdsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or editBean.isSlowMode(subdsf.datasetFieldType.id))}" 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'}">
+                                                                                          filter="#{(subdsf.datasetFieldType.controlledVocabularyValues.size() ge 10 and subdsf.datasetFieldType.controlledVocabularyValues.size() le 500) ? 'true':'false'}" filterMatchMode="contains" 
+                                                                                          showHeader="#{(subdsf.datasetFieldType.controlledVocabularyValues.size() ge 10) ? 'true':'false'}">
                                                                         <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 subdsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(subdsf.datasetFieldType.id)}"
-                                                                                     completeMethod="#{DatasetPage.completeControlledVocabularyValue}"
+                                                                                     completeMethod="#{editBean.completeControlledVocabularyValue}"
                                                                                      var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
                                                                                      forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
-                                                                                     multiple="true"
+                                                                                     multiple="true" maxResults="100" moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
                                                                                      placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
                                                                         <f:attribute name="dsf" value="#{subdsf}"/>
                                                                     </p:autoComplete>
-                                                                    <p:commandLink value="#{bundle['controlledvocabulary.showAll']}"
-                                                                                   title="#{bundle['controlledvocabulary.showAll.tooltip']}"
+                                                                    <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
                                                                                    styleClass="vocab-slow-link"
                                                                                    rendered="#{subdsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(subdsf.datasetFieldType.id)}"
                                                                                    actionListener="#{editBean.switchToSlowMode(subdsf.datasetFieldType.id)}"
                                                                                    process="@this"
-                                                                                   update="vocab_widget_sub_container"/>
+                                                                                   update="vocab_widget_sub_container">
+                                                                        <h:outputFormat value="#{bundle['controlledvocabulary.showAll']}">
+                                                                            <f:param value="#{subdsf.datasetFieldType.controlledVocabularyValues.size()}"/>
+                                                                        </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}">
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 2eaa300c8bc..0b893950e04 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -116,6 +116,7 @@ table.selectManyCheckboxBlock input {margin-right:4px;}
     color: #666;
     display: block;
     margin-top: 4px;
+    text-align: right;
 }
 .vocab-slow-link:hover {
     color: #333;
diff --git a/src/main/webapp/search/advanced.xhtml b/src/main/webapp/search/advanced.xhtml
index 917938512a2..db79a9e2106 100644
--- a/src/main/webapp/search/advanced.xhtml
+++ b/src/main/webapp/search/advanced.xhtml
@@ -103,17 +103,20 @@
                                                                  completeMethod="#{AdvancedSearchPage.completeControlledVocabularyValue}"
                                                                  var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"
                                                                  forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
-                                                                 multiple="true"
+                                                                 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 value="#{bundle['controlledvocabulary.showAll']}"
-                                                               title="#{bundle['controlledvocabulary.showAll.tooltip']}"
+                                                <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
                                                                styleClass="vocab-slow-link"
                                                                rendered="#{AdvancedSearchPage.dvFieldSubjectValues.size() gt 500 and not AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
                                                                actionListener="#{AdvancedSearchPage.switchToSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
                                                                process="@this"
-                                                               update="vocab_widget_subject"/>
+                                                               update="vocab_widget_subject">
+                                                    <h:outputFormat value="#{bundle['controlledvocabulary.showAll']}">
+                                                        <f:param value="#{AdvancedSearchPage.dvFieldSubjectValues.size()}"/>
+                                                    </h:outputFormat>
+                                                </p:commandLink>
                                             </h:panelGroup>
                                     </div>
                                 </div>
@@ -165,17 +168,20 @@
                                                                      completeMethod="#{AdvancedSearchPage.completeControlledVocabularyValue}"
                                                                      var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"
                                                                      forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
-                                                                     multiple="true"
+                                                                     multiple="true" maxResults="100" moreText="#{bundle['controlledvocabulary.autocomplete.moreText']}"
                                                                      placeholder="#{bundle['controlledvocabulary.autocomplete.watermark']}">
                                                         <f:attribute name="dsft" value="#{item}"/>
                                                     </p:autoComplete>
-                                                    <p:commandLink value="#{bundle['controlledvocabulary.showAll']}"
-                                                                   title="#{bundle['controlledvocabulary.showAll.tooltip']}"
+                                                    <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
                                                                    styleClass="vocab-slow-link"
                                                                    rendered="#{!empty item.controlledVocabularyValues and item.controlledVocabularyValues.size() gt 500 and not AdvancedSearchPage.isSlowMode(item.id)}"
                                                                    actionListener="#{AdvancedSearchPage.switchToSlowMode(item.id)}"
                                                                    process="@this"
-                                                                   update="vocab_widget_mdb"/>
+                                                                   update="vocab_widget_mdb">
+                                                        <h:outputFormat value="#{bundle['controlledvocabulary.showAll']}">
+                                                            <f:param value="#{item.controlledVocabularyValues.size()}"/>
+                                                        </h:outputFormat>
+                                                    </p:commandLink>
                                                 </h:panelGroup>
                                             </div>
                                         </div>

From 341e9fe26eb82e7769dcb66f42465787469a8716 Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Thu, 13 Aug 2026 15:59:21 -0400
Subject: [PATCH 4/8] add header, no select all

---
 src/main/webapp/metadataFragment.xhtml | 34 ++++++++++---------
 src/main/webapp/search/advanced.xhtml  | 46 ++++++++++++++++----------
 2 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index bd30c1dba8a..f6490220486 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -298,16 +298,17 @@
                                                     </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">
                                                                 <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 (dsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or editBean.isSlowMode(dsf.datasetFieldType.id))}" filter="#{(dsf.datasetFieldType.controlledVocabularyValues.size() ge 10 and dsf.datasetFieldType.controlledVocabularyValues.size() le 500) ? 'true':'false'}" filterMatchMode="contains">
+                                                                                 id="unique1" rendered="#{!dsf.datasetFieldType.allowMultiples and (vocabSize lt 501 or editBean.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 dsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(dsf.datasetFieldType.id)}"
+                                                                                 id="unique1_autocomplete" rendered="#{!dsf.datasetFieldType.allowMultiples and vocabSize gt 500 and not editBean.isSlowMode(dsf.datasetFieldType.id)}"
                                                                                  completeMethod="#{editBean.completeControlledVocabularyValue}"
                                                                                  var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
                                                                                  forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
@@ -316,12 +317,13 @@
                                                                     <f:attribute name="dsf" value="#{dsf}"/>
                                                                 </p:autoComplete>
                                                                 <p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" styleClass="form-control"
-                                                                                      filter="#{(dsf.datasetFieldType.controlledVocabularyValues.size() ge 10 and dsf.datasetFieldType.controlledVocabularyValues.size() le 500) ? 'true':'false'}" filterMatchMode="contains" label="#{bundle.select}"  multiple="true" showHeader="#{(dsf.datasetFieldType.controlledVocabularyValues.size() ge 10) ? 'true':'false'}"
-                                                                                      id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples and (dsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or editBean.isSlowMode(dsf.datasetFieldType.id))}">
+                                                                                      filter="#{(vocabSize ge 10 and vocabSize le 500) ? 'true':'false'}" filterMatchMode="contains" label="#{bundle.select}"  multiple="true" showHeader="#{(vocabSize ge 10) ? 'true':'false'}"
+                                                                                      showSelectAll="#{vocabSize lt 501}"
+                                                                                      id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples and (vocabSize lt 501 or editBean.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 dsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(dsf.datasetFieldType.id)}"
+                                                                                 id="unique2_autocomplete" rendered="#{dsf.datasetFieldType.allowMultiples and vocabSize gt 500 and not editBean.isSlowMode(dsf.datasetFieldType.id)}"
                                                                                  completeMethod="#{editBean.completeControlledVocabularyValue}"
                                                                                  var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
                                                                                  forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
@@ -331,12 +333,12 @@
                                                                 </p:autoComplete>
                                                                 <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
                                                                                styleClass="vocab-slow-link"
-                                                                               rendered="#{dsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(dsf.datasetFieldType.id)}"
+                                                                               rendered="#{vocabSize gt 500 and not editBean.isSlowMode(dsf.datasetFieldType.id)}"
                                                                                actionListener="#{editBean.switchToSlowMode(dsf.datasetFieldType.id)}"
                                                                                process="@this"
                                                                                update="vocab_widget_container">
                                                                     <h:outputFormat value="#{bundle['controlledvocabulary.showAll']}">
-                                                                        <f:param value="#{dsf.datasetFieldType.controlledVocabularyValues.size()}"/>
+                                                                        <f:param value="#{vocabSize}"/>
                                                                     </h:outputFormat>
                                                                 </p:commandLink>
                                                             </h:panelGroup>
@@ -404,14 +406,15 @@
                                                             </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 : ''}">
+                                                                <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 (subdsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or editBean.isSlowMode(subdsf.datasetFieldType.id))}" filter="#{(subdsf.datasetFieldType.controlledVocabularyValues.size() ge 10 and subdsf.datasetFieldType.controlledVocabularyValues.size() le 500) ? 'true':'false'}" filterMatchMode="contains">
+                                                                                     rendered="#{!subdsf.datasetFieldType.allowMultiples and (subVocabSize lt 501 or editBean.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 subdsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(subdsf.datasetFieldType.id)}"
+                                                                                     rendered="#{!subdsf.datasetFieldType.allowMultiples and subVocabSize gt 500 and not editBean.isSlowMode(subdsf.datasetFieldType.id)}"
                                                                                      completeMethod="#{editBean.completeControlledVocabularyValue}"
                                                                                      var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
                                                                                      forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
@@ -421,13 +424,14 @@
                                                                     </p:autoComplete>
                                                                     
                                                                     <p:selectCheckboxMenu value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
-                                                                                          rendered="#{subdsf.datasetFieldType.allowMultiples and (subdsf.datasetFieldType.controlledVocabularyValues.size() lt 501 or editBean.isSlowMode(subdsf.datasetFieldType.id))}" label="#{bundle.select}" multiple="true"
-                                                                                          filter="#{(subdsf.datasetFieldType.controlledVocabularyValues.size() ge 10 and subdsf.datasetFieldType.controlledVocabularyValues.size() le 500) ? 'true':'false'}" filterMatchMode="contains" 
-                                                                                          showHeader="#{(subdsf.datasetFieldType.controlledVocabularyValues.size() ge 10) ? 'true':'false'}">
+                                                                                          rendered="#{subdsf.datasetFieldType.allowMultiples and (subVocabSize lt 501 or editBean.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'}"
+                                                                                          showSelectAll="#{subVocabSize lt 501}">
                                                                         <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 subdsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(subdsf.datasetFieldType.id)}"
+                                                                                     rendered="#{subdsf.datasetFieldType.allowMultiples and subVocabSize gt 500 and not editBean.isSlowMode(subdsf.datasetFieldType.id)}"
                                                                                      completeMethod="#{editBean.completeControlledVocabularyValue}"
                                                                                      var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"
                                                                                      forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
@@ -437,12 +441,12 @@
                                                                     </p:autoComplete>
                                                                     <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
                                                                                    styleClass="vocab-slow-link"
-                                                                                   rendered="#{subdsf.datasetFieldType.controlledVocabularyValues.size() gt 500 and not editBean.isSlowMode(subdsf.datasetFieldType.id)}"
+                                                                                   rendered="#{subVocabSize gt 500 and not editBean.isSlowMode(subdsf.datasetFieldType.id)}"
                                                                                    actionListener="#{editBean.switchToSlowMode(subdsf.datasetFieldType.id)}"
                                                                                    process="@this"
                                                                                    update="vocab_widget_sub_container">
                                                                         <h:outputFormat value="#{bundle['controlledvocabulary.showAll']}">
-                                                                            <f:param value="#{subdsf.datasetFieldType.controlledVocabularyValues.size()}"/>
+                                                                            <f:param value="#{subVocabSize}"/>
                                                                         </h:outputFormat>
                                                                     </p:commandLink>
                                                                 </h:panelGroup>
diff --git a/src/main/webapp/search/advanced.xhtml b/src/main/webapp/search/advanced.xhtml
index db79a9e2106..2aeed0f0dc3 100644
--- a/src/main/webapp/search/advanced.xhtml
+++ b/src/main/webapp/search/advanced.xhtml
@@ -91,15 +91,20 @@
                                     </label>
                                     <div class="col-sm-6">
                                             <h:panelGroup id="vocab_widget_subject" layout="block">
-                                                <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{AdvancedSearchPage.dvFieldSubjectValues.size() lt 501 or AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}">
-                                                    <p:selectManyCheckbox value="#{AdvancedSearchPage.dvFieldSubject}" layout="pageDirection">
-                                                        <f:selectItems value="#{AdvancedSearchPage.dvFieldSubjectValues}" var="cvv"
-                                                                       itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"/>
-                                                    </p:selectManyCheckbox>
-                                                </div>
+                                                <c:set var="vocabSize" value="#{AdvancedSearchPage.dvFieldSubjectValues.size()}"/>
+                                                <p:selectCheckboxMenu value="#{AdvancedSearchPage.dvFieldSubject}"
+                                                                      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'}"
+                                                                      showSelectAll="#{vocabSize lt 501}"
+                                                                      jsf:rendered="#{vocabSize lt 501 or AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}">
+                                                    <f:selectItems value="#{AdvancedSearchPage.dvFieldSubjectValues}" var="cvv"
+                                                                   itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"/>
+                                                </p:selectCheckboxMenu>
                                                 <p:autoComplete value="#{AdvancedSearchPage.dvFieldSubject}"
                                                                  id="dvFieldSubject_autocomplete"
-                                                                 rendered="#{AdvancedSearchPage.dvFieldSubjectValues.size() gt 500 and not AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
+                                                                 rendered="#{vocabSize gt 500 and not AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
                                                                  completeMethod="#{AdvancedSearchPage.completeControlledVocabularyValue}"
                                                                  var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"
                                                                  forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
@@ -109,12 +114,12 @@
                                                 </p:autoComplete>
                                                 <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
                                                                styleClass="vocab-slow-link"
-                                                               rendered="#{AdvancedSearchPage.dvFieldSubjectValues.size() gt 500 and not AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
+                                                               rendered="#{vocabSize gt 500 and not AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
                                                                actionListener="#{AdvancedSearchPage.switchToSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
                                                                process="@this"
                                                                update="vocab_widget_subject">
                                                     <h:outputFormat value="#{bundle['controlledvocabulary.showAll']}">
-                                                        <f:param value="#{AdvancedSearchPage.dvFieldSubjectValues.size()}"/>
+                                                        <f:param value="#{vocabSize}"/>
                                                     </h:outputFormat>
                                                 </p:commandLink>
                                             </h:panelGroup>
@@ -156,15 +161,20 @@
                                                     </p:inputText>
                                                 </ui:fragment>
                                                 <h:panelGroup id="vocab_widget_mdb" layout="block">
-                                                    <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{!empty item.controlledVocabularyValues and (item.controlledVocabularyValues.size() lt 501 or AdvancedSearchPage.isSlowMode(item.id))}">
-                                                        <p:selectManyCheckbox value="#{item.listValues}" layout="pageDirection">
-                                                            <f:selectItems value="#{item.controlledVocabularyValues}" var="cvs"
-                                                                           itemLabel="#{cvs.localeStrValue}" itemValue="#{cvs.strValue}"/>
-                                                        </p:selectManyCheckbox>
-                                                    </div>
+                                                    <c:set var="vocabSize" value="#{item.controlledVocabularyValues.size()}"/>
+                                                    <p:selectCheckboxMenu value="#{item.listValues}"
+                                                                          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'}"
+                                                                          showSelectAll="#{vocabSize lt 501}"
+                                                                          jsf:rendered="#{!empty item.controlledVocabularyValues and (vocabSize lt 501 or AdvancedSearchPage.isSlowMode(item.id))}">
+                                                        <f:selectItems value="#{item.controlledVocabularyValues}" var="cvs"
+                                                                       itemLabel="#{cvs.localeStrValue}" itemValue="#{cvs.strValue}"/>
+                                                    </p:selectCheckboxMenu>
                                                     <p:autoComplete value="#{item.listValues}"
                                                                      id="searchValue_autocomplete"
-                                                                     rendered="#{!empty item.controlledVocabularyValues and item.controlledVocabularyValues.size() gt 500 and not AdvancedSearchPage.isSlowMode(item.id)}"
+                                                                     rendered="#{!empty item.controlledVocabularyValues and vocabSize gt 500 and not AdvancedSearchPage.isSlowMode(item.id)}"
                                                                      completeMethod="#{AdvancedSearchPage.completeControlledVocabularyValue}"
                                                                      var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"
                                                                      forceSelection="true" dropdown="true" dropdownMode="current" minQueryLength="2" scrollHeight="250"
@@ -174,12 +184,12 @@
                                                     </p:autoComplete>
                                                     <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
                                                                    styleClass="vocab-slow-link"
-                                                                   rendered="#{!empty item.controlledVocabularyValues and item.controlledVocabularyValues.size() gt 500 and not AdvancedSearchPage.isSlowMode(item.id)}"
+                                                                   rendered="#{!empty item.controlledVocabularyValues and vocabSize gt 500 and not AdvancedSearchPage.isSlowMode(item.id)}"
                                                                    actionListener="#{AdvancedSearchPage.switchToSlowMode(item.id)}"
                                                                    process="@this"
                                                                    update="vocab_widget_mdb">
                                                         <h:outputFormat value="#{bundle['controlledvocabulary.showAll']}">
-                                                            <f:param value="#{item.controlledVocabularyValues.size()}"/>
+                                                            <f:param value="#{vocabSize}"/>
                                                         </h:outputFormat>
                                                     </p:commandLink>
                                                 </h:panelGroup>

From 9d4b4d860af04a03c510d323a305592c836c82f8 Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Thu, 13 Aug 2026 16:12:39 -0400
Subject: [PATCH 5/8] use style to hide select all

---
 src/main/webapp/metadataFragment.xhtml      | 4 ++--
 src/main/webapp/resources/css/structure.css | 3 +++
 src/main/webapp/search/advanced.xhtml       | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index f6490220486..35f55967fa0 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -318,7 +318,7 @@
                                                                 </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'}"
-                                                                                      showSelectAll="#{vocabSize lt 501}"
+                                                                                      panelStyleClass="#{vocabSize gt 500 ? 'no-selectall' : ''}"
                                                                                       id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples and (vocabSize lt 501 or editBean.isSlowMode(dsf.datasetFieldType.id))}">
                                                                     <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"/>
                                                                 </p:selectCheckboxMenu>
@@ -427,7 +427,7 @@
                                                                                           rendered="#{subdsf.datasetFieldType.allowMultiples and (subVocabSize lt 501 or editBean.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'}"
-                                                                                          showSelectAll="#{subVocabSize lt 501}">
+                                                                                          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"
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 0b893950e04..6538930f793 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -122,6 +122,9 @@ table.selectManyCheckboxBlock input {margin-right:4px;}
     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 2aeed0f0dc3..c5862d8929e 100644
--- a/src/main/webapp/search/advanced.xhtml
+++ b/src/main/webapp/search/advanced.xhtml
@@ -97,7 +97,7 @@
                                                                       filter="#{(vocabSize ge 10 and vocabSize le 500) ? 'true':'false'}" filterMatchMode="contains" 
                                                                       label="#{bundle.select}" multiple="true" 
                                                                       showHeader="#{(vocabSize ge 10) ? 'true':'false'}"
-                                                                      showSelectAll="#{vocabSize lt 501}"
+                                                                      panelStyleClass="#{vocabSize gt 500 ? 'no-selectall' : ''}"
                                                                       jsf:rendered="#{vocabSize lt 501 or AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}">
                                                     <f:selectItems value="#{AdvancedSearchPage.dvFieldSubjectValues}" var="cvv"
                                                                    itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"/>
@@ -167,7 +167,7 @@
                                                                           filter="#{(vocabSize ge 10 and vocabSize le 500) ? 'true':'false'}" filterMatchMode="contains" 
                                                                           label="#{bundle.select}" multiple="true" 
                                                                           showHeader="#{(vocabSize ge 10) ? 'true':'false'}"
-                                                                          showSelectAll="#{vocabSize lt 501}"
+                                                                          panelStyleClass="#{vocabSize gt 500 ? 'no-selectall' : ''}"
                                                                           jsf:rendered="#{!empty item.controlledVocabularyValues and (vocabSize lt 501 or AdvancedSearchPage.isSlowMode(item.id))}">
                                                         <f:selectItems value="#{item.controlledVocabularyValues}" var="cvs"
                                                                        itemLabel="#{cvs.localeStrValue}" itemValue="#{cvs.strValue}"/>

From 6ea78c0f854e20a5f4f04810f4836e2ff4b4157a Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Fri, 14 Aug 2026 11:55:41 -0400
Subject: [PATCH 6/8] refactor

---
 .../ControlledVocabularyAutocompleteBean.java | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyAutocompleteBean.java

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;
+    }
+}

From 7ebe659488011c067b999d9668143d13977a4437 Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Fri, 14 Aug 2026 12:28:48 -0400
Subject: [PATCH 7/8] align advanced search w/metadataFrag and fix lost state
 when switching in advanced search

---
 .../iq/dataverse/DatasetFieldType.java        |  7 +--
 .../edu/harvard/iq/dataverse/DatasetPage.java | 37 --------------
 .../harvard/iq/dataverse/TemplatePage.java    | 37 --------------
 .../dataverse/search/AdvancedSearchPage.java  | 48 +++----------------
 src/main/webapp/metadataFragment.xhtml        | 36 +++++++-------
 src/main/webapp/search/advanced.xhtml         | 36 +++++++-------
 6 files changed, 49 insertions(+), 152 deletions(-)

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/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index a8f8585b4e1..2c78873fa71 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -7041,41 +7041,4 @@ public void setRequestedCSL(String requestedCSL) {
     public void validateEmbargoReason(FacesContext context, UIComponent component, Object value) {
         FileUtil.validateEmbargoReason(context, component, value, removeEmbargo);
     }
-
-    private final Set<Long> slowModeFieldTypeIds = new HashSet<>();
-
-    public List<ControlledVocabularyValue> completeControlledVocabularyValue(String query) {
-        UIComponent component = UIComponent.getCurrentComponent(FacesContext.getCurrentInstance());
-        DatasetField dsf = (DatasetField) component.getAttributes().get("dsf");
-        if (dsf == null || dsf.getDatasetFieldType() == null || dsf.getDatasetFieldType().getControlledVocabularyValues() == null) {
-            return Collections.emptyList();
-        }
-
-        List<ControlledVocabularyValue> results = new ArrayList<>();
-        String queryLower = query.toLowerCase();
-        String mdLangCode = null;
-        if (dsf.getDatasetVersion() != null && dsf.getDatasetVersion().getDataset() != null) {
-            mdLangCode = dsf.getDatasetVersion().getDataset().getMetadataLanguage();
-        }
-
-        for (ControlledVocabularyValue cvv : dsf.getDatasetFieldType().getControlledVocabularyValues()) {
-            if (cvv.getLocaleStrValue(mdLangCode).toLowerCase().contains(queryLower)) {
-                results.add(cvv);
-            }
-            if (results.size() >= 101) {
-                break;
-            }
-        }
-        return results;
-    }
-
-    public boolean isSlowMode(Long fieldTypeId) {
-        return fieldTypeId != null && slowModeFieldTypeIds.contains(fieldTypeId);
-    }
-
-    public void switchToSlowMode(Long fieldTypeId) {
-        if (fieldTypeId != null) {
-            slowModeFieldTypeIds.add(fieldTypeId);
-        }
-    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java b/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
index be20fc57c6d..25e1f9198d7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
@@ -267,41 +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");
     }
-
-    private final java.util.Set<Long> slowModeFieldTypeIds = new java.util.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> completeControlledVocabularyValue(String query) {
-        UIComponent component = UIComponent.getCurrentComponent(FacesContext.getCurrentInstance());
-        DatasetField dsf = (DatasetField) component.getAttributes().get("dsf");
-        if (dsf == null || dsf.getDatasetFieldType() == null || dsf.getDatasetFieldType().getControlledVocabularyValues() == null) {
-            return Collections.emptyList();
-        }
-
-        List<ControlledVocabularyValue> results = new ArrayList<>();
-        String queryLower = query.toLowerCase();
-        String mdLangCode = null;
-        if (dsf.getDatasetVersion() != null && dsf.getDatasetVersion().getDataset() != null) {
-            mdLangCode = dsf.getDatasetVersion().getDataset().getMetadataLanguage();
-        }
-
-        for (ControlledVocabularyValue cvv : dsf.getDatasetFieldType().getControlledVocabularyValues()) {
-            if (cvv.getLocaleStrValue(mdLangCode).toLowerCase().contains(queryLower)) {
-                results.add(cvv);
-            }
-            if (results.size() >= 101) {
-                break;
-            }
-        }
-        return results;
-    }
 }
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 010a9b2fe58..59f653118d7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
@@ -56,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;
@@ -116,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));
             }
@@ -151,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));
         }
@@ -257,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;
     }
 
@@ -274,40 +274,6 @@ public DatasetFieldType getSubjectDatasetFieldType() {
         return datasetFieldService.findByName(DatasetFieldConstant.subject);
     }
 
-    private final Set<Long> slowModeFieldTypeIds = new HashSet<>();
-
-    public List<ControlledVocabularyValue> completeControlledVocabularyValue(String query) {
-        UIComponent component = UIComponent.getCurrentComponent(FacesContext.getCurrentInstance());
-        DatasetFieldType dsft = (DatasetFieldType) component.getAttributes().get("dsft");
-        if (dsft == null || dsft.getControlledVocabularyValues() == null || query == null) {
-            return Collections.emptyList();
-        }
-
-        List<ControlledVocabularyValue> results = new ArrayList<>();
-        String queryLower = query.toLowerCase();
-
-        for (ControlledVocabularyValue cvv : dsft.getControlledVocabularyValues()) {
-            String localeLabel = cvv.getLocaleStrValue();
-            if (localeLabel != null && localeLabel.toLowerCase().contains(queryLower)) {
-                results.add(cvv);
-            }
-            if (results.size() >= 101) {
-                break;
-            }
-        }
-        return results;
-    }
-
-    public boolean isSlowMode(Long fieldTypeId) {
-        return fieldTypeId != null && slowModeFieldTypeIds.contains(fieldTypeId);
-    }
-
-    public void switchToSlowMode(Long fieldTypeId) {
-        if (fieldTypeId != null) {
-            slowModeFieldTypeIds.add(fieldTypeId);
-        }
-    }
-
     public String getDsPublicationDate() {
         return dsPublicationDate;
     }
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 35f55967fa0..bd061b857f8 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -303,13 +303,13 @@
                                                         <div class="form-col-container col-sm-9 edit-field">
                                                                 <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 editBean.isSlowMode(dsf.datasetFieldType.id))}" filter="#{(vocabSize ge 10 and vocabSize le 500) ? 'true':'false'}" filterMatchMode="contains">
+                                                                                 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 editBean.isSlowMode(dsf.datasetFieldType.id)}"
-                                                                                 completeMethod="#{editBean.completeControlledVocabularyValue}"
+                                                                                 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']}"
@@ -319,12 +319,12 @@
                                                                 <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 editBean.isSlowMode(dsf.datasetFieldType.id))}">
+                                                                                      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 editBean.isSlowMode(dsf.datasetFieldType.id)}"
-                                                                                 completeMethod="#{editBean.completeControlledVocabularyValue}"
+                                                                                 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']}"
@@ -333,9 +333,9 @@
                                                                 </p:autoComplete>
                                                                 <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
                                                                                styleClass="vocab-slow-link"
-                                                                               rendered="#{vocabSize gt 500 and not editBean.isSlowMode(dsf.datasetFieldType.id)}"
-                                                                               actionListener="#{editBean.switchToSlowMode(dsf.datasetFieldType.id)}"
-                                                                               process="@this"
+                                                                               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}"/>
@@ -409,13 +409,13 @@
                                                                 <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 editBean.isSlowMode(subdsf.datasetFieldType.id))}" filter="#{(subVocabSize ge 10 and subVocabSize le 500) ? 'true':'false'}" filterMatchMode="contains">
+                                                                                     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 editBean.isSlowMode(subdsf.datasetFieldType.id)}"
-                                                                                     completeMethod="#{editBean.completeControlledVocabularyValue}"
+                                                                                     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']}"
@@ -424,15 +424,15 @@
                                                                     </p:autoComplete>
                                                                     
                                                                     <p:selectCheckboxMenu value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
-                                                                                          rendered="#{subdsf.datasetFieldType.allowMultiples and (subVocabSize lt 501 or editBean.isSlowMode(subdsf.datasetFieldType.id))}" label="#{bundle.select}" multiple="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 editBean.isSlowMode(subdsf.datasetFieldType.id)}"
-                                                                                     completeMethod="#{editBean.completeControlledVocabularyValue}"
+                                                                                     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']}"
@@ -441,9 +441,9 @@
                                                                     </p:autoComplete>
                                                                     <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
                                                                                    styleClass="vocab-slow-link"
-                                                                                   rendered="#{subVocabSize gt 500 and not editBean.isSlowMode(subdsf.datasetFieldType.id)}"
-                                                                                   actionListener="#{editBean.switchToSlowMode(subdsf.datasetFieldType.id)}"
-                                                                                   process="@this"
+                                                                                   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}"/>
diff --git a/src/main/webapp/search/advanced.xhtml b/src/main/webapp/search/advanced.xhtml
index c5862d8929e..5ac2b7cc91b 100644
--- a/src/main/webapp/search/advanced.xhtml
+++ b/src/main/webapp/search/advanced.xhtml
@@ -93,20 +93,22 @@
                                             <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' : ''}"
-                                                                      jsf:rendered="#{vocabSize lt 501 or AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}">
+                                                                      rendered="#{vocabSize lt 501 or ControlledVocabularyAutocompleteBean.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}">
                                                     <f:selectItems value="#{AdvancedSearchPage.dvFieldSubjectValues}" var="cvv"
-                                                                   itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"/>
+                                                                   itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                 </p:selectCheckboxMenu>
                                                 <p:autoComplete value="#{AdvancedSearchPage.dvFieldSubject}"
                                                                  id="dvFieldSubject_autocomplete"
-                                                                 rendered="#{vocabSize gt 500 and not AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
-                                                                 completeMethod="#{AdvancedSearchPage.completeControlledVocabularyValue}"
-                                                                 var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"
+                                                                 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']}">
@@ -114,9 +116,9 @@
                                                 </p:autoComplete>
                                                 <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
                                                                styleClass="vocab-slow-link"
-                                                               rendered="#{vocabSize gt 500 and not AdvancedSearchPage.isSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
-                                                               actionListener="#{AdvancedSearchPage.switchToSlowMode(AdvancedSearchPage.subjectDatasetFieldType.id)}"
-                                                               process="@this"
+                                                               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}"/>
@@ -163,20 +165,22 @@
                                                 <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' : ''}"
-                                                                          jsf:rendered="#{!empty item.controlledVocabularyValues and (vocabSize lt 501 or AdvancedSearchPage.isSlowMode(item.id))}">
+                                                                          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}"/>
+                                                                       itemLabel="#{cvs.localeStrValue}" itemValue="#{cvs}"/>
                                                     </p:selectCheckboxMenu>
                                                     <p:autoComplete value="#{item.listValues}"
                                                                      id="searchValue_autocomplete"
-                                                                     rendered="#{!empty item.controlledVocabularyValues and vocabSize gt 500 and not AdvancedSearchPage.isSlowMode(item.id)}"
-                                                                     completeMethod="#{AdvancedSearchPage.completeControlledVocabularyValue}"
-                                                                     var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv.strValue}"
+                                                                     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']}">
@@ -184,9 +188,9 @@
                                                     </p:autoComplete>
                                                     <p:commandLink title="#{bundle['controlledvocabulary.showAll.tooltip']}"
                                                                    styleClass="vocab-slow-link"
-                                                                   rendered="#{!empty item.controlledVocabularyValues and vocabSize gt 500 and not AdvancedSearchPage.isSlowMode(item.id)}"
-                                                                   actionListener="#{AdvancedSearchPage.switchToSlowMode(item.id)}"
-                                                                   process="@this"
+                                                                   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}"/>

From 4512a0187f503cd29aaa4401e79b5ffb1dc8e01d Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Fri, 14 Aug 2026 13:44:49 -0400
Subject: [PATCH 8/8] release note

---
 doc/release-notes/12617-cvv-performance.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/release-notes/12617-cvv-performance.md

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