From 5a896b70419f367057eb22d366f1f4fca6795ccd Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Mon, 12 Jan 2026 10:54:19 -0800
Subject: [PATCH 01/20] Multi value text choices

---
 packages/components/package-lock.json         |  12 +-
 packages/components/package.json              |   4 +-
 .../CalculatedFieldOptions.tsx                |   4 +-
 .../ConditionalFormattingAndValidation.tsx    |   2 +-
 .../components/domainproperties/DomainRow.tsx |   2 +-
 .../DomainRowExpandedOptions.tsx              |   1 +
 .../domainproperties/PropDescType.ts          |  16 +++
 .../components/domainproperties/actions.ts    |   7 +-
 .../components/domainproperties/constants.ts  |   2 +
 .../components/domainproperties/models.tsx    |  21 +++-
 .../components/editable/LookupCell.tsx        |   4 +-
 .../internal/components/editable/actions.ts   |   5 +-
 .../internal/components/editable/models.ts    |  25 +++--
 .../components/forms/detail/DetailDisplay.tsx |   2 +-
 .../components/forms/input/SelectInput.tsx    |   2 +-
 .../forms/input/TextChoiceInput.tsx           |   2 +
 .../search/FilterFacetedSelector.tsx          | 104 ++++++++++++++----
 .../components/search/QueryFilterPanel.tsx    |  44 ++++----
 .../src/internal/components/search/utils.ts   |  19 +++-
 .../internal/renderers/DefaultRenderer.tsx    |   2 +-
 .../internal/renderers/MultiValueRenderer.tsx |   8 +-
 .../components/src/internal/util/utils.ts     |  22 ++--
 packages/components/src/public/QueryColumn.ts |   6 +
 23 files changed, 235 insertions(+), 81 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index ba5e5982d8..29cedcaa38 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,16 +1,16 @@
 {
   "name": "@labkey/components",
-  "version": "7.12.0",
+  "version": "7.13.0-fb-mvtc.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.12.0",
+      "version": "7.13.0-fb-mvtc.4",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
-        "@labkey/api": "1.44.1",
+        "@labkey/api": "1.45.0-fb-mvtc.2",
         "@testing-library/dom": "~10.4.1",
         "@testing-library/jest-dom": "~6.9.1",
         "@testing-library/react": "~16.3.0",
@@ -3535,9 +3535,9 @@
       }
     },
     "node_modules/@labkey/api": {
-      "version": "1.44.1",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.44.1.tgz",
-      "integrity": "sha512-VUS4KLfwAsE45A3MnJUU3j97ei0ncQHv6OVVAN3kitID0xe8+mZ7B39zETVye3Dqgwa8TbYvsCp2t46QmBmwVQ==",
+      "version": "1.45.0-fb-mvtc.2",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.45.0-fb-mvtc.2.tgz",
+      "integrity": "sha512-26xRLDWTZTOIGvoseGCeLVzMlwftHs6oxOlft6uhdmJpYBdm6+AyK2w+jU0Fns5SaEtaZAGofrBJFi8zCXttCg==",
       "license": "Apache-2.0"
     },
     "node_modules/@labkey/build": {
diff --git a/packages/components/package.json b/packages/components/package.json
index 716b7874b0..be9e510058 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.12.0",
+  "version": "7.13.0-fb-mvtc.4",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [
@@ -50,7 +50,7 @@
   "homepage": "https://github.com/LabKey/labkey-ui-components#readme",
   "dependencies": {
     "@hello-pangea/dnd": "18.0.1",
-    "@labkey/api": "1.44.1",
+    "@labkey/api": "1.45.0-fb-mvtc.2",
     "@testing-library/dom": "~10.4.1",
     "@testing-library/jest-dom": "~6.9.1",
     "@testing-library/react": "~16.3.0",
diff --git a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
index 25db7d7c16..73223882c0 100644
--- a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
@@ -12,7 +12,7 @@ import { DOMAIN_FIELD_CLIENT_SIDE_ERROR, DOMAIN_FIELD_VALUE_EXPRESSION, SEVERITY
 import { DomainField, DomainFieldError, SystemField } from './models';
 import { SectionHeading } from './SectionHeading';
 import { isFieldFullyLocked, isFieldPartiallyLocked } from './propertiesUtil';
-import { CALCULATED_TYPE, PropDescType } from './PropDescType';
+import { CALCULATED_TYPE, MULTI_CHOICE_TYPE, PropDescType } from './PropDescType';
 import { parseCalculatedColumn } from './actions';
 
 // export for jest testing
@@ -47,7 +47,7 @@ export const getColumnTypeMap = (
         colTypeMap[df.Name] = df.DataType.toUpperCase();
     });
     domainFields?.forEach(df => {
-        if (df.dataType.name !== CALCULATED_TYPE.name) {
+        if (df.dataType.name !== CALCULATED_TYPE.name && df.dataType.name !== MULTI_CHOICE_TYPE.name) {
             colTypeMap[df.name] = df.dataType.name.toLowerCase() === 'int' ? 'INTEGER' : df.dataType.name.toUpperCase();
         }
     });
diff --git a/packages/components/src/internal/components/domainproperties/ConditionalFormattingAndValidation.tsx b/packages/components/src/internal/components/domainproperties/ConditionalFormattingAndValidation.tsx
index b642c6585c..5101302fcc 100644
--- a/packages/components/src/internal/components/domainproperties/ConditionalFormattingAndValidation.tsx
+++ b/packages/components/src/internal/components/domainproperties/ConditionalFormattingAndValidation.tsx
@@ -206,7 +206,7 @@ export class ConditionalFormattingAndValidation extends PureComponent<Props, Sta
     render() {
         const { index, field, domainFormDisplayOptions } = this.props;
         const { showCondFormat, showRegex, showRange } = this.state;
-        const showCondFormatSection = !domainFormDisplayOptions.hideConditionalFormatting;
+        const showCondFormatSection = !domainFormDisplayOptions.hideConditionalFormatting && DomainField.allowConditionalFormats(field);
         const showRegexSection = !domainFormDisplayOptions.hideValidators && DomainField.hasRegExValidation(field);
         const showRangeSection = !domainFormDisplayOptions.hideValidators && DomainField.hasRangeValidation(field);
         const showValidation = showRegexSection || showRangeSection;
diff --git a/packages/components/src/internal/components/domainproperties/DomainRow.tsx b/packages/components/src/internal/components/domainproperties/DomainRow.tsx
index 2f85300ace..06c32ccc51 100644
--- a/packages/components/src/internal/components/domainproperties/DomainRow.tsx
+++ b/packages/components/src/internal/components/domainproperties/DomainRow.tsx
@@ -527,7 +527,7 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
                                     <div
                                         className={expanded ? 'domain-field-buttons-expanded' : 'domain-field-buttons'}
                                     >
-                                        {expanded && !isFieldFullyLocked(field.lockType) && !appPropertiesOnly && (
+                                        {expanded && !isFieldFullyLocked(field.lockType) && !appPropertiesOnly && DomainField.allowAdvancedSettings(field) && (
                                             <button
                                                 className="domain-row-button btn btn-default"
                                                 disabled={isFieldFullyLocked(field.lockType)}
diff --git a/packages/components/src/internal/components/domainproperties/DomainRowExpandedOptions.tsx b/packages/components/src/internal/components/domainproperties/DomainRowExpandedOptions.tsx
index ef27ca621b..8c91100903 100644
--- a/packages/components/src/internal/components/domainproperties/DomainRowExpandedOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/DomainRowExpandedOptions.tsx
@@ -223,6 +223,7 @@ export class DomainRowExpandedOptions extends React.Component<Props> {
                     />
                 );
             case 'textChoice':
+            case 'multiChoice':
                 // don't show Text Choice options for query metadata editor
                 if (domainFormDisplayOptions?.hideValidators) return null;
 
diff --git a/packages/components/src/internal/components/domainproperties/PropDescType.ts b/packages/components/src/internal/components/domainproperties/PropDescType.ts
index 38e82c5b94..41f49601e9 100644
--- a/packages/components/src/internal/components/domainproperties/PropDescType.ts
+++ b/packages/components/src/internal/components/domainproperties/PropDescType.ts
@@ -18,6 +18,7 @@ import {
     INT_RANGE_URI,
     LONG_RANGE_URI,
     MODIFIED_TIMESTAMP_CONCEPT_URI,
+    MULTI_CHOICE_RANGE_URI,
     MULTILINE_RANGE_URI,
     PARTICIPANTID_CONCEPT_URI,
     SAMPLE_TYPE_CONCEPT_URI,
@@ -90,6 +91,10 @@ export class PropDescType
         return name === TEXT_CHOICE_CONCEPT_URI || name === TEXT_CHOICE_TYPE.name;
     }
 
+    static isMultiChoice(name: string): boolean {
+        return name === MULTI_CHOICE_RANGE_URI || name === MULTI_CHOICE_TYPE.name;
+    }
+
     static isLookup(name: string): boolean {
         return name === 'lookup';
     }
@@ -206,6 +211,10 @@ export class PropDescType
         return PropDescType.isTextChoice(this.conceptURI);
     }
 
+    isMultiChoice(): boolean {
+        return PropDescType.isMultiChoice(this.rangeURI);
+    }
+
     isTime(): boolean {
         return PropDescType.isTime(this.rangeURI);
     }
@@ -345,6 +354,12 @@ export const TEXT_CHOICE_TYPE = new PropDescType({
     conceptURI: TEXT_CHOICE_CONCEPT_URI,
 });
 
+export const MULTI_CHOICE_TYPE = new PropDescType({
+    name: 'multiChoice',
+    display: 'Multi Choice',
+    rangeURI: MULTI_CHOICE_RANGE_URI,
+});
+
 export const SMILES_TYPE = new PropDescType({
     name: 'smiles',
     display: 'SMILES',
@@ -381,6 +396,7 @@ export const PROP_DESC_TYPES = List([
     VISIT_LABEL_TYPE,
     UNIQUE_ID_TYPE,
     TEXT_CHOICE_TYPE,
+    MULTI_CHOICE_TYPE,
     CALCULATED_TYPE,
 ]);
 
diff --git a/packages/components/src/internal/components/domainproperties/actions.ts b/packages/components/src/internal/components/domainproperties/actions.ts
index 93f4efb7dc..545d50472f 100644
--- a/packages/components/src/internal/components/domainproperties/actions.ts
+++ b/packages/components/src/internal/components/domainproperties/actions.ts
@@ -78,6 +78,7 @@ import {
     SAMPLE_TYPE,
     SMILES_TYPE,
     TEXT_CHOICE_TYPE,
+    MULTI_CHOICE_TYPE,
     UNIQUE_ID_TYPE,
     USERS_TYPE,
     VISIT_DATE_TYPE,
@@ -367,6 +368,10 @@ function _isAvailablePropType(type: PropDescType, domain: DomainDesign, ontologi
         return false;
     }
 
+    if (type === MULTI_CHOICE_TYPE && !domain.allowMultiChoiceProperties) {
+        return false;
+    }
+
     if ((type === SAMPLE_TYPE || type === PARTICIPANT_TYPE) && !domain.allowSampleSubjectProperties) {
         return false;
     }
@@ -878,7 +883,7 @@ export function updateDataType(field: DomainField, value: any): DomainField {
             field = field.merge(DomainField.resolveLookupConfig(field, dataType)) as DomainField;
         }
 
-        if (field.isTextChoiceField()) {
+        if (field.isTextChoiceField() || field.isMultiChoiceField()) {
             // when changing a field to a Text Choice, add the default textChoiceValidator and
             // remove/reset all other propertyValidators and other text option settings
             field = field.merge({
diff --git a/packages/components/src/internal/components/domainproperties/constants.ts b/packages/components/src/internal/components/domainproperties/constants.ts
index a4031d19b4..c39a9237a4 100644
--- a/packages/components/src/internal/components/domainproperties/constants.ts
+++ b/packages/components/src/internal/components/domainproperties/constants.ts
@@ -130,9 +130,11 @@ export const DECIMAL_RANGE_URI = 'http://www.w3.org/2001/XMLSchema#decimal';
 export const FLOAT_RANGE_URI = 'http://www.w3.org/2001/XMLSchema#float';
 export const LONG_RANGE_URI = 'http://www.w3.org/2001/XMLSchema#long';
 export const TIME_RANGE_URI = 'http://www.w3.org/2001/XMLSchema#time';
+export const MULTI_CHOICE_RANGE_URI = 'http://cpas.fhcrc.org/exp/xml#multiChoice';
 export const RANGE_URIS = {
     STRING: STRING_RANGE_URI,
     MULTILINE: MULTILINE_RANGE_URI,
+    MULTICHOICE: MULTI_CHOICE_RANGE_URI,
     BOOLEAN: BOOLEAN_RANGE_URI,
     INT: INT_RANGE_URI,
     DOUBLE: DOUBLE_RANGE_URI,
diff --git a/packages/components/src/internal/components/domainproperties/models.tsx b/packages/components/src/internal/components/domainproperties/models.tsx
index 2085714ca2..81371c6ae5 100644
--- a/packages/components/src/internal/components/domainproperties/models.tsx
+++ b/packages/components/src/internal/components/domainproperties/models.tsx
@@ -55,7 +55,7 @@ import {
     INT_RANGE_URI,
     LONG_RANGE_URI,
     LOOKUP_VALIDATOR_VALUES,
-    MAX_TEXT_LENGTH,
+    MAX_TEXT_LENGTH, MULTI_CHOICE_RANGE_URI,
     NUMBER_CONVERT_URIS,
     PHILEVEL_NOT_PHI,
     SAMPLE_TYPE_CONCEPT_URI,
@@ -147,6 +147,7 @@ interface IDomainDesign {
     allowFlagProperties: boolean;
     allowSampleSubjectProperties: boolean;
     allowTextChoiceProperties: boolean;
+    allowMultiChoiceProperties: boolean;
     allowTimepointProperties: boolean;
     allowUniqueConstraintProperties: boolean;
     allowUserProperties: boolean;
@@ -182,6 +183,7 @@ export class DomainDesign
         allowFlagProperties: true,
         allowSampleSubjectProperties: true,
         allowTextChoiceProperties: true,
+        allowMultiChoiceProperties: true,
         allowTimepointProperties: false,
         allowUniqueConstraintProperties: false,
         allowUserProperties: true,
@@ -213,6 +215,7 @@ export class DomainDesign
     declare allowFlagProperties: boolean;
     declare allowSampleSubjectProperties: boolean;
     declare allowTextChoiceProperties: boolean;
+    declare allowMultiChoiceProperties: boolean;
     declare allowTimepointProperties: boolean;
     declare allowUniqueConstraintProperties: boolean;
     declare allowUserProperties: boolean;
@@ -809,7 +812,7 @@ export class PropertyValidator
                     const hasExpressionStr = expressionStr !== undefined && expressionStr !== null;
 
                     // if we are loading a textChoiceValidator from JSON, we need to set the properties.validValues
-                    if (type === 'TextChoice' && !rawPropertyValidator[i]?.properties?.validValues) {
+                    if ((type === 'TextChoice' || type === 'MultiChoice') && !rawPropertyValidator[i]?.properties?.validValues) {
                         rawPropertyValidator[i].properties.validValues =
                             PropertyValidator.splitValidValues(expressionStr);
                     }
@@ -1376,6 +1379,10 @@ export class DomainField
         return this.conceptURI === TEXT_CHOICE_CONCEPT_URI;
     }
 
+    isMultiChoiceField(): boolean {
+        return this.rangeURI === MULTI_CHOICE_RANGE_URI;
+    }
+
     isCalculatedField(): boolean {
         return this.conceptURI === CALCULATED_CONCEPT_URI;
     }
@@ -1404,6 +1411,14 @@ export class DomainField
         );
     }
 
+    static allowConditionalFormats(field: DomainField): boolean {
+        return !field.isMultiChoiceField();
+    }
+
+    static allowAdvancedSettings(field: DomainField): boolean {
+        return !field.isMultiChoiceField();
+    }
+
     static hasRegExValidation(field: DomainField): boolean {
         return (
             field.dataType.isString() &&
@@ -1496,7 +1511,7 @@ export class DomainField
         } else if (this.dataType.isOntologyLookup() && this.sourceOntology) {
             details.push(period + this.sourceOntology);
             period = '. ';
-        } else if (this.dataType.isTextChoice()) {
+        } else if (this.dataType.isTextChoice() || this.dataType.isMultiChoice()) {
             const validValuesStr = getValidValuesDetailStr(this.textChoiceValidator?.properties.validValues);
             if (this.isPHI() && this.PHI !== undefined && validValuesStr) {
                 details.push(period + TEXT_CHOICE_PHI_NOTE);
diff --git a/packages/components/src/internal/components/editable/LookupCell.tsx b/packages/components/src/internal/components/editable/LookupCell.tsx
index 66cc26561d..2649427991 100644
--- a/packages/components/src/internal/components/editable/LookupCell.tsx
+++ b/packages/components/src/internal/components/editable/LookupCell.tsx
@@ -170,7 +170,9 @@ export const LookupCell: FC<LookupCellProps> = memo(props => {
                 onChange={onSelectChange}
                 onKeyDown={onKeyDown}
                 queryColumn={col}
-                value={rawValues[0]}
+                value={col.isMultiChoice ? rawValues : rawValues[0]}
+                multiple={col.isMultiChoice}
+                joinValues={false}
             />
         );
     }
diff --git a/packages/components/src/internal/components/editable/actions.ts b/packages/components/src/internal/components/editable/actions.ts
index aef4da1833..b9980e7dbc 100644
--- a/packages/components/src/internal/components/editable/actions.ts
+++ b/packages/components/src/internal/components/editable/actions.ts
@@ -480,7 +480,7 @@ interface CellData {
 }
 
 async function convertRowToEditorModelData(
-    data: boolean | number | string,
+    data: boolean | number | string | [],
     col: QueryColumn,
     containerPath: string
 ): Promise<CellData> {
@@ -500,6 +500,9 @@ async function convertRowToEditorModelData(
                 valueDescriptors.push(messageAndValue.valueDescriptor);
             }
         }
+    } else if (col.isMultiChoice && Array.isArray(data)) {
+        const values = data.filter(item => !!item).map(item => ({ raw: item, display: item }));
+        valueDescriptors.push(...values);
     } else {
         let display = data;
         if (col?.isTimeOrDateTimeColumn && typeof data === 'string') {
diff --git a/packages/components/src/internal/components/editable/models.ts b/packages/components/src/internal/components/editable/models.ts
index 89a523ffa7..8642009659 100644
--- a/packages/components/src/internal/components/editable/models.ts
+++ b/packages/components/src/internal/components/editable/models.ts
@@ -335,7 +335,7 @@ export class EditorModel
 
             if (renderer?.getEditableRawValue) {
                 row = row.set(col.name, renderer.getEditableRawValue(values));
-            } else if (col.isLookup()) {
+            } else if (col.isLookup() || col.isMultiChoice) {
                 if (col.isExpInput() || col.isAliquotParent()) {
                     // We have to use display values for ExpInput and AliquotParent because of name expressions
                     row = row.set(
@@ -345,13 +345,16 @@ export class EditorModel
                             .map(vd => quoteValueWithDelimiters(vd.display, ','))
                             .join(', ')
                     );
-                } else if (col.isJunctionLookup()) {
+                } else if (col.isJunctionLookup() || col.isMultiChoice) {
+                    let valueArray = values
+                        .filter(vd => vd.raw !== undefined && vd.raw !== null)
+                        .map(vd => vd.raw)
+                        .toArray();
+                    if (valueArray?.length === 0)
+                        valueArray = null;
                     row = row.set(
                         col.name,
-                        values
-                            .filter(vd => vd.raw !== undefined && vd.raw !== null)
-                            .map(vd => vd.raw)
-                            .toArray()
+                        valueArray
                     );
                 } else if (col.lookup.displayColumn === col.lookup.keyColumn) {
                     row = row.set(
@@ -816,7 +819,7 @@ export class EditorModel
                                 .join(', ');
                         } else {
                             const valueObj = originalValue.get(0);
-                            originalValue = Map.isMap(valueObj) ? valueObj.get('value') : valueObj.value;
+                            originalValue = Map.isMap(valueObj) ? valueObj.get('value') : valueObj?.value;
                         }
                     }
 
@@ -834,9 +837,9 @@ export class EditorModel
                     }
 
                     // If col is a multi-value column, compare all values for changes
-                    if ((List.isList(originalValue) || originalValue === undefined) && Array.isArray(value)) {
-                        if ((originalValue?.size ?? 0) !== value.length) {
-                            row[key] = value;
+                    if ((List.isList(originalValue) || originalValue === undefined) && (Array.isArray(value) || value === null)) {
+                        if ((originalValue?.size ?? 0) !== (value?.length ?? 0)) {
+                            row[key] = value.length === 0 ? null : value;
                         } else if (originalValue) {
                             if (Map.isMap(originalValue.get(0))) {
                                 // filter to those values that no longer exist in the new value array
@@ -853,7 +856,7 @@ export class EditorModel
                                     o => value.indexOf(o.value) === -1 && value.indexOf(o.displayValue) === -1
                                 ) !== -1
                             ) {
-                                row[key] = value;
+                                row[key] = value.length === 0 ? null : value;
                             }
                         }
                     } else if (!(originalValue == undefined && value == undefined) && originalValue !== value) {
diff --git a/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx b/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
index 1902527e2b..155087b801 100644
--- a/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
+++ b/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
@@ -323,7 +323,7 @@ export function resolveDetailEditRenderer(
             if (col.displayAsLookup !== false) {
                 // Issue 29232: When displaying a lookup, always use the value
                 const multiple = col.isJunctionLookup();
-                const joinValues = multiple && !col.isDataInput();
+                const joinValues = multiple && !col.isDataInput() && !col.isMultiChoice;
                 const queryFilters = col.lookup.hasQueryFilters(Operation.update)
                     ? List(col.lookup.getQueryFilters(Operation.update))
                     : undefined;
diff --git a/packages/components/src/internal/components/forms/input/SelectInput.tsx b/packages/components/src/internal/components/forms/input/SelectInput.tsx
index debb93808e..1db9f7215a 100644
--- a/packages/components/src/internal/components/forms/input/SelectInput.tsx
+++ b/packages/components/src/internal/components/forms/input/SelectInput.tsx
@@ -495,7 +495,7 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
                         return arr;
                     }, []);
 
-                    if (!joinValues) {
+                    if (joinValues) {
                         // consider removing altogether?
                         formValue = formValue.join(delimiter);
                     }
diff --git a/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx b/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx
index 31c6ef5668..9eb94c4b93 100644
--- a/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx
@@ -21,6 +21,8 @@ export class TextChoiceInput extends DisableableInput<Props, DisableableInputSta
                 required={queryColumn.required}
                 {...selectInputProps}
                 options={options}
+                multiple={queryColumn.isMultiChoice}
+                joinValues={false}
             />
         );
     }
diff --git a/packages/components/src/internal/components/search/FilterFacetedSelector.tsx b/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
index 02305dfc91..a28902f68b 100644
--- a/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
+++ b/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
@@ -15,7 +15,13 @@ import { FolderColumnRenderer } from '../../renderers/FolderColumnRenderer';
 
 import { useTimeout } from '../../hooks';
 
-import { ALL_VALUE_DISPLAY, EMPTY_VALUE_DISPLAY, getCheckedFilterValues, getUpdatedChooseValuesFilter } from './utils';
+import {
+    ALL_VALUE_DISPLAY, EMPTY_VALUE_DISPLAY, getCheckedFilterValues,
+    getFilterOptionsForType, getUpdatedChooseValuesFilter,
+} from './utils';
+import {SelectInput} from "../forms/input/SelectInput";
+import {QueryColumn} from "../../../public/QueryColumn";
+import {resolveFilterType} from "../../../public/QueryModel/grid/actions/Filter";
 
 const MAX_DISTINCT_FILTER_OPTIONS = 250;
 
@@ -29,6 +35,7 @@ interface Props {
     selectDistinctOptions: Query.SelectDistinctOptions;
     // show search box if number of unique values > N
     showSearchLength?: number;
+    field?: QueryColumn;
 }
 
 const rendererFolderValue = (value: any): ReactNode => {
@@ -44,6 +51,7 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
         fieldKey,
         fieldFilters,
         onFieldFilterUpdate,
+        field,
         showSearchLength = 20,
     } = props;
 
@@ -71,6 +79,14 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
         // eslint-disable-next-line react-hooks/exhaustive-deps -- only on fieldKey change, reload selection values
     }, [fieldKey]);
 
+    const multiChoices = useMemo(() => {
+        return field?.isMultiChoice ? field.validValues : null;
+    }, [field]);
+
+    const filterOptions = useMemo(() => {
+        return field?.isMultiChoice ? getFilterOptionsForType(field, false) : null;
+    }, [field]);
+
     const setDistinctValues = useCallback(
         async (checkForAll: boolean, searchStr?: string) => {
             let aborted = false;
@@ -79,21 +95,38 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
                 setError(undefined);
                 timer.clear();
 
-                const filterArray = searchStr
-                    ? [Filter.create(fieldKey, searchStr, Filter.Types.CONTAINS)].concat(
-                          selectDistinctOptions?.filterArray
-                      )
-                    : selectDistinctOptions?.filterArray;
-
-                const result = await api.query.selectDistinctRows({
-                    ...selectDistinctOptions,
-                    filterArray,
-                    maxRows: MAX_DISTINCT_FILTER_OPTIONS + 1,
-                    requestHandler,
-                });
-                resetRequestHandler();
+                let allValues: any[] = [];
+                if (!multiChoices) {
+                    const filterArray = searchStr
+                        ? [Filter.create(fieldKey, searchStr, Filter.Types.CONTAINS)].concat(
+                            selectDistinctOptions?.filterArray
+                        )
+                        : selectDistinctOptions?.filterArray;
+
+                    // if multi value, get all options
+                    const result = await api.query.selectDistinctRows({
+                        ...selectDistinctOptions,
+                        filterArray,
+                        maxRows: MAX_DISTINCT_FILTER_OPTIONS + 1,
+                        requestHandler,
+                    });
+                    resetRequestHandler();
+                    allValues = result.values;
+                }
+                else {
+                    allValues = multiChoices;
+                    if (searchStr) {
+                        // filter multiChoices based on search string
+                        allValues = allValues.filter(val => {
+                            if (val === null || val === undefined) {
+                                return EMPTY_VALUE_DISPLAY.includes(searchStr);
+                            }
+                            return val.toString().toLowerCase().includes(searchStr.toLowerCase());
+                        });
+                    }
+                }
 
-                const toShow = result.values.slice(0, MAX_DISTINCT_FILTER_OPTIONS);
+                const toShow = allValues.slice(0, MAX_DISTINCT_FILTER_OPTIONS);
                 const distinctValues = toShow.sort(naturalSort).map(val => {
                     if (val === '' || val === null || val === undefined) return EMPTY_VALUE_DISPLAY;
                     return val;
@@ -108,13 +141,13 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
                 // Issue 47544: don't show 'blank' if we have all the values and none are blank
                 if (
                     toShow.length > 0 &&
-                    (hasBlank || (canBeBlank && result.values.length > MAX_DISTINCT_FILTER_OPTIONS))
+                    (hasBlank || (canBeBlank && allValues.length > MAX_DISTINCT_FILTER_OPTIONS))
                 ) {
                     distinctValues.unshift(EMPTY_VALUE_DISPLAY);
                 }
 
                 // add [All] to first if the total distinct values is < 250
-                const hasAllValues = !searchStr && result.values.length <= MAX_DISTINCT_FILTER_OPTIONS;
+                const hasAllValues = !searchStr && allValues.length <= MAX_DISTINCT_FILTER_OPTIONS;
                 if (hasAllValues) distinctValues.unshift(ALL_VALUE_DISPLAY);
                 if (checkForAll) {
                     setAllShown(hasAllValues);
@@ -144,7 +177,7 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
                 }
             }
         },
-        [api.query, canBeBlank, fieldKey, requestHandler, resetRequestHandler, selectDistinctOptions, timer]
+        [api.query, canBeBlank, fieldKey, requestHandler, resetRequestHandler, selectDistinctOptions, timer, multiChoices]
     );
 
     const setDistinctValuesForSearch = useCallback(
@@ -157,8 +190,8 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
     );
 
     const checkedValues = useMemo(() => {
-        return getCheckedFilterValues(fieldFilters?.[0], allShown ? fieldDistinctValues : undefined);
-    }, [fieldFilters?.[0], fieldKey, fieldDistinctValues, allShown]); // need to add fieldKey
+        return getCheckedFilterValues(fieldFilters?.[0], allShown ? fieldDistinctValues : undefined, multiChoices);
+    }, [fieldFilters?.[0], fieldKey, fieldDistinctValues, allShown, multiChoices]); // need to add fieldKey
 
     const taggedValues = useMemo(() => {
         if (checkedValues?.indexOf(ALL_VALUE_DISPLAY) > -1) return [];
@@ -208,12 +241,43 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
         [isFolderField]
     );
 
+    const onUpdateFilterType = useCallback(
+        (_, filterUrlSuffix: string) => {
+            let newFilters = [];
+            if (!filterUrlSuffix) return newFilters;
+
+            const newActiveFilterType = filterOptions?.find(option => option.value === filterUrlSuffix);
+            if (!newActiveFilterType) return newFilters;
+
+            const filterType = resolveFilterType(newActiveFilterType?.value, field);
+
+            newFilters = [Filter.create(fieldKey, fieldFilters[0]?.getValue(), filterType), null];
+
+            onFieldFilterUpdate(newFilters, 0);
+        },
+        [onFieldFilterUpdate, filterOptions, field, fieldFilters, fieldKey]
+    );
+
     if (!fieldDistinctValues || allShown === undefined) return <LoadingSpinner />;
 
     return (
         <>
             {error && <Alert>{error}</Alert>}
             <div className="filter-faceted__panel">
+                {multiChoices &&
+                    <SelectInput
+                        containerClass="form-group filter-expression__input-wrapper"
+                        disabled={disabled}
+                        inputClass="filter-expression__input-select"
+                        key={'filter-expression-field-filter-type'}
+                        name="filter-expression-field-filter-type"
+                        onChange={onUpdateFilterType}
+                        options={filterOptions}
+                        placeholder="Select a filter type..."
+                        required={true}
+                        value={fieldFilters?.[0]?.getFilterType()?.getURLSuffix() || ''}
+                    />
+                }
                 {(fieldDistinctValues?.length > showSearchLength || searchStr) && (
                     <div>
                         <input
diff --git a/packages/components/src/internal/components/search/QueryFilterPanel.tsx b/packages/components/src/internal/components/search/QueryFilterPanel.tsx
index 744c228a47..e688fe39b6 100644
--- a/packages/components/src/internal/components/search/QueryFilterPanel.tsx
+++ b/packages/components/src/internal/components/search/QueryFilterPanel.tsx
@@ -101,7 +101,7 @@ export const QueryFilterPanel: FC<Props> = memo(props => {
 
     const viewName = useMemo(() => props.viewName ?? DEFAULT_VIEW_NAME, [props.viewName]);
     const allowFaceting = (col: QueryColumn): boolean => {
-        return col?.allowFaceting() && col?.getDisplayFieldJsonType() === 'string'; // current plan is to only support facet for string fields, to reduce scope
+        return col?.isMultiChoice || col?.allowFaceting() && col?.getDisplayFieldJsonType() === 'string'; // current plan is to only support facet for string fields, to reduce scope
     };
 
     const filterStatus = useMemo(() => {
@@ -130,6 +130,9 @@ export const QueryFilterPanel: FC<Props> = memo(props => {
 
     const getDefaultActiveTab = useCallback(
         (field: QueryColumn) => {
+            if (field.isMultiChoice)
+                return FieldFilterTabs.ChooseValues;
+
             if (!allowFaceting(field)) {
                 return FieldFilterTabs.Filter;
             }
@@ -314,30 +317,33 @@ export const QueryFilterPanel: FC<Props> = memo(props => {
                         })}
                     >
                         <Tabs activeKey={activeTab} className="field-modal__tabs content-tabs" onSelect={onTabChange}>
-                            <Tab eventKey={FieldFilterTabs.Filter} title="Filter">
-                                <div className="field-modal__col-sub-title">Find values for {activeField.caption}</div>
-                                {activeTab === FieldFilterTabs.Filter && (
-                                    <FilterExpressionView
-                                        allowRelativeDateFilter={allowRelativeDateFilter}
-                                        disabled={hasNotInQueryFilter}
-                                        field={activeField}
-                                        fieldFilters={currentFieldFilters?.map(filter => filter.filter)}
-                                        includeAllAncestorFilter={
-                                            isAncestor && activeField?.fieldKey.toLowerCase() === 'name'
-                                        }
-                                        key={activeFieldKey}
-                                        onFieldFilterUpdate={(newFilters, index) =>
-                                            onFilterUpdate(activeField, newFilters, index)
-                                        }
-                                    />
-                                )}
-                            </Tab>
+                            {!activeField.isMultiChoice && (
+                                <Tab eventKey={FieldFilterTabs.Filter} title="Filter">
+                                    <div className="field-modal__col-sub-title">Find values for {activeField.caption}</div>
+                                    {activeTab === FieldFilterTabs.Filter && (
+                                        <FilterExpressionView
+                                            allowRelativeDateFilter={allowRelativeDateFilter}
+                                            disabled={hasNotInQueryFilter}
+                                            field={activeField}
+                                            fieldFilters={currentFieldFilters?.map(filter => filter.filter)}
+                                            includeAllAncestorFilter={
+                                                isAncestor && activeField?.fieldKey.toLowerCase() === 'name'
+                                            }
+                                            key={activeFieldKey}
+                                            onFieldFilterUpdate={(newFilters, index) =>
+                                                onFilterUpdate(activeField, newFilters, index)
+                                            }
+                                        />
+                                    )}
+                                </Tab>
+                            )}
                             {allowFaceting(activeField) && (
                                 <Tab eventKey={FieldFilterTabs.ChooseValues} title="Choose values">
                                     <div className="field-modal__col-sub-title">
                                         Find values for {activeField.caption}
                                     </div>
                                     <FilterFacetedSelector
+                                        field={activeField}
                                         canBeBlank={!activeField?.required && !activeField.nameExpression}
                                         disabled={hasNotInQueryFilter}
                                         fieldFilters={currentFieldFilters?.map(filter => filter.filter)}
diff --git a/packages/components/src/internal/components/search/utils.ts b/packages/components/src/internal/components/search/utils.ts
index 43798c0e3f..d6e7a59c66 100644
--- a/packages/components/src/internal/components/search/utils.ts
+++ b/packages/components/src/internal/components/search/utils.ts
@@ -293,9 +293,13 @@ export function getUpdateFilterExpressionFilter(
 }
 
 // this util is only for string field type
-export function getCheckedFilterValues(filter: Filter.IFilter, allValues: string[]): string[] {
+export function getCheckedFilterValues(filter: Filter.IFilter, allValues: string[], multiChoices?: string[]): string[] {
     if (!filter && !allValues) return [];
 
+    if (filter?.getFilterType().getURLSuffix().indexOf('array') === 0) {
+        return filter.getValue() ?? [];
+    }
+
     const filterUrlSuffix = filter?.getFilterType()?.getURLSuffix();
     // if allValues is undefined, then we don't know the full set of values so filter must be an Equals/Equals one of
     if (!allValues && filterUrlSuffix !== 'isblank') return getFilterValuesAsArray(filter, undefined, true);
@@ -368,6 +372,7 @@ export function getUpdatedChooseValuesFilter(
 ): Filter.IFilter {
     const isAncestorMatchesAllFilter =
         oldFilter?.getFilterType().getURLSuffix() === ANCESTOR_MATCHES_ALL_OF_FILTER_TYPE.getURLSuffix();
+    const isArrayFilter = oldFilter?.getFilterType().getURLSuffix().indexOf('array') === 0;
     const hasBlank = allValues ? allValues.findIndex(value => value === EMPTY_VALUE_DISPLAY) !== -1 : false;
     // if check all, or everything is checked, this is essentially "no filter", unless there is no blank value
     // then it's an NONBLANK filter
@@ -378,6 +383,12 @@ export function getUpdatedChooseValuesFilter(
                 allValues.filter(v => v !== ALL_VALUE_DISPLAY),
                 ANCESTOR_MATCHES_ALL_OF_FILTER_TYPE
             );
+        if (isArrayFilter)
+            return Filter.create(
+            fieldKey,
+            allValues.filter(v => v !== ALL_VALUE_DISPLAY),
+                oldFilter.getFilterType()
+        );
         return hasBlank ? null : Filter.create(fieldKey, null, Filter.Types.NONBLANK);
     }
 
@@ -396,6 +407,12 @@ export function getUpdatedChooseValuesFilter(
         return Filter.create(fieldKey, newCheckedValues, ANCESTOR_MATCHES_ALL_OF_FILTER_TYPE);
     }
 
+    if (isArrayFilter) {
+        if ((newValue === ALL_VALUE_DISPLAY && !check) || newCheckedValues.length === 0)
+            return Filter.create(fieldKey, [], oldFilter.getFilterType());
+        return Filter.create(fieldKey, newCheckedValues, oldFilter.getFilterType());
+    }
+
     // if everything is checked, this is the same as not filtering
     if ((newValue === ALL_VALUE_DISPLAY && check) || (allValues && newCheckedValues.length === allValues.length)) {
         return null;
diff --git a/packages/components/src/internal/renderers/DefaultRenderer.tsx b/packages/components/src/internal/renderers/DefaultRenderer.tsx
index f5bc74017e..3c0206ed7d 100644
--- a/packages/components/src/internal/renderers/DefaultRenderer.tsx
+++ b/packages/components/src/internal/renderers/DefaultRenderer.tsx
@@ -49,7 +49,7 @@ export const DefaultRenderer: FC<Props> = memo(({ col, data, noLink }) => {
             display = data;
         } else if (typeof data === 'boolean') {
             display = data ? 'true' : 'false';
-        } else if (List.isList(data)) {
+        } else if (List.isList(data) || col.isMultiChoice) {
             // defensively return a MultiValueRenderer, this column likely wasn't declared properly as "multiValue"
             return <MultiValueRenderer col={col} data={data} />;
         } else if (col?.isFileInput) {
diff --git a/packages/components/src/internal/renderers/MultiValueRenderer.tsx b/packages/components/src/internal/renderers/MultiValueRenderer.tsx
index 58382d7b57..32ba6747ab 100644
--- a/packages/components/src/internal/renderers/MultiValueRenderer.tsx
+++ b/packages/components/src/internal/renderers/MultiValueRenderer.tsx
@@ -36,10 +36,16 @@ export const MultiValueRenderer: FC<MultiValueRendererProps> = memo(({ data, col
         return <FileColumnRenderer data={data.get(0)} />;
     }
 
+
+    let valueArray = data;
+    if (col?.isMultiChoice) {
+        valueArray = data.get('value');
+    }
+
     let i = -1;
     return (
         <div>
-            {data
+            {valueArray
                 .map((item, key) => {
                     let text: ReactNode;
                     let url: string;
diff --git a/packages/components/src/internal/util/utils.ts b/packages/components/src/internal/util/utils.ts
index d2ce4e94e8..a0537b75ea 100644
--- a/packages/components/src/internal/util/utils.ts
+++ b/packages/components/src/internal/util/utils.ts
@@ -226,15 +226,13 @@ export function getCommonDataValues(
                             value = data.toJS();
                         } else {
                             value = data.get('value');
+                            if (List.isList(value))
+                                value = value.toJS();
                         }
                     }
 
                     const currentValueEmpty = valueIsEmpty(value);
                     const havePreviousValue = valueMap.has(key);
-                    const arrayNotEqual =
-                        Array.isArray(value) &&
-                        valueMap.get(key) &&
-                        (!Array.isArray(valueMap.get(key)) || !unorderedEqual(valueMap.get(key), value));
 
                     if (!currentValueEmpty) {
                         // non-empty value, so let's see if we have the same value
@@ -246,10 +244,18 @@ export function getCommonDataValues(
                                 fileMap[key] = rawValue;
                             }
                         }
-                        if (arrayNotEqual) {
-                            fieldsInConflict = fieldsInConflict.add(key);
-                            valueMap = valueMap.delete(key);
-                        } else if (valueMap.get(key) !== value) {
+
+                        if (Array.isArray(value)) {
+                            const arrayNotEqual =
+                                valueMap.get(key) &&
+                                (!Array.isArray(valueMap.get(key)) || !unorderedEqual(valueMap.get(key), value));
+
+                            if (arrayNotEqual) {
+                                fieldsInConflict = fieldsInConflict.add(key);
+                                valueMap = valueMap.delete(key);
+                            }
+                        }
+                        else if (valueMap.get(key) !== value) {
                             fieldsInConflict = fieldsInConflict.add(key);
                             valueMap = valueMap.delete(key);
                         }
diff --git a/packages/components/src/public/QueryColumn.ts b/packages/components/src/public/QueryColumn.ts
index f0a11b930c..fa65d79084 100644
--- a/packages/components/src/public/QueryColumn.ts
+++ b/packages/components/src/public/QueryColumn.ts
@@ -18,6 +18,7 @@ import { SAMPLES_WITH_TYPES_FILTER } from '../internal/components/samples/consta
 
 import { SchemaQuery } from './SchemaQuery';
 import { IQueryColumn } from './IQueryColumn';
+import { PropDescType } from '../internal/components/domainproperties/PropDescType';
 
 export enum Operation {
     insert = 'insert',
@@ -424,6 +425,10 @@ export class QueryColumn implements IQueryColumn {
         return this.inputType === 'file';
     }
 
+    get isMultiChoice(): boolean {
+        return PropDescType.isMultiChoice(this.rangeURI);
+    }
+
     allowFaceting(): boolean {
         switch (this.facetingBehaviorType) {
             case 'ALWAYS_OFF':
@@ -434,6 +439,7 @@ export class QueryColumn implements IQueryColumn {
                 // auto rules are if the column is a lookup or dimension
                 // OR if it is of type : (boolean, int, date, text), multiline excluded
                 if (this.lookup || this.dimension) return true;
+                else if (this.isMultiChoice) return true;
                 else if (
                     this.jsonType === 'boolean' ||
                     this.jsonType === 'int' ||

From 5557f6f69ba6cc3594a7a424023c221de4937750 Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Mon, 12 Jan 2026 13:07:10 -0800
Subject: [PATCH 02/20] fixes

---
 packages/components/src/internal/components/editable/models.ts | 2 --
 packages/components/src/internal/renderers/DefaultRenderer.tsx | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/components/src/internal/components/editable/models.ts b/packages/components/src/internal/components/editable/models.ts
index 8642009659..fb7e387023 100644
--- a/packages/components/src/internal/components/editable/models.ts
+++ b/packages/components/src/internal/components/editable/models.ts
@@ -350,8 +350,6 @@ export class EditorModel
                         .filter(vd => vd.raw !== undefined && vd.raw !== null)
                         .map(vd => vd.raw)
                         .toArray();
-                    if (valueArray?.length === 0)
-                        valueArray = null;
                     row = row.set(
                         col.name,
                         valueArray
diff --git a/packages/components/src/internal/renderers/DefaultRenderer.tsx b/packages/components/src/internal/renderers/DefaultRenderer.tsx
index 3c0206ed7d..6e8f47bc5e 100644
--- a/packages/components/src/internal/renderers/DefaultRenderer.tsx
+++ b/packages/components/src/internal/renderers/DefaultRenderer.tsx
@@ -49,7 +49,7 @@ export const DefaultRenderer: FC<Props> = memo(({ col, data, noLink }) => {
             display = data;
         } else if (typeof data === 'boolean') {
             display = data ? 'true' : 'false';
-        } else if (List.isList(data) || col.isMultiChoice) {
+        } else if (List.isList(data) || col?.isMultiChoice) {
             // defensively return a MultiValueRenderer, this column likely wasn't declared properly as "multiValue"
             return <MultiValueRenderer col={col} data={data} />;
         } else if (col?.isFileInput) {

From ae44119d017fdb51d3695aceae4eb9803ffa1e78 Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Mon, 12 Jan 2026 13:13:14 -0800
Subject: [PATCH 03/20] fix empty array

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 29cedcaa38..9fcdf1a346 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.4",
+  "version": "7.13.0-fb-mvtc.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.13.0-fb-mvtc.4",
+      "version": "7.13.0-fb-mvtc.5",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index be9e510058..ff70f183ea 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.4",
+  "version": "7.13.0-fb-mvtc.5",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From ee689d3b3de789f8051a5fa53f39a114180018ee Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Mon, 12 Jan 2026 13:27:52 -0800
Subject: [PATCH 04/20] fix empty array

---
 .../components/src/internal/components/editable/models.ts     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/internal/components/editable/models.ts b/packages/components/src/internal/components/editable/models.ts
index fb7e387023..1290a4621e 100644
--- a/packages/components/src/internal/components/editable/models.ts
+++ b/packages/components/src/internal/components/editable/models.ts
@@ -837,7 +837,7 @@ export class EditorModel
                     // If col is a multi-value column, compare all values for changes
                     if ((List.isList(originalValue) || originalValue === undefined) && (Array.isArray(value) || value === null)) {
                         if ((originalValue?.size ?? 0) !== (value?.length ?? 0)) {
-                            row[key] = value.length === 0 ? null : value;
+                            row[key] = value;
                         } else if (originalValue) {
                             if (Map.isMap(originalValue.get(0))) {
                                 // filter to those values that no longer exist in the new value array
@@ -854,7 +854,7 @@ export class EditorModel
                                     o => value.indexOf(o.value) === -1 && value.indexOf(o.displayValue) === -1
                                 ) !== -1
                             ) {
-                                row[key] = value.length === 0 ? null : value;
+                                row[key] = value;
                             }
                         }
                     } else if (!(originalValue == undefined && value == undefined) && originalValue !== value) {

From 028929cab71a6162772e7850a209646a83681c59 Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Mon, 12 Jan 2026 13:29:50 -0800
Subject: [PATCH 05/20] fix empty array

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 9fcdf1a346..cdcc6adb21 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.5",
+  "version": "7.13.0-fb-mvtc.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.13.0-fb-mvtc.5",
+      "version": "7.13.0-fb-mvtc.6",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index ff70f183ea..7fb7d9ed97 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.5",
+  "version": "7.13.0-fb-mvtc.6",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From bf27fe1a9a510700d4a91c6c91dc15c3911ed2aa Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Mon, 12 Jan 2026 19:09:33 -0800
Subject: [PATCH 06/20] support filters

---
 packages/components/package-lock.json               | 12 ++++++------
 packages/components/package.json                    |  4 ++--
 .../components/search/FilterFacetedSelector.tsx     | 13 ++++++++-----
 .../src/internal/components/search/utils.ts         |  6 ++++--
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index cdcc6adb21..6b51621ef5 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,16 +1,16 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.6",
+  "version": "7.13.0-fb-mvtc.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.13.0-fb-mvtc.6",
+      "version": "7.13.0-fb-mvtc.11",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
-        "@labkey/api": "1.45.0-fb-mvtc.2",
+        "@labkey/api": "1.45.0-fb-mvtc.4",
         "@testing-library/dom": "~10.4.1",
         "@testing-library/jest-dom": "~6.9.1",
         "@testing-library/react": "~16.3.0",
@@ -3535,9 +3535,9 @@
       }
     },
     "node_modules/@labkey/api": {
-      "version": "1.45.0-fb-mvtc.2",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.45.0-fb-mvtc.2.tgz",
-      "integrity": "sha512-26xRLDWTZTOIGvoseGCeLVzMlwftHs6oxOlft6uhdmJpYBdm6+AyK2w+jU0Fns5SaEtaZAGofrBJFi8zCXttCg==",
+      "version": "1.45.0-fb-mvtc.4",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.45.0-fb-mvtc.4.tgz",
+      "integrity": "sha512-IeN9uvY6hqeBftEzbTbk8AFVP7hq0IaFl8ewbXj7wQXjBzPYSIpAym2lpurn7FYcYXJ/5F7RRj9z0bZKeAC+7g==",
       "license": "Apache-2.0"
     },
     "node_modules/@labkey/build": {
diff --git a/packages/components/package.json b/packages/components/package.json
index 7fb7d9ed97..311944996e 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.6",
+  "version": "7.13.0-fb-mvtc.11",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [
@@ -50,7 +50,7 @@
   "homepage": "https://github.com/LabKey/labkey-ui-components#readme",
   "dependencies": {
     "@hello-pangea/dnd": "18.0.1",
-    "@labkey/api": "1.45.0-fb-mvtc.2",
+    "@labkey/api": "1.45.0-fb-mvtc.4",
     "@testing-library/dom": "~10.4.1",
     "@testing-library/jest-dom": "~6.9.1",
     "@testing-library/react": "~16.3.0",
diff --git a/packages/components/src/internal/components/search/FilterFacetedSelector.tsx b/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
index a28902f68b..603cc41d55 100644
--- a/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
+++ b/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
@@ -215,12 +215,12 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
                 fieldKey,
                 value,
                 checked,
-                fieldFilters?.[0], // choose values applies only to the first filter
+                fieldFilters?.[0] ?? (multiChoices ? Filter.create(fieldKey, [], Filter.Types.ARRAY_CONTAINS_ALL) : null), // choose values applies only to the first filter
                 uncheckOthers
             );
             onFieldFilterUpdate([newFilter], 0);
         },
-        [disabled, allShown, fieldDistinctValues, fieldKey, fieldFilters, onFieldFilterUpdate]
+        [disabled, allShown, fieldDistinctValues, fieldKey, fieldFilters, onFieldFilterUpdate, multiChoices]
     );
 
     const filteredFieldDistinctValues = useMemo(() => {
@@ -250,12 +250,15 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
             if (!newActiveFilterType) return newFilters;
 
             const filterType = resolveFilterType(newActiveFilterType?.value, field);
+            let updatedFilterValues = fieldFilters[0]?.getValue();
+            if (updatedFilterValues && multiChoices && !filterType.isMultiValued())
+                updatedFilterValues = null;
 
-            newFilters = [Filter.create(fieldKey, fieldFilters[0]?.getValue(), filterType), null];
+            newFilters = [Filter.create(fieldKey, updatedFilterValues, filterType), null];
 
             onFieldFilterUpdate(newFilters, 0);
         },
-        [onFieldFilterUpdate, filterOptions, field, fieldFilters, fieldKey]
+        [onFieldFilterUpdate, filterOptions, field, fieldFilters, fieldKey, multiChoices]
     );
 
     if (!fieldDistinctValues || allShown === undefined) return <LoadingSpinner />;
@@ -275,7 +278,7 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
                         options={filterOptions}
                         placeholder="Select a filter type..."
                         required={true}
-                        value={fieldFilters?.[0]?.getFilterType()?.getURLSuffix() || ''}
+                        value={fieldFilters?.[0]?.getFilterType()?.getURLSuffix() || 'arraycontainsall'}
                     />
                 }
                 {(fieldDistinctValues?.length > showSearchLength || searchStr) && (
diff --git a/packages/components/src/internal/components/search/utils.ts b/packages/components/src/internal/components/search/utils.ts
index d6e7a59c66..107d0e6bb7 100644
--- a/packages/components/src/internal/components/search/utils.ts
+++ b/packages/components/src/internal/components/search/utils.ts
@@ -294,10 +294,12 @@ export function getUpdateFilterExpressionFilter(
 
 // this util is only for string field type
 export function getCheckedFilterValues(filter: Filter.IFilter, allValues: string[], multiChoices?: string[]): string[] {
-    if (!filter && !allValues) return [];
+    if (!filter && (!allValues || multiChoices?.length > 0)) return [];
 
     if (filter?.getFilterType().getURLSuffix().indexOf('array') === 0) {
-        return filter.getValue() ?? [];
+        const checked = filter.getValue() ?? [];
+        if (checked.length === multiChoices?.length) return allValues;
+        return checked;
     }
 
     const filterUrlSuffix = filter?.getFilterType()?.getURLSuffix();

From 93ca6ff8dc8fffc960119e5b80e42d5c39cbee83 Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Tue, 13 Jan 2026 13:40:23 -0800
Subject: [PATCH 07/20] fix joinValues

---
 packages/components/package-lock.json                       | 4 ++--
 packages/components/package.json                            | 2 +-
 .../src/internal/components/editable/LookupCell.tsx         | 2 +-
 .../src/internal/components/forms/QueryFormInputs.tsx       | 3 +--
 .../src/internal/components/forms/detail/DetailDisplay.tsx  | 4 ++--
 .../src/internal/components/forms/input/AliasInput.tsx      | 2 +-
 .../internal/components/forms/input/LookupSelectInput.tsx   | 6 +++---
 .../internal/components/forms/input/SampleStatusInput.tsx   | 2 +-
 .../src/internal/components/forms/input/SelectInput.tsx     | 6 +++---
 .../src/internal/components/forms/input/TextChoiceInput.tsx | 2 +-
 10 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 6b51621ef5..1f64c7988d 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.11",
+  "version": "7.13.0-fb-mvtc.13",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.13.0-fb-mvtc.11",
+      "version": "7.13.0-fb-mvtc.13",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 311944996e..56f6489f8c 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.11",
+  "version": "7.13.0-fb-mvtc.13",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [
diff --git a/packages/components/src/internal/components/editable/LookupCell.tsx b/packages/components/src/internal/components/editable/LookupCell.tsx
index 2649427991..bc8b1474e0 100644
--- a/packages/components/src/internal/components/editable/LookupCell.tsx
+++ b/packages/components/src/internal/components/editable/LookupCell.tsx
@@ -172,7 +172,7 @@ export const LookupCell: FC<LookupCellProps> = memo(props => {
                 queryColumn={col}
                 value={col.isMultiChoice ? rawValues : rawValues[0]}
                 multiple={col.isMultiChoice}
-                joinValues={false}
+                skipJoinValues={true}
             />
         );
     }
diff --git a/packages/components/src/internal/components/forms/QueryFormInputs.tsx b/packages/components/src/internal/components/forms/QueryFormInputs.tsx
index 557bdbb27c..fd9dfdb563 100644
--- a/packages/components/src/internal/components/forms/QueryFormInputs.tsx
+++ b/packages/components/src/internal/components/forms/QueryFormInputs.tsx
@@ -254,7 +254,6 @@ export class QueryFormInputs extends React.Component<QueryFormInputsProps, State
                         // Must be explicitly false to prevent drop-down.
                         if (col.displayAsLookup !== false) {
                             const multiple = col.isJunctionLookup();
-                            const joinValues = multiple;
                             const queryFilter = col.lookup.hasQueryFilters(operation)
                                 ? List(col.lookup.getQueryFilters(operation))
                                 : queryFilters?.[fieldKey];
@@ -286,7 +285,7 @@ export class QueryFormInputs extends React.Component<QueryFormInputsProps, State
                                         formsy
                                         hasMixedValue={hasMixedValue}
                                         initiallyDisabled={shouldDisableField}
-                                        joinValues={joinValues}
+                                        skipJoinValues={multiple}
                                         label={col.caption}
                                         loadOnFocus
                                         maxRows={LOOKUP_DEFAULT_SIZE}
diff --git a/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx b/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
index 155087b801..cdaca6f639 100644
--- a/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
+++ b/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
@@ -323,7 +323,7 @@ export function resolveDetailEditRenderer(
             if (col.displayAsLookup !== false) {
                 // Issue 29232: When displaying a lookup, always use the value
                 const multiple = col.isJunctionLookup();
-                const joinValues = multiple && !col.isDataInput() && !col.isMultiChoice;
+                const skipJoinValues = multiple && !col.isDataInput();
                 const queryFilters = col.lookup.hasQueryFilters(Operation.update)
                     ? List(col.lookup.getQueryFilters(Operation.update))
                     : undefined;
@@ -339,7 +339,7 @@ export function resolveDetailEditRenderer(
                         displayColumn={col.lookup.displayColumn}
                         formsy
                         inputClass={DETAIL_INPUT_WRAPPER_CLASS_NAME}
-                        joinValues={joinValues}
+                        skipJoinValues={skipJoinValues}
                         key={col.fieldKey}
                         label={col.caption}
                         maxRows={LOOKUP_DEFAULT_SIZE}
diff --git a/packages/components/src/internal/components/forms/input/AliasInput.tsx b/packages/components/src/internal/components/forms/input/AliasInput.tsx
index 530f0285ee..983b1f6e0f 100644
--- a/packages/components/src/internal/components/forms/input/AliasInput.tsx
+++ b/packages/components/src/internal/components/forms/input/AliasInput.tsx
@@ -50,7 +50,7 @@ export const AliasSelectInput: FC<Props> = memo(props => {
             formsy
             id={generatedId}
             isValidNewOption={isValidNewOption}
-            joinValues
+            skipJoinValues
             label={col.caption}
             multiple
             name={col.fieldKey}
diff --git a/packages/components/src/internal/components/forms/input/LookupSelectInput.tsx b/packages/components/src/internal/components/forms/input/LookupSelectInput.tsx
index 538c3ae1e0..6bb55fb368 100644
--- a/packages/components/src/internal/components/forms/input/LookupSelectInput.tsx
+++ b/packages/components/src/internal/components/forms/input/LookupSelectInput.tsx
@@ -165,7 +165,7 @@ export class LookupSelectInput extends React.PureComponent<OwnProps, StateProps>
         // if multiValued = 'junction', the select should support MultiSelect and the value should be joined as an array of strings
         // !Except for the faked up parent column (DataInputs/<DataClassName> in Insert.tsx) where a comma separated string is required
         const multiple = queryColumn.isJunctionLookup(),
-            joinValues = multiple && !queryColumn.isDataInput(),
+            skipJoinValues = multiple && !queryColumn.isDataInput(),
             id = this._id;
 
         const inputProps = Object.assign(
@@ -180,10 +180,10 @@ export class LookupSelectInput extends React.PureComponent<OwnProps, StateProps>
             this.props,
             {
                 // properties that cannot be changed
-                joinValues,
+                skipJoinValues,
                 options,
                 // If joinValues is true, and a value is present ensure value is passed in as an Array<string>
-                value: joinValues && value && !Array.isArray(value) ? [value] : value,
+                value: skipJoinValues && value && !Array.isArray(value) ? [value] : value,
             }
         );
 
diff --git a/packages/components/src/internal/components/forms/input/SampleStatusInput.tsx b/packages/components/src/internal/components/forms/input/SampleStatusInput.tsx
index 000cb7dafd..0e653f223f 100644
--- a/packages/components/src/internal/components/forms/input/SampleStatusInput.tsx
+++ b/packages/components/src/internal/components/forms/input/SampleStatusInput.tsx
@@ -115,7 +115,7 @@ export const SampleStatusInput: FC<SampleStatusInputProps> = memo(props => {
                 displayColumn={col.lookup.displayColumn}
                 formsy
                 helpTipRenderer={col.helpTipRenderer}
-                joinValues={col.isJunctionLookup()}
+                skipJoinValues={col.isJunctionLookup()}
                 label={col.caption}
                 maxRows={LOOKUP_DEFAULT_SIZE}
                 multiple={col.isJunctionLookup()}
diff --git a/packages/components/src/internal/components/forms/input/SelectInput.tsx b/packages/components/src/internal/components/forms/input/SelectInput.tsx
index 1db9f7215a..31c875c4ef 100644
--- a/packages/components/src/internal/components/forms/input/SelectInput.tsx
+++ b/packages/components/src/internal/components/forms/input/SelectInput.tsx
@@ -239,7 +239,7 @@ export interface SelectInputProps {
     isValidNewOption?: (inputValue: string) => boolean;
     // FIXME: this is named incorrectly. I would expect that if this is true it would join the values, nope, it joins
     //   the values when false.
-    joinValues?: boolean;
+    skipJoinValues?: boolean;
     label?: ReactNode;
     labelClass?: string;
     labelKey?: string;
@@ -470,7 +470,7 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
     };
 
     _setOptionsAndValue(options: any): any {
-        const { autoValue, delimiter, formsy, joinValues, multiple, setValue, valueKey } = this.props;
+        const { autoValue, delimiter, formsy, skipJoinValues, multiple, setValue, valueKey } = this.props;
         let selectedOptions;
 
         if (options === undefined || options === null || (Array.isArray(options) && options.length === 0)) {
@@ -495,7 +495,7 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
                         return arr;
                     }, []);
 
-                    if (joinValues) {
+                    if (!skipJoinValues) {
                         // consider removing altogether?
                         formValue = formValue.join(delimiter);
                     }
diff --git a/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx b/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx
index 9eb94c4b93..fe6d344872 100644
--- a/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx
@@ -22,7 +22,7 @@ export class TextChoiceInput extends DisableableInput<Props, DisableableInputSta
                 {...selectInputProps}
                 options={options}
                 multiple={queryColumn.isMultiChoice}
-                joinValues={false}
+                skipJoinValues={true}
             />
         );
     }

From 7703c80bf8fbf2634133d9670566593c05e4c0de Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Tue, 13 Jan 2026 13:58:12 -0800
Subject: [PATCH 08/20] fix joinValues

---
 packages/components/package-lock.json         |   4 +-
 packages/components/package.json              |   2 +-
 .../CalculatedFieldOptions.tsx                |  14 +--
 .../ConditionalFormattingAndValidation.tsx    |  60 ++++++-----
 .../components/domainproperties/DomainRow.tsx | 101 +++++++++---------
 .../domainproperties/PropDescType.ts          |  14 +--
 .../components/domainproperties/actions.ts    |   2 +-
 .../components/domainproperties/models.tsx    |  10 +-
 .../components/editable/LookupCell.tsx        |   4 +-
 .../internal/components/editable/actions.ts   |   2 +-
 .../internal/components/editable/models.ts    |  12 +--
 .../components/forms/QueryFormInputs.tsx      |   2 +-
 .../components/forms/detail/DetailDisplay.tsx |   2 +-
 .../components/forms/input/AliasInput.tsx     |   2 +-
 .../forms/input/LookupSelectInput.tsx         |   6 +-
 .../forms/input/SampleStatusInput.tsx         |   2 +-
 .../components/forms/input/SelectInput.tsx    |   4 +-
 .../forms/input/TextChoiceInput.tsx           |   2 +-
 .../search/FilterFacetedSelector.tsx          |  68 ++++++------
 .../components/search/QueryFilterPanel.tsx    |  11 +-
 .../src/internal/components/search/utils.ts   |   6 +-
 .../internal/renderers/MultiValueRenderer.tsx |   7 +-
 .../components/src/internal/util/utils.ts     |   6 +-
 23 files changed, 181 insertions(+), 162 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 1f64c7988d..ea374431b5 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.13",
+  "version": "7.13.0-fb-mvtc.14",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.13.0-fb-mvtc.13",
+      "version": "7.13.0-fb-mvtc.14",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 56f6489f8c..b7057fe35f 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.13",
+  "version": "7.13.0-fb-mvtc.14",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [
diff --git a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
index 73223882c0..46dcb839c2 100644
--- a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
+++ b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.tsx
@@ -163,20 +163,20 @@ export const CalculatedFieldOptions: FC<Props> = memo(props => {
         >
             <div className="row">
                 <div className="col-xs-12 col-md-6">
-                    <SectionHeading title="Expression" cls="bottom-padding" helpTipBody={HELP_TIP_BODY} />
+                    <SectionHeading cls="bottom-padding" helpTipBody={HELP_TIP_BODY} title="Expression" />
                     <textarea
                         className="form-control"
-                        rows={6}
-                        value={field.valueExpression || ''}
-                        id={createFormInputId(DOMAIN_FIELD_VALUE_EXPRESSION, domainIndex, index)}
-                        name={createFormInputName(DOMAIN_FIELD_VALUE_EXPRESSION)}
-                        onChange={handleChange}
-                        onBlur={handleBlur}
                         disabled={
                             isFieldPartiallyLocked(field.lockType) ||
                             isFieldFullyLocked(field.lockType) ||
                             field.lockExistingField
                         }
+                        id={createFormInputId(DOMAIN_FIELD_VALUE_EXPRESSION, domainIndex, index)}
+                        name={createFormInputName(DOMAIN_FIELD_VALUE_EXPRESSION)}
+                        onBlur={handleBlur}
+                        onChange={handleChange}
+                        rows={6}
+                        value={field.valueExpression || ''}
                     />
                     <div className="domain-field-calc-footer">
                         {error && <div className="error">{error}</div>}
diff --git a/packages/components/src/internal/components/domainproperties/ConditionalFormattingAndValidation.tsx b/packages/components/src/internal/components/domainproperties/ConditionalFormattingAndValidation.tsx
index 5101302fcc..ad0eb37e1d 100644
--- a/packages/components/src/internal/components/domainproperties/ConditionalFormattingAndValidation.tsx
+++ b/packages/components/src/internal/components/domainproperties/ConditionalFormattingAndValidation.tsx
@@ -91,7 +91,7 @@ export class ConditionalFormattingAndValidation extends PureComponent<Props, Sta
         onChange(evt.target.id, evt.target.value);
     };
 
-    onApply = (validator: List<PropertyValidator | ConditionalFormat>, type: string): void => {
+    onApply = (validator: List<ConditionalFormat | PropertyValidator>, type: string): void => {
         const { onChange, index, domainIndex } = this.props;
         onChange(createFormInputId(type, domainIndex, index), validator);
     };
@@ -99,19 +99,28 @@ export class ConditionalFormattingAndValidation extends PureComponent<Props, Sta
     showHideConditionalFormat = (): void => {
         const { showingModal } = this.props;
 
-        this.setState(state => ({ showCondFormat: !state.showCondFormat }), () => showingModal(this.state.showCondFormat));
+        this.setState(
+            state => ({ showCondFormat: !state.showCondFormat }),
+            () => showingModal(this.state.showCondFormat)
+        );
     };
 
     showHideRegexValidator = (): void => {
         const { showingModal } = this.props;
 
-        this.setState(state => ({ showRegex: !state.showRegex }), () => showingModal(this.state.showRegex));
+        this.setState(
+            state => ({ showRegex: !state.showRegex }),
+            () => showingModal(this.state.showRegex)
+        );
     };
 
     showHideRangeValidator = (): void => {
         const { showingModal } = this.props;
 
-        this.setState(state => ({ showRange: !state.showRange }), () => showingModal(this.state.showRange));
+        this.setState(
+            state => ({ showRange: !state.showRange }),
+            () => showingModal(this.state.showRange)
+        );
     };
 
     renderValidator = (range: boolean): ReactNode => {
@@ -123,8 +132,8 @@ export class ConditionalFormattingAndValidation extends PureComponent<Props, Sta
             <div className={range ? '' : 'domain-validation-group'}>
                 <div className="domain-field-label domain-no-wrap">
                     <DomainFieldLabel
-                        label={'Create ' + (range ? 'Range' : 'Regular Expression') + ' Validator'}
                         helpTipBody={range ? <RangeValidatorHelpText /> : <RegexValidatorHelpText />}
+                        label={'Create ' + (range ? 'Range' : 'Regular Expression') + ' Validator'}
                     />
                 </div>
                 <div>
@@ -151,8 +160,8 @@ export class ConditionalFormattingAndValidation extends PureComponent<Props, Sta
                                 isFieldFullyLocked(field.lockType)
                                     ? () => {}
                                     : range
-                                    ? this.showHideRangeValidator
-                                    : this.showHideRegexValidator
+                                      ? this.showHideRangeValidator
+                                      : this.showHideRegexValidator
                             }
                         >
                             {'' + count + ' Active validator' + (count > 1 ? 's' : '')}
@@ -173,8 +182,8 @@ export class ConditionalFormattingAndValidation extends PureComponent<Props, Sta
             <div className="domain-validation-group">
                 <div className="domain-field-label domain-no-wrap">
                     <DomainFieldLabel
-                        label="Create Conditional Format Criteria"
                         helpTipBody={<ConditionalFormatHelpText />}
+                        label="Create Conditional Format Criteria"
                     />
                 </div>
                 <div>
@@ -206,7 +215,8 @@ export class ConditionalFormattingAndValidation extends PureComponent<Props, Sta
     render() {
         const { index, field, domainFormDisplayOptions } = this.props;
         const { showCondFormat, showRegex, showRange } = this.state;
-        const showCondFormatSection = !domainFormDisplayOptions.hideConditionalFormatting && DomainField.allowConditionalFormats(field);
+        const showCondFormatSection =
+            !domainFormDisplayOptions.hideConditionalFormatting && DomainField.allowConditionalFormats(field);
         const showRegexSection = !domainFormDisplayOptions.hideValidators && DomainField.hasRegExValidation(field);
         const showRangeSection = !domainFormDisplayOptions.hideValidators && DomainField.hasRangeValidation(field);
         const showValidation = showRegexSection || showRangeSection;
@@ -225,7 +235,7 @@ export class ConditionalFormattingAndValidation extends PureComponent<Props, Sta
             <div>
                 <div className="row">
                     <div className="col-xs-12">
-                        <SectionHeading title={title} cls="domain-field-section-hdr" />
+                        <SectionHeading cls="domain-field-section-hdr" title={title} />
                     </div>
                 </div>
                 <div className="row">
@@ -235,41 +245,41 @@ export class ConditionalFormattingAndValidation extends PureComponent<Props, Sta
                         {showRangeSection && this.renderValidator(true)}
                         {showCondFormat && (
                             <ConditionalFormatOptionsModal
-                                title={'Conditional Formatting ' + (field.name ? 'for ' + field.name : '')}
                                 addName="Formatting"
+                                dataType={field.dataType}
                                 index={index}
-                                type={DOMAIN_COND_FORMAT}
                                 mvEnabled={field.mvEnabled}
-                                validators={field.conditionalFormats}
-                                dataType={field.dataType}
-                                onHide={this.showHideConditionalFormat}
                                 onApply={this.onApply}
+                                onHide={this.showHideConditionalFormat}
+                                title={'Conditional Formatting ' + (field.name ? 'for ' + field.name : '')}
+                                type={DOMAIN_COND_FORMAT}
+                                validators={field.conditionalFormats}
                             />
                         )}
                         {showRegex && (
                             <RegexValidationOptionsModal
-                                title={'Regular Expression Validator(s) ' + (field.name ? 'for ' + field.name : '')}
                                 addName="Validator"
+                                dataType={field.dataType}
                                 index={index}
-                                type={DOMAIN_REGEX_VALIDATOR}
                                 mvEnabled={field.mvEnabled}
-                                validators={field.regexValidators}
-                                dataType={field.dataType}
-                                onHide={this.showHideRegexValidator}
                                 onApply={this.onApply}
+                                onHide={this.showHideRegexValidator}
+                                title={'Regular Expression Validator(s) ' + (field.name ? 'for ' + field.name : '')}
+                                type={DOMAIN_REGEX_VALIDATOR}
+                                validators={field.regexValidators}
                             />
                         )}
                         {showRange && (
                             <RangeValidationOptionsModal
-                                title={'Range Validator(s) ' + (field.name ? 'for ' + field.name : '')}
                                 addName="Validator"
+                                dataType={field.dataType}
                                 index={index}
-                                type={DOMAIN_RANGE_VALIDATOR}
                                 mvEnabled={field.mvEnabled}
-                                validators={field.rangeValidators}
-                                dataType={field.dataType}
-                                onHide={this.showHideRangeValidator}
                                 onApply={this.onApply}
+                                onHide={this.showHideRangeValidator}
+                                title={'Range Validator(s) ' + (field.name ? 'for ' + field.name : '')}
+                                type={DOMAIN_RANGE_VALIDATOR}
+                                validators={field.rangeValidators}
                             />
                         )}
                     </div>
diff --git a/packages/components/src/internal/components/domainproperties/DomainRow.tsx b/packages/components/src/internal/components/domainproperties/DomainRow.tsx
index 06c32ccc51..ef82047d2f 100644
--- a/packages/components/src/internal/components/domainproperties/DomainRow.tsx
+++ b/packages/components/src/internal/components/domainproperties/DomainRow.tsx
@@ -149,13 +149,13 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
 
         if (fieldError) {
             details.push(details.length > 0 ? '. ' : '');
-            details.push(<DomainRowWarning key="domain-row-field-error" fieldError={fieldError} />);
+            details.push(<DomainRowWarning fieldError={fieldError} key="domain-row-field-error" />);
         }
 
         return (
             <div
-                id={createFormInputId(DOMAIN_FIELD_DETAILS, domainIndex, index)}
                 className={expanded ? 'domain-field-details-expanded' : 'domain-field-details'}
+                id={createFormInputId(DOMAIN_FIELD_DETAILS, domainIndex, index)}
             >
                 {details}
             </div>
@@ -401,25 +401,25 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
                         tabIndex={index}
                     >
                         <div
-                            key={createFormInputId('domainrow', domainIndex, index)}
                             className="row domain-row-container"
+                            key={createFormInputId('domainrow', domainIndex, index)}
                         >
                             {showAdv && (
                                 <AdvancedSettings
-                                    domainIndex={domainIndex}
+                                    allowUniqueConstraintProperties={allowUniqueConstraintProperties}
+                                    defaultDefaultValueType={defaultDefaultValueType}
+                                    defaultValueOptions={defaultValueOptions}
+                                    domainFormDisplayOptions={domainFormDisplayOptions}
                                     domainId={domainId}
+                                    domainIndex={domainIndex}
+                                    field={field}
                                     helpNoun={helpNoun}
                                     index={index}
+                                    label={field.name}
                                     maxPhiLevel={maxPhiLevel}
-                                    field={field}
                                     onApply={this.onMultiFieldChange}
                                     onHide={this.onHideAdvanced}
-                                    label={field.name}
                                     showDefaultValueSettings={showDefaultValueSettings}
-                                    allowUniqueConstraintProperties={allowUniqueConstraintProperties}
-                                    defaultDefaultValueType={defaultDefaultValueType}
-                                    defaultValueOptions={defaultValueOptions}
-                                    domainFormDisplayOptions={domainFormDisplayOptions}
                                 />
                             )}
                             <div
@@ -437,18 +437,18 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
                             </div>
                             <div className="domain-row-action-section">
                                 <DomainDesignerCheckbox
+                                    checked={selected}
                                     className="domain-field-check-icon"
-                                    name={createFormInputName(DOMAIN_FIELD_SELECTED)}
+                                    disabled={false}
                                     id={createFormInputId(DOMAIN_FIELD_SELECTED, domainIndex, index)}
-                                    checked={selected}
+                                    name={createFormInputName(DOMAIN_FIELD_SELECTED)}
                                     onChange={this.onFieldChange}
-                                    disabled={false}
                                 />
                                 <FieldExpansionToggle
                                     cls="domain-field-expand-icon"
+                                    collapsedTitle="Show additional field properties"
                                     expanded={expanded}
                                     expandedTitle="Hide additional field properties"
-                                    collapsedTitle="Show additional field properties"
                                     id={createFormInputId(DOMAIN_FIELD_EXPAND, domainIndex, index)}
                                     onClick={this.onExpand}
                                 />
@@ -459,20 +459,20 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
                                         <div className="col-xs-6">
                                             <input
                                                 className="form-control"
-                                                type="text"
-                                                value={field.name || ''}
-                                                name={createFormInputName(DOMAIN_FIELD_NAME)}
+                                                disabled={this.disableNameInput(field)}
                                                 id={createFormInputId(DOMAIN_FIELD_NAME, domainIndex, index)}
+                                                name={createFormInputName(DOMAIN_FIELD_NAME)}
                                                 onChange={this.onNameChange}
-                                                disabled={this.disableNameInput(field)}
+                                                type="text"
+                                                value={field.name || ''}
                                             />
                                         </div>
                                         <div className="col-xs-4">
                                             <select
                                                 className="form-control"
-                                                name={createFormInputName(DOMAIN_FIELD_TYPE)}
                                                 disabled={this.disableTypeInput(field)}
                                                 id={createFormInputId(DOMAIN_FIELD_TYPE, domainIndex, index)}
+                                                name={createFormInputName(DOMAIN_FIELD_TYPE)}
                                                 onChange={this.onDataTypeChange}
                                                 value={field.dataType.name}
                                             >
@@ -503,19 +503,19 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
                                                 {!domainFormDisplayOptions.hideRequired &&
                                                     !field.isCalculatedField() && (
                                                         <DomainDesignerCheckbox
+                                                            checked={field.required}
                                                             className="domain-field-checkbox"
-                                                            name={createFormInputName(DOMAIN_FIELD_REQUIRED)}
+                                                            disabled={
+                                                                isFieldFullyLocked(field.lockType) ||
+                                                                isPrimaryKeyFieldLocked(field.lockType)
+                                                            }
                                                             id={createFormInputId(
                                                                 DOMAIN_FIELD_REQUIRED,
                                                                 domainIndex,
                                                                 index
                                                             )}
-                                                            checked={field.required}
+                                                            name={createFormInputName(DOMAIN_FIELD_REQUIRED)}
                                                             onChange={this.onFieldChange}
-                                                            disabled={
-                                                                isFieldFullyLocked(field.lockType) ||
-                                                                isPrimaryKeyFieldLocked(field.lockType)
-                                                            }
                                                         />
                                                     )}
                                             </div>
@@ -527,24 +527,27 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
                                     <div
                                         className={expanded ? 'domain-field-buttons-expanded' : 'domain-field-buttons'}
                                     >
-                                        {expanded && !isFieldFullyLocked(field.lockType) && !appPropertiesOnly && DomainField.allowAdvancedSettings(field) && (
-                                            <button
-                                                className="domain-row-button btn btn-default"
-                                                disabled={isFieldFullyLocked(field.lockType)}
-                                                id={createFormInputId(DOMAIN_FIELD_ADV, domainIndex, index)}
-                                                name={createFormInputName(DOMAIN_FIELD_ADV)}
-                                                onClick={this.onShowAdvanced}
-                                                type="button"
-                                            >
-                                                Advanced Settings
-                                            </button>
-                                        )}
+                                        {expanded &&
+                                            !isFieldFullyLocked(field.lockType) &&
+                                            !appPropertiesOnly &&
+                                            DomainField.allowAdvancedSettings(field) && (
+                                                <button
+                                                    className="domain-row-button btn btn-default"
+                                                    disabled={isFieldFullyLocked(field.lockType)}
+                                                    id={createFormInputId(DOMAIN_FIELD_ADV, domainIndex, index)}
+                                                    name={createFormInputName(DOMAIN_FIELD_ADV)}
+                                                    onClick={this.onShowAdvanced}
+                                                    type="button"
+                                                >
+                                                    Advanced Settings
+                                                </button>
+                                            )}
                                         {isFieldDeletable(field) && (
                                             <DeleteIcon
-                                                id={createFormInputId(DOMAIN_FIELD_DELETE, domainIndex, index)}
-                                                title="Remove field"
                                                 iconCls="domain-field-delete-icon"
+                                                id={createFormInputId(DOMAIN_FIELD_DELETE, domainIndex, index)}
                                                 onDelete={this.onDelete}
+                                                title="Remove field"
                                             />
                                         )}
                                     </div>
@@ -554,27 +557,27 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
                         <Collapsible expanded={expanded}>
                             <div>
                                 <DomainRowExpandedOptions
-                                    field={field}
-                                    index={index}
+                                    appPropertiesOnly={appPropertiesOnly}
+                                    domainContainerPath={domainContainerPath}
+                                    domainFormDisplayOptions={domainFormDisplayOptions}
                                     domainIndex={domainIndex}
+                                    field={field}
                                     getDomainFields={getDomainFields}
-                                    onMultiChange={this.onMultiFieldChange}
+                                    index={index}
                                     onChange={this.onSingleFieldChange}
-                                    showingModal={this.showingModal}
-                                    appPropertiesOnly={appPropertiesOnly}
-                                    domainFormDisplayOptions={domainFormDisplayOptions}
-                                    domainContainerPath={domainContainerPath}
-                                    schemaName={schemaName}
+                                    onMultiChange={this.onMultiFieldChange}
                                     queryName={queryName}
+                                    schemaName={schemaName}
+                                    showingModal={this.showingModal}
                                 />
                             </div>
                         </Collapsible>
                         {dataTypeChangeToConfirm && (
                             <ConfirmDataTypeChangeModal
-                                originalRangeURI={field.original.rangeURI}
                                 newDataType={PropDescType.fromName(dataTypeChangeToConfirm)}
-                                onConfirm={this.onConfirmTypeChange}
                                 onCancel={this.onHideConfirmTypeChange}
+                                onConfirm={this.onConfirmTypeChange}
+                                originalRangeURI={field.original.rangeURI}
                             />
                         )}
                     </div>
diff --git a/packages/components/src/internal/components/domainproperties/PropDescType.ts b/packages/components/src/internal/components/domainproperties/PropDescType.ts
index 41f49601e9..36cc817e17 100644
--- a/packages/components/src/internal/components/domainproperties/PropDescType.ts
+++ b/packages/components/src/internal/components/domainproperties/PropDescType.ts
@@ -31,7 +31,7 @@ import {
     VISITID_CONCEPT_URI,
 } from './constants';
 
-export type JsonType = 'boolean' | 'date' | 'float' | 'int' | 'string' | 'time';
+export type JsonType = 'array' | 'boolean' | 'date' | 'float' | 'int' | 'string' | 'time';
 
 interface IPropDescType {
     conceptURI: string;
@@ -157,15 +157,17 @@ export class PropDescType
     getJsonType(): JsonType {
         // TODO should this change to default to returning this.name and just catch the diff cases?
         switch (this.name) {
+            case 'array':
+                return 'array';
             case 'boolean':
                 return 'boolean';
-            case 'int':
-                return 'int';
-            case 'double':
-                return 'float';
-            case 'dateTime':
             case 'date':
+            case 'dateTime':
                 return 'date';
+            case 'double':
+                return 'float';
+            case 'int':
+                return 'int';
             default:
                 return 'string';
         }
diff --git a/packages/components/src/internal/components/domainproperties/actions.ts b/packages/components/src/internal/components/domainproperties/actions.ts
index 545d50472f..82e59b7a7e 100644
--- a/packages/components/src/internal/components/domainproperties/actions.ts
+++ b/packages/components/src/internal/components/domainproperties/actions.ts
@@ -71,6 +71,7 @@ import {
     CALCULATED_TYPE,
     FILE_TYPE,
     FLAG_TYPE,
+    MULTI_CHOICE_TYPE,
     ONTOLOGY_LOOKUP_TYPE,
     PARTICIPANT_TYPE,
     PROP_DESC_TYPES,
@@ -78,7 +79,6 @@ import {
     SAMPLE_TYPE,
     SMILES_TYPE,
     TEXT_CHOICE_TYPE,
-    MULTI_CHOICE_TYPE,
     UNIQUE_ID_TYPE,
     USERS_TYPE,
     VISIT_DATE_TYPE,
diff --git a/packages/components/src/internal/components/domainproperties/models.tsx b/packages/components/src/internal/components/domainproperties/models.tsx
index 81371c6ae5..7fd7719da2 100644
--- a/packages/components/src/internal/components/domainproperties/models.tsx
+++ b/packages/components/src/internal/components/domainproperties/models.tsx
@@ -55,7 +55,8 @@ import {
     INT_RANGE_URI,
     LONG_RANGE_URI,
     LOOKUP_VALIDATOR_VALUES,
-    MAX_TEXT_LENGTH, MULTI_CHOICE_RANGE_URI,
+    MAX_TEXT_LENGTH,
+    MULTI_CHOICE_RANGE_URI,
     NUMBER_CONVERT_URIS,
     PHILEVEL_NOT_PHI,
     SAMPLE_TYPE_CONCEPT_URI,
@@ -145,9 +146,9 @@ interface IDomainDesign {
     allowCalculatedFields: boolean;
     allowFileLinkProperties: boolean;
     allowFlagProperties: boolean;
+    allowMultiChoiceProperties: boolean;
     allowSampleSubjectProperties: boolean;
     allowTextChoiceProperties: boolean;
-    allowMultiChoiceProperties: boolean;
     allowTimepointProperties: boolean;
     allowUniqueConstraintProperties: boolean;
     allowUserProperties: boolean;
@@ -812,7 +813,10 @@ export class PropertyValidator
                     const hasExpressionStr = expressionStr !== undefined && expressionStr !== null;
 
                     // if we are loading a textChoiceValidator from JSON, we need to set the properties.validValues
-                    if ((type === 'TextChoice' || type === 'MultiChoice') && !rawPropertyValidator[i]?.properties?.validValues) {
+                    if (
+                        (type === 'TextChoice' || type === 'MultiChoice') &&
+                        !rawPropertyValidator[i]?.properties?.validValues
+                    ) {
                         rawPropertyValidator[i].properties.validValues =
                             PropertyValidator.splitValidValues(expressionStr);
                     }
diff --git a/packages/components/src/internal/components/editable/LookupCell.tsx b/packages/components/src/internal/components/editable/LookupCell.tsx
index bc8b1474e0..e42619c4b8 100644
--- a/packages/components/src/internal/components/editable/LookupCell.tsx
+++ b/packages/components/src/internal/components/editable/LookupCell.tsx
@@ -166,13 +166,13 @@ export const LookupCell: FC<LookupCellProps> = memo(props => {
                 autoFocus
                 defaultInputValue={defaultInputValue}
                 disabled={disabled}
+                multiple={col.isMultiChoice}
                 onBlur={onBlur}
                 onChange={onSelectChange}
                 onKeyDown={onKeyDown}
                 queryColumn={col}
-                value={col.isMultiChoice ? rawValues : rawValues[0]}
-                multiple={col.isMultiChoice}
                 skipJoinValues={true}
+                value={col.isMultiChoice ? rawValues : rawValues[0]}
             />
         );
     }
diff --git a/packages/components/src/internal/components/editable/actions.ts b/packages/components/src/internal/components/editable/actions.ts
index b9980e7dbc..a244a9edef 100644
--- a/packages/components/src/internal/components/editable/actions.ts
+++ b/packages/components/src/internal/components/editable/actions.ts
@@ -480,7 +480,7 @@ interface CellData {
 }
 
 async function convertRowToEditorModelData(
-    data: boolean | number | string | [],
+    data: [] | boolean | number | string,
     col: QueryColumn,
     containerPath: string
 ): Promise<CellData> {
diff --git a/packages/components/src/internal/components/editable/models.ts b/packages/components/src/internal/components/editable/models.ts
index 1290a4621e..edd9d9c691 100644
--- a/packages/components/src/internal/components/editable/models.ts
+++ b/packages/components/src/internal/components/editable/models.ts
@@ -346,14 +346,11 @@ export class EditorModel
                             .join(', ')
                     );
                 } else if (col.isJunctionLookup() || col.isMultiChoice) {
-                    let valueArray = values
+                    const valueArray = values
                         .filter(vd => vd.raw !== undefined && vd.raw !== null)
                         .map(vd => vd.raw)
                         .toArray();
-                    row = row.set(
-                        col.name,
-                        valueArray
-                    );
+                    row = row.set(col.name, valueArray);
                 } else if (col.lookup.displayColumn === col.lookup.keyColumn) {
                     row = row.set(
                         col.name,
@@ -835,7 +832,10 @@ export class EditorModel
                     }
 
                     // If col is a multi-value column, compare all values for changes
-                    if ((List.isList(originalValue) || originalValue === undefined) && (Array.isArray(value) || value === null)) {
+                    if (
+                        (List.isList(originalValue) || originalValue === undefined) &&
+                        (Array.isArray(value) || value === null)
+                    ) {
                         if ((originalValue?.size ?? 0) !== (value?.length ?? 0)) {
                             row[key] = value;
                         } else if (originalValue) {
diff --git a/packages/components/src/internal/components/forms/QueryFormInputs.tsx b/packages/components/src/internal/components/forms/QueryFormInputs.tsx
index fd9dfdb563..93649a3ddb 100644
--- a/packages/components/src/internal/components/forms/QueryFormInputs.tsx
+++ b/packages/components/src/internal/components/forms/QueryFormInputs.tsx
@@ -285,7 +285,6 @@ export class QueryFormInputs extends React.Component<QueryFormInputsProps, State
                                         formsy
                                         hasMixedValue={hasMixedValue}
                                         initiallyDisabled={shouldDisableField}
-                                        skipJoinValues={multiple}
                                         label={col.caption}
                                         loadOnFocus
                                         maxRows={LOOKUP_DEFAULT_SIZE}
@@ -300,6 +299,7 @@ export class QueryFormInputs extends React.Component<QueryFormInputsProps, State
                                         required={col.required}
                                         schemaQuery={col.lookup.schemaQuery}
                                         showLabel
+                                        skipJoinValues={multiple}
                                         toggleDisabledTooltip={toggleDisabledTooltip}
                                         value={value}
                                         valueColumn={col.lookup.keyColumn}
diff --git a/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx b/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
index cdaca6f639..b3cae818d5 100644
--- a/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
+++ b/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
@@ -339,7 +339,6 @@ export function resolveDetailEditRenderer(
                         displayColumn={col.lookup.displayColumn}
                         formsy
                         inputClass={DETAIL_INPUT_WRAPPER_CLASS_NAME}
-                        skipJoinValues={skipJoinValues}
                         key={col.fieldKey}
                         label={col.caption}
                         maxRows={LOOKUP_DEFAULT_SIZE}
@@ -353,6 +352,7 @@ export function resolveDetailEditRenderer(
                         required={col.required}
                         schemaQuery={col.lookup.schemaQuery}
                         showLabel={showLabel}
+                        skipJoinValues={skipJoinValues}
                         value={value}
                         valueColumn={col.lookup.keyColumn}
                     />
diff --git a/packages/components/src/internal/components/forms/input/AliasInput.tsx b/packages/components/src/internal/components/forms/input/AliasInput.tsx
index 983b1f6e0f..0d0e863475 100644
--- a/packages/components/src/internal/components/forms/input/AliasInput.tsx
+++ b/packages/components/src/internal/components/forms/input/AliasInput.tsx
@@ -50,7 +50,6 @@ export const AliasSelectInput: FC<Props> = memo(props => {
             formsy
             id={generatedId}
             isValidNewOption={isValidNewOption}
-            skipJoinValues
             label={col.caption}
             multiple
             name={col.fieldKey}
@@ -59,6 +58,7 @@ export const AliasSelectInput: FC<Props> = memo(props => {
             required={col.required}
             saveOnBlur
             showLabel
+            skipJoinValues
             {...selectProps}
             resolveFormValue={resolveFormValue}
             value={value}
diff --git a/packages/components/src/internal/components/forms/input/LookupSelectInput.tsx b/packages/components/src/internal/components/forms/input/LookupSelectInput.tsx
index 6bb55fb368..93c8b5c289 100644
--- a/packages/components/src/internal/components/forms/input/LookupSelectInput.tsx
+++ b/packages/components/src/internal/components/forms/input/LookupSelectInput.tsx
@@ -164,9 +164,9 @@ export class LookupSelectInput extends React.PureComponent<OwnProps, StateProps>
 
         // if multiValued = 'junction', the select should support MultiSelect and the value should be joined as an array of strings
         // !Except for the faked up parent column (DataInputs/<DataClassName> in Insert.tsx) where a comma separated string is required
-        const multiple = queryColumn.isJunctionLookup(),
-            skipJoinValues = multiple && !queryColumn.isDataInput(),
-            id = this._id;
+        const id = this._id,
+            multiple = queryColumn.isJunctionLookup(),
+            skipJoinValues = multiple && !queryColumn.isDataInput();
 
         const inputProps = Object.assign(
             {
diff --git a/packages/components/src/internal/components/forms/input/SampleStatusInput.tsx b/packages/components/src/internal/components/forms/input/SampleStatusInput.tsx
index 0e653f223f..639d9f7133 100644
--- a/packages/components/src/internal/components/forms/input/SampleStatusInput.tsx
+++ b/packages/components/src/internal/components/forms/input/SampleStatusInput.tsx
@@ -115,7 +115,6 @@ export const SampleStatusInput: FC<SampleStatusInputProps> = memo(props => {
                 displayColumn={col.lookup.displayColumn}
                 formsy
                 helpTipRenderer={col.helpTipRenderer}
-                skipJoinValues={col.isJunctionLookup()}
                 label={col.caption}
                 maxRows={LOOKUP_DEFAULT_SIZE}
                 multiple={col.isJunctionLookup()}
@@ -123,6 +122,7 @@ export const SampleStatusInput: FC<SampleStatusInputProps> = memo(props => {
                 openMenuOnFocus={!col.isJunctionLookup()}
                 required={col.required}
                 showLoading={false}
+                skipJoinValues={col.isJunctionLookup()}
                 {...querySelectProps}
                 containerFilter={getSampleStatusContainerFilter()}
                 onQSChange={onChange}
diff --git a/packages/components/src/internal/components/forms/input/SelectInput.tsx b/packages/components/src/internal/components/forms/input/SelectInput.tsx
index 31c875c4ef..09d4f30d53 100644
--- a/packages/components/src/internal/components/forms/input/SelectInput.tsx
+++ b/packages/components/src/internal/components/forms/input/SelectInput.tsx
@@ -237,9 +237,6 @@ export interface SelectInputProps {
     inputId?: string;
     isLoading?: boolean;
     isValidNewOption?: (inputValue: string) => boolean;
-    // FIXME: this is named incorrectly. I would expect that if this is true it would join the values, nope, it joins
-    //   the values when false.
-    skipJoinValues?: boolean;
     label?: ReactNode;
     labelClass?: string;
     labelKey?: string;
@@ -269,6 +266,7 @@ export interface SelectInputProps {
     showDropdownMenu?: boolean;
     showIndicatorSeparator?: boolean;
     showLabel?: boolean;
+    skipJoinValues?: boolean;
     tabSelectsValue?: boolean;
     toggleDisabledTooltip?: string;
     value?: any;
diff --git a/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx b/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx
index fe6d344872..c9a1acd3b7 100644
--- a/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx
@@ -20,8 +20,8 @@ export class TextChoiceInput extends DisableableInput<Props, DisableableInputSta
                 name={queryColumn.fieldKey}
                 required={queryColumn.required}
                 {...selectInputProps}
-                options={options}
                 multiple={queryColumn.isMultiChoice}
+                options={options}
                 skipJoinValues={true}
             />
         );
diff --git a/packages/components/src/internal/components/search/FilterFacetedSelector.tsx b/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
index 603cc41d55..7bff3b4d5a 100644
--- a/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
+++ b/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
@@ -1,4 +1,4 @@
-import React, { FC, memo, useCallback, useEffect, useMemo, useRef, useState, ReactNode } from 'react';
+import React, { FC, memo, ReactNode, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { Filter, Query } from '@labkey/api';
 
@@ -16,12 +16,15 @@ import { FolderColumnRenderer } from '../../renderers/FolderColumnRenderer';
 import { useTimeout } from '../../hooks';
 
 import {
-    ALL_VALUE_DISPLAY, EMPTY_VALUE_DISPLAY, getCheckedFilterValues,
-    getFilterOptionsForType, getUpdatedChooseValuesFilter,
+    ALL_VALUE_DISPLAY,
+    EMPTY_VALUE_DISPLAY,
+    getCheckedFilterValues,
+    getFilterOptionsForType,
+    getUpdatedChooseValuesFilter,
 } from './utils';
-import {SelectInput} from "../forms/input/SelectInput";
-import {QueryColumn} from "../../../public/QueryColumn";
-import {resolveFilterType} from "../../../public/QueryModel/grid/actions/Filter";
+import { SelectInput } from '../forms/input/SelectInput';
+import { QueryColumn } from '../../../public/QueryColumn';
+import { resolveFilterType } from '../../../public/QueryModel/grid/actions/Filter';
 
 const MAX_DISTINCT_FILTER_OPTIONS = 250;
 
@@ -29,13 +32,13 @@ interface Props {
     api?: ComponentsAPIWrapper;
     canBeBlank: boolean;
     disabled?: boolean;
+    field?: QueryColumn;
     fieldFilters: Filter.IFilter[];
     fieldKey: string;
     onFieldFilterUpdate?: (newFilters: Filter.IFilter[], index) => void;
     selectDistinctOptions: Query.SelectDistinctOptions;
     // show search box if number of unique values > N
     showSearchLength?: number;
-    field?: QueryColumn;
 }
 
 const rendererFolderValue = (value: any): ReactNode => {
@@ -99,8 +102,8 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
                 if (!multiChoices) {
                     const filterArray = searchStr
                         ? [Filter.create(fieldKey, searchStr, Filter.Types.CONTAINS)].concat(
-                            selectDistinctOptions?.filterArray
-                        )
+                              selectDistinctOptions?.filterArray
+                          )
                         : selectDistinctOptions?.filterArray;
 
                     // if multi value, get all options
@@ -112,8 +115,7 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
                     });
                     resetRequestHandler();
                     allValues = result.values;
-                }
-                else {
+                } else {
                     allValues = multiChoices;
                     if (searchStr) {
                         // filter multiChoices based on search string
@@ -139,10 +141,7 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
                     distinctValues.splice(distinctValues.indexOf(EMPTY_VALUE_DISPLAY), 1);
                 }
                 // Issue 47544: don't show 'blank' if we have all the values and none are blank
-                if (
-                    toShow.length > 0 &&
-                    (hasBlank || (canBeBlank && allValues.length > MAX_DISTINCT_FILTER_OPTIONS))
-                ) {
+                if (toShow.length > 0 && (hasBlank || (canBeBlank && allValues.length > MAX_DISTINCT_FILTER_OPTIONS))) {
                     distinctValues.unshift(EMPTY_VALUE_DISPLAY);
                 }
 
@@ -177,7 +176,16 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
                 }
             }
         },
-        [api.query, canBeBlank, fieldKey, requestHandler, resetRequestHandler, selectDistinctOptions, timer, multiChoices]
+        [
+            api.query,
+            canBeBlank,
+            fieldKey,
+            requestHandler,
+            resetRequestHandler,
+            selectDistinctOptions,
+            timer,
+            multiChoices,
+        ]
     );
 
     const setDistinctValuesForSearch = useCallback(
@@ -215,7 +223,8 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
                 fieldKey,
                 value,
                 checked,
-                fieldFilters?.[0] ?? (multiChoices ? Filter.create(fieldKey, [], Filter.Types.ARRAY_CONTAINS_ALL) : null), // choose values applies only to the first filter
+                fieldFilters?.[0] ??
+                    (multiChoices ? Filter.create(fieldKey, [], Filter.Types.ARRAY_CONTAINS_ALL) : null), // choose values applies only to the first filter
                 uncheckOthers
             );
             onFieldFilterUpdate([newFilter], 0);
@@ -251,8 +260,7 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
 
             const filterType = resolveFilterType(newActiveFilterType?.value, field);
             let updatedFilterValues = fieldFilters[0]?.getValue();
-            if (updatedFilterValues && multiChoices && !filterType.isMultiValued())
-                updatedFilterValues = null;
+            if (updatedFilterValues && multiChoices && !filterType.isMultiValued()) updatedFilterValues = null;
 
             newFilters = [Filter.create(fieldKey, updatedFilterValues, filterType), null];
 
@@ -267,7 +275,7 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
         <>
             {error && <Alert>{error}</Alert>}
             <div className="filter-faceted__panel">
-                {multiChoices &&
+                {multiChoices && (
                     <SelectInput
                         containerClass="form-group filter-expression__input-wrapper"
                         disabled={disabled}
@@ -280,17 +288,17 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
                         required={true}
                         value={fieldFilters?.[0]?.getFilterType()?.getURLSuffix() || 'arraycontainsall'}
                     />
-                }
+                )}
                 {(fieldDistinctValues?.length > showSearchLength || searchStr) && (
                     <div>
                         <input
-                            id="filter-faceted__typeahead-input"
                             className="form-control filter-faceted__typeahead-input"
-                            value={searchStr ?? ''}
+                            disabled={disabled}
+                            id="filter-faceted__typeahead-input"
                             onChange={onSearchStrChange}
-                            type="text"
                             placeholder="Type to filter"
-                            disabled={disabled}
+                            type="text"
+                            value={searchStr ?? ''}
                         />
                     </div>
                 )}
@@ -314,15 +322,15 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
                                     if (value === null || value === undefined) displayValue = '[blank]';
 
                                     return (
-                                        <li key={index} className="filter-faceted__li">
+                                        <li className="filter-faceted__li" key={index}>
                                             <div className="form-check">
                                                 <input
+                                                    checked={checkedValues.indexOf(value) > -1}
                                                     className="form-check-input filter-faceted__checkbox"
-                                                    type="checkbox"
+                                                    disabled={disabled}
                                                     name={'field-value-' + index}
                                                     onChange={event => onChange(value, event.target.checked)}
-                                                    checked={checkedValues.indexOf(value) > -1}
-                                                    disabled={disabled}
+                                                    type="checkbox"
                                                 />
                                                 <div
                                                     className="filter-faceted__value"
@@ -350,7 +358,7 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
                                     if (value === null || value === undefined) displayValue = '[blank]';
 
                                     return (
-                                        <li key={index} className="filter-status__faceted">
+                                        <li className="filter-status__faceted" key={index}>
                                             <div className="filter-status-value">
                                                 <i
                                                     className="symbol fa fa-close"
diff --git a/packages/components/src/internal/components/search/QueryFilterPanel.tsx b/packages/components/src/internal/components/search/QueryFilterPanel.tsx
index e688fe39b6..9f10c359d7 100644
--- a/packages/components/src/internal/components/search/QueryFilterPanel.tsx
+++ b/packages/components/src/internal/components/search/QueryFilterPanel.tsx
@@ -101,7 +101,7 @@ export const QueryFilterPanel: FC<Props> = memo(props => {
 
     const viewName = useMemo(() => props.viewName ?? DEFAULT_VIEW_NAME, [props.viewName]);
     const allowFaceting = (col: QueryColumn): boolean => {
-        return col?.isMultiChoice || col?.allowFaceting() && col?.getDisplayFieldJsonType() === 'string'; // current plan is to only support facet for string fields, to reduce scope
+        return col?.isMultiChoice || (col?.allowFaceting() && col?.getDisplayFieldJsonType() === 'string'); // current plan is to only support facet for string fields, to reduce scope
     };
 
     const filterStatus = useMemo(() => {
@@ -130,8 +130,7 @@ export const QueryFilterPanel: FC<Props> = memo(props => {
 
     const getDefaultActiveTab = useCallback(
         (field: QueryColumn) => {
-            if (field.isMultiChoice)
-                return FieldFilterTabs.ChooseValues;
+            if (field.isMultiChoice) return FieldFilterTabs.ChooseValues;
 
             if (!allowFaceting(field)) {
                 return FieldFilterTabs.Filter;
@@ -319,7 +318,9 @@ export const QueryFilterPanel: FC<Props> = memo(props => {
                         <Tabs activeKey={activeTab} className="field-modal__tabs content-tabs" onSelect={onTabChange}>
                             {!activeField.isMultiChoice && (
                                 <Tab eventKey={FieldFilterTabs.Filter} title="Filter">
-                                    <div className="field-modal__col-sub-title">Find values for {activeField.caption}</div>
+                                    <div className="field-modal__col-sub-title">
+                                        Find values for {activeField.caption}
+                                    </div>
                                     {activeTab === FieldFilterTabs.Filter && (
                                         <FilterExpressionView
                                             allowRelativeDateFilter={allowRelativeDateFilter}
@@ -343,9 +344,9 @@ export const QueryFilterPanel: FC<Props> = memo(props => {
                                         Find values for {activeField.caption}
                                     </div>
                                     <FilterFacetedSelector
-                                        field={activeField}
                                         canBeBlank={!activeField?.required && !activeField.nameExpression}
                                         disabled={hasNotInQueryFilter}
+                                        field={activeField}
                                         fieldFilters={currentFieldFilters?.map(filter => filter.filter)}
                                         fieldKey={activeFieldKey}
                                         key={activeFieldKey}
diff --git a/packages/components/src/internal/components/search/utils.ts b/packages/components/src/internal/components/search/utils.ts
index 107d0e6bb7..9ae44bd1b8 100644
--- a/packages/components/src/internal/components/search/utils.ts
+++ b/packages/components/src/internal/components/search/utils.ts
@@ -387,10 +387,10 @@ export function getUpdatedChooseValuesFilter(
             );
         if (isArrayFilter)
             return Filter.create(
-            fieldKey,
-            allValues.filter(v => v !== ALL_VALUE_DISPLAY),
+                fieldKey,
+                allValues.filter(v => v !== ALL_VALUE_DISPLAY),
                 oldFilter.getFilterType()
-        );
+            );
         return hasBlank ? null : Filter.create(fieldKey, null, Filter.Types.NONBLANK);
     }
 
diff --git a/packages/components/src/internal/renderers/MultiValueRenderer.tsx b/packages/components/src/internal/renderers/MultiValueRenderer.tsx
index 32ba6747ab..849dbdc809 100644
--- a/packages/components/src/internal/renderers/MultiValueRenderer.tsx
+++ b/packages/components/src/internal/renderers/MultiValueRenderer.tsx
@@ -28,15 +28,10 @@ export const MultiValueRenderer: FC<MultiValueRendererProps> = memo(({ data, col
         return null;
     }
 
-    if (
-        List.isList(data) &&
-        data.size === 1 &&
-        (col?.isFileInput)
-    ) {
+    if (List.isList(data) && data.size === 1 && col?.isFileInput) {
         return <FileColumnRenderer data={data.get(0)} />;
     }
 
-
     let valueArray = data;
     if (col?.isMultiChoice) {
         valueArray = data.get('value');
diff --git a/packages/components/src/internal/util/utils.ts b/packages/components/src/internal/util/utils.ts
index a0537b75ea..378b2fb605 100644
--- a/packages/components/src/internal/util/utils.ts
+++ b/packages/components/src/internal/util/utils.ts
@@ -226,8 +226,7 @@ export function getCommonDataValues(
                             value = data.toJS();
                         } else {
                             value = data.get('value');
-                            if (List.isList(value))
-                                value = value.toJS();
+                            if (List.isList(value)) value = value.toJS();
                         }
                     }
 
@@ -254,8 +253,7 @@ export function getCommonDataValues(
                                 fieldsInConflict = fieldsInConflict.add(key);
                                 valueMap = valueMap.delete(key);
                             }
-                        }
-                        else if (valueMap.get(key) !== value) {
+                        } else if (valueMap.get(key) !== value) {
                             fieldsInConflict = fieldsInConflict.add(key);
                             valueMap = valueMap.delete(key);
                         }

From 9d8bbb04a2656a57a044a9e18e2f0b9d76101af0 Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Tue, 13 Jan 2026 15:48:55 -0800
Subject: [PATCH 09/20] order inputs

---
 .../src/internal/components/forms/input/SelectInput.tsx   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/internal/components/forms/input/SelectInput.tsx b/packages/components/src/internal/components/forms/input/SelectInput.tsx
index 09d4f30d53..fa5abede0c 100644
--- a/packages/components/src/internal/components/forms/input/SelectInput.tsx
+++ b/packages/components/src/internal/components/forms/input/SelectInput.tsx
@@ -478,6 +478,12 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
         }
 
         if (autoValue) {
+            if (Array.isArray(selectedOptions))
+                selectedOptions.sort((a, b) => {
+                    const aValue = valueKey ? a[valueKey] : a.value;
+                    const bValue = valueKey ? b[valueKey] : b.value;
+                    return aValue - bValue;
+                });
             this.setState({ selectedOptions });
         }
 
@@ -491,7 +497,7 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
                     formValue = selectedOptions.reduce((arr, option) => {
                         arr.push(valueKey ? option[valueKey] : option.value);
                         return arr;
-                    }, []);
+                    }, []).sort();
 
                     if (!skipJoinValues) {
                         // consider removing altogether?

From 689da0bbc60c169c7eb6e3308cb803a71aad16ca Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Tue, 13 Jan 2026 15:53:10 -0800
Subject: [PATCH 10/20] order inputs

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index ea374431b5..c64db13634 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.14",
+  "version": "7.13.0-fb-mvtc.15",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.13.0-fb-mvtc.14",
+      "version": "7.13.0-fb-mvtc.15",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index b7057fe35f..1bd46d7f5f 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.14",
+  "version": "7.13.0-fb-mvtc.15",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 858d2634f45468d3f1fbb66fce6be0f6e5d61429 Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Wed, 14 Jan 2026 09:20:32 -0800
Subject: [PATCH 11/20] order inputs

---
 packages/components/package-lock.json                       | 4 ++--
 packages/components/package.json                            | 2 +-
 .../src/internal/components/forms/input/SelectInput.tsx     | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index c64db13634..3c0cd9c5ee 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.15",
+  "version": "7.13.0-fb-mvtc.16",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.13.0-fb-mvtc.15",
+      "version": "7.13.0-fb-mvtc.16",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 1bd46d7f5f..de3b022e85 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.15",
+  "version": "7.13.0-fb-mvtc.16",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [
diff --git a/packages/components/src/internal/components/forms/input/SelectInput.tsx b/packages/components/src/internal/components/forms/input/SelectInput.tsx
index fa5abede0c..306958459b 100644
--- a/packages/components/src/internal/components/forms/input/SelectInput.tsx
+++ b/packages/components/src/internal/components/forms/input/SelectInput.tsx
@@ -482,7 +482,11 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
                 selectedOptions.sort((a, b) => {
                     const aValue = valueKey ? a[valueKey] : a.value;
                     const bValue = valueKey ? b[valueKey] : b.value;
-                    return aValue - bValue;
+                    if (!aValue)
+                        return -1;
+                    if (!bValue)
+                        return 1;
+                    return aValue.toLocaleString().localeCompare(bValue.toLocaleString());
                 });
             this.setState({ selectedOptions });
         }

From cacb2d301fd854163e67c679f54b826f59c1b02c Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Wed, 14 Jan 2026 12:04:39 -0800
Subject: [PATCH 12/20] clean

---
 .../src/internal/components/forms/input/SelectInput.tsx     | 6 ++++--
 .../src/internal/components/forms/input/TextChoiceInput.tsx | 1 +
 .../internal/components/search/FilterFacetedSelector.tsx    | 5 +++--
 .../src/internal/renderers/MultiValueRenderer.tsx           | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/components/src/internal/components/forms/input/SelectInput.tsx b/packages/components/src/internal/components/forms/input/SelectInput.tsx
index 306958459b..c7593e64b8 100644
--- a/packages/components/src/internal/components/forms/input/SelectInput.tsx
+++ b/packages/components/src/internal/components/forms/input/SelectInput.tsx
@@ -273,6 +273,7 @@ export interface SelectInputProps {
     valueKey?: string;
     valueRenderer?: any;
     warning?: ReactNode;
+    sortValues?: boolean;
 }
 
 type SelectInputImplProps = FormsyInjectedProps<any> & SelectInputProps;
@@ -317,6 +318,7 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
         showIndicatorSeparator: true,
         tabSelectsValue: false, // Issue 52310
         valueKey: 'value',
+        sortValues: false,
     };
 
     private readonly _id: string;
@@ -468,7 +470,7 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
     };
 
     _setOptionsAndValue(options: any): any {
-        const { autoValue, delimiter, formsy, skipJoinValues, multiple, setValue, valueKey } = this.props;
+        const { sortValues, autoValue, delimiter, formsy, skipJoinValues, multiple, setValue, valueKey } = this.props;
         let selectedOptions;
 
         if (options === undefined || options === null || (Array.isArray(options) && options.length === 0)) {
@@ -478,7 +480,7 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
         }
 
         if (autoValue) {
-            if (Array.isArray(selectedOptions))
+            if (sortValues && Array.isArray(selectedOptions))
                 selectedOptions.sort((a, b) => {
                     const aValue = valueKey ? a[valueKey] : a.value;
                     const bValue = valueKey ? b[valueKey] : b.value;
diff --git a/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx b/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx
index c9a1acd3b7..c7fb045a14 100644
--- a/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx
+++ b/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx
@@ -21,6 +21,7 @@ export class TextChoiceInput extends DisableableInput<Props, DisableableInputSta
                 required={queryColumn.required}
                 {...selectInputProps}
                 multiple={queryColumn.isMultiChoice}
+                sortValues={true}
                 options={options}
                 skipJoinValues={true}
             />
diff --git a/packages/components/src/internal/components/search/FilterFacetedSelector.tsx b/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
index 7bff3b4d5a..10913e1a79 100644
--- a/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
+++ b/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
@@ -1,4 +1,4 @@
-import React, { FC, memo, ReactNode, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { FC, memo, ReactNode, useCallback, useEffect, useMemo, useState } from 'react';
 
 import { Filter, Query } from '@labkey/api';
 
@@ -260,7 +260,8 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
 
             const filterType = resolveFilterType(newActiveFilterType?.value, field);
             let updatedFilterValues = fieldFilters[0]?.getValue();
-            if (updatedFilterValues && multiChoices && !filterType.isMultiValued()) updatedFilterValues = null;
+            const shouldClearUpdatedFilterValues = updatedFilterValues && multiChoices && !filterType.isMultiValued();
+            if (shouldClearUpdatedFilterValues) updatedFilterValues = null;
 
             newFilters = [Filter.create(fieldKey, updatedFilterValues, filterType), null];
 
diff --git a/packages/components/src/internal/renderers/MultiValueRenderer.tsx b/packages/components/src/internal/renderers/MultiValueRenderer.tsx
index 849dbdc809..af4b35953f 100644
--- a/packages/components/src/internal/renderers/MultiValueRenderer.tsx
+++ b/packages/components/src/internal/renderers/MultiValueRenderer.tsx
@@ -33,7 +33,7 @@ export const MultiValueRenderer: FC<MultiValueRendererProps> = memo(({ data, col
     }
 
     let valueArray = data;
-    if (col?.isMultiChoice) {
+    if (col?.isMultiChoice && Map.isMap(data) && data.has('value')) {
         valueArray = data.get('value');
     }
 

From acf9931ff0b6635762210fbdf5eea6e9d3f5e6f3 Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Wed, 14 Jan 2026 12:12:32 -0800
Subject: [PATCH 13/20] clean

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 3c0cd9c5ee..79fa348bea 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.16",
+  "version": "7.13.0-fb-mvtc.17",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.13.0-fb-mvtc.16",
+      "version": "7.13.0-fb-mvtc.17",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index de3b022e85..69b670a6d4 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.16",
+  "version": "7.13.0-fb-mvtc.17",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 84d0be496ddb8a9902392428691c8d979c162208 Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Wed, 14 Jan 2026 14:51:33 -0800
Subject: [PATCH 14/20] bug fixes

---
 .../domainproperties/actions.test.ts          |  5 ++++
 .../components/domainproperties/actions.ts    | 24 +++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/actions.test.ts b/packages/components/src/internal/components/domainproperties/actions.test.ts
index 665497d0bb..e388b21512 100644
--- a/packages/components/src/internal/components/domainproperties/actions.test.ts
+++ b/packages/components/src/internal/components/domainproperties/actions.test.ts
@@ -61,6 +61,7 @@ import {
     FILE_TYPE,
     FLAG_TYPE,
     INTEGER_TYPE,
+    MULTI_CHOICE_TYPE,
     ONTOLOGY_LOOKUP_TYPE,
     PARTICIPANT_TYPE,
     SAMPLE_TYPE,
@@ -371,6 +372,7 @@ describe('domain properties actions', () => {
             allowTextChoiceProperties: true,
             allowSampleSubjectProperties: true,
             allowCalculatedFields: true,
+            allowMultiChoiceProperties: true
         });
         const available = getAvailableTypes(domain);
         expect(available.contains(FLAG_TYPE)).toBeTruthy();
@@ -386,6 +388,7 @@ describe('domain properties actions', () => {
         expect(available.contains(SAMPLE_TYPE)).toBeTruthy();
         expect(available.contains(PARTICIPANT_TYPE)).toBeTruthy();
         expect(available.contains(CALCULATED_TYPE)).toBeFalsy();
+        expect(available.contains(MULTI_CHOICE_TYPE)).toBeTruthy();
     });
 
     test('getAvailableTypes, no optional allowed', () => {
@@ -399,6 +402,7 @@ describe('domain properties actions', () => {
             allowTextChoiceProperties: false,
             allowSampleSubjectProperties: false,
             allowCalculatedFields: false,
+            allowMultiChoiceProperties: false,
         });
         const available = getAvailableTypes(domain);
         expect(available.contains(FLAG_TYPE)).toBeFalsy();
@@ -414,6 +418,7 @@ describe('domain properties actions', () => {
         expect(available.contains(SAMPLE_TYPE)).toBeFalsy();
         expect(available.contains(PARTICIPANT_TYPE)).toBeFalsy();
         expect(available.contains(CALCULATED_TYPE)).toBeFalsy();
+        expect(available.contains(MULTI_CHOICE_TYPE)).toBeFalsy();
     });
 
     test('getAvailableTypes calculated fields, LKSM Starter', () => {
diff --git a/packages/components/src/internal/components/domainproperties/actions.ts b/packages/components/src/internal/components/domainproperties/actions.ts
index 82e59b7a7e..ad087a1925 100644
--- a/packages/components/src/internal/components/domainproperties/actions.ts
+++ b/packages/components/src/internal/components/domainproperties/actions.ts
@@ -859,7 +859,8 @@ export function updateDataType(field: DomainField, value: any): DomainField {
 
     if (propType) {
         const dataType = propType.isLookup() ? field.lookupType : propType;
-
+        const wasTextChoice = field.isTextChoiceField() || field.isMultiChoiceField();
+        const isTextChoice = propType.isTextChoice() || propType.isMultiChoice();
         field = field.merge({
             dataType,
             conceptURI: dataType.conceptURI,
@@ -872,8 +873,8 @@ export function updateDataType(field: DomainField, value: any): DomainField {
             conceptLabelColumn: undefined,
             conceptImportColumn: undefined,
             scannable: undefined,
-            textChoiceValidator: undefined,
-            valueExpression: undefined,
+            textChoiceValidator: isTextChoice ? field.textChoiceValidator: undefined,
+            valueExpression: isTextChoice ? field.valueExpression: undefined,
         }) as DomainField;
 
         if (field.isNew()) {
@@ -886,13 +887,16 @@ export function updateDataType(field: DomainField, value: any): DomainField {
         if (field.isTextChoiceField() || field.isMultiChoiceField()) {
             // when changing a field to a Text Choice, add the default textChoiceValidator and
             // remove/reset all other propertyValidators and other text option settings
-            field = field.merge({
-                textChoiceValidator: DEFAULT_TEXT_CHOICE_VALIDATOR,
-                lookupValidator: undefined,
-                rangeValidators: [],
-                regexValidators: [],
-                scale: MAX_TEXT_LENGTH,
-            }) as DomainField;
+            if (!wasTextChoice) {
+                field = field.merge({
+                    textChoiceValidator: DEFAULT_TEXT_CHOICE_VALIDATOR,
+                    lookupValidator: undefined,
+                    rangeValidators: [],
+                    regexValidators: [],
+                    scale: MAX_TEXT_LENGTH,
+                    valueExpression: undefined,
+                }) as DomainField;
+            }
         } else if (field.isCalculatedField()) {
             field = field.merge({
                 importAliases: undefined,

From 814e11a4e00c430dc0f3f05ec3fd6fed1a1ee90c Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Wed, 14 Jan 2026 14:53:46 -0800
Subject: [PATCH 15/20] bug fixes

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 79fa348bea..d147793275 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.17",
+  "version": "7.13.0-fb-mvtc.18",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.13.0-fb-mvtc.17",
+      "version": "7.13.0-fb-mvtc.18",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 69b670a6d4..c8af122d90 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.17",
+  "version": "7.13.0-fb-mvtc.18",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From e241e0e574067f18d69f00a22aac928f766072dc Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Wed, 14 Jan 2026 19:43:51 -0800
Subject: [PATCH 16/20] fix copy paste, drag fill

---
 .../internal/components/editable/actions.ts   | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/internal/components/editable/actions.ts b/packages/components/src/internal/components/editable/actions.ts
index a244a9edef..69840b134b 100644
--- a/packages/components/src/internal/components/editable/actions.ts
+++ b/packages/components/src/internal/components/editable/actions.ts
@@ -1522,7 +1522,35 @@ async function insertPastedData(
                     );
                     cv = valueDescriptors;
                     msg = message;
-                } else {
+                } else if (col?.isMultiChoice && Utils.isString(val)) {
+                    const parsedValues = parseCsvString(val, ',', true);
+
+                    const unmatched: string[] = [];
+                    let values = [];
+
+                    parsedValues.forEach(v => {
+                        const vt = v.trim();
+                        if (!vt) return;
+
+                        const vl = vt.toLowerCase();
+                        const vd = col.validValues.find(d => d === vl);
+                        values.push({ display: vt, raw: vt });
+
+                        if (vd) return;
+
+                        unmatched.push(vt);
+                    });
+
+                    if (unmatched.length) {
+                        const valueStr = unmatched
+                            .slice(0, 4)
+                            .map(u => '"' + u + '"')
+                            .join(', ');
+                        msg = { message: lookupValidationErrorMessage(valueStr, true) };
+                    }
+                    cv = List(values);
+                }
+                else {
                     const { message, value } = getValidatedEditableGridValue(val, col);
                     let display = value;
 

From 739ea73ba4ebb2c4cb49ea3168b8c23ae7e833b7 Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Wed, 14 Jan 2026 19:48:27 -0800
Subject: [PATCH 17/20] bug fixes

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index d147793275..5fbf4f6501 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.18",
+  "version": "7.13.0-fb-mvtc.19",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.13.0-fb-mvtc.18",
+      "version": "7.13.0-fb-mvtc.19",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index c8af122d90..c4e1aaf973 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.18",
+  "version": "7.13.0-fb-mvtc.19",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From d935f6b62fe5da558301d13e6a0520c9e575dd09 Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Wed, 14 Jan 2026 19:58:49 -0800
Subject: [PATCH 18/20] show advanced settings

---
 .../domainproperties/AdvancedSettings.tsx     | 32 ++++++++++---------
 .../components/domainproperties/DomainRow.tsx |  3 +-
 .../domainproperties/PropDescType.ts          |  4 +--
 .../components/domainproperties/models.tsx    |  4 ---
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/AdvancedSettings.tsx b/packages/components/src/internal/components/domainproperties/AdvancedSettings.tsx
index b5c667c71d..5d58a87092 100644
--- a/packages/components/src/internal/components/domainproperties/AdvancedSettings.tsx
+++ b/packages/components/src/internal/components/domainproperties/AdvancedSettings.tsx
@@ -448,7 +448,7 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                     </div>
                 )}
 
-                {allowUniqueConstraintProperties && !field.isCalculatedField() && (
+                {allowUniqueConstraintProperties && !field.isCalculatedField() && !field.isMultiChoiceField() && (
                     <div className="row">
                         <div className="col-xs-4">
                             <DomainFieldLabel
@@ -543,20 +543,22 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                         </LabelHelpTip>
                     </CheckboxLK>
                 )}
-                <CheckboxLK
-                    checked={recommendedVariable}
-                    id={createFormInputId(DOMAIN_FIELD_RECOMMENDEDVARIABLE, domainIndex, index)}
-                    name={createFormInputName(DOMAIN_FIELD_RECOMMENDEDVARIABLE)}
-                    onChange={this.handleCheckbox}
-                >
-                    Make this field a recommended variable
-                    <LabelHelpTip title="Recommended Variable">
-                        <div>
-                            Indicates that this is an important variable. These variables will be displayed as
-                            recommended when creating new charts or reports.
-                        </div>
-                    </LabelHelpTip>
-                </CheckboxLK>
+                {!field.isMultiChoiceField() &&
+                    <CheckboxLK
+                        checked={recommendedVariable}
+                        id={createFormInputId(DOMAIN_FIELD_RECOMMENDEDVARIABLE, domainIndex, index)}
+                        name={createFormInputName(DOMAIN_FIELD_RECOMMENDEDVARIABLE)}
+                        onChange={this.handleCheckbox}
+                    >
+                        Make this field a recommended variable
+                        <LabelHelpTip title="Recommended Variable">
+                            <div>
+                                Indicates that this is an important variable. These variables will be displayed as
+                                recommended when creating new charts or reports.
+                            </div>
+                        </LabelHelpTip>
+                    </CheckboxLK>
+                }
                 {PropDescType.isMvEnableable(field.dataType.rangeURI) && !field.isCalculatedField() && !isApp() && (
                     <CheckboxLK
                         checked={mvEnabled}
diff --git a/packages/components/src/internal/components/domainproperties/DomainRow.tsx b/packages/components/src/internal/components/domainproperties/DomainRow.tsx
index ef82047d2f..0dfe7f4bf4 100644
--- a/packages/components/src/internal/components/domainproperties/DomainRow.tsx
+++ b/packages/components/src/internal/components/domainproperties/DomainRow.tsx
@@ -529,8 +529,7 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
                                     >
                                         {expanded &&
                                             !isFieldFullyLocked(field.lockType) &&
-                                            !appPropertiesOnly &&
-                                            DomainField.allowAdvancedSettings(field) && (
+                                            !appPropertiesOnly && (
                                                 <button
                                                     className="domain-row-button btn btn-default"
                                                     disabled={isFieldFullyLocked(field.lockType)}
diff --git a/packages/components/src/internal/components/domainproperties/PropDescType.ts b/packages/components/src/internal/components/domainproperties/PropDescType.ts
index 36cc817e17..9b44e5ba44 100644
--- a/packages/components/src/internal/components/domainproperties/PropDescType.ts
+++ b/packages/components/src/internal/components/domainproperties/PropDescType.ts
@@ -134,7 +134,7 @@ export class PropDescType
     }
 
     static isMeasure(rangeURI: string): boolean {
-        return rangeURI !== ATTACHMENT_RANGE_URI && rangeURI !== FILELINK_RANGE_URI;
+        return rangeURI !== ATTACHMENT_RANGE_URI && rangeURI !== FILELINK_RANGE_URI && rangeURI !== MULTI_CHOICE_RANGE_URI;
     }
 
     static isDimension(rangeURI: string): boolean {
@@ -147,7 +147,7 @@ export class PropDescType
     }
 
     static isMvEnableable(rangeURI: string): boolean {
-        return rangeURI !== ATTACHMENT_RANGE_URI && rangeURI !== FILELINK_RANGE_URI && rangeURI !== MULTILINE_RANGE_URI;
+        return rangeURI !== ATTACHMENT_RANGE_URI && rangeURI !== FILELINK_RANGE_URI && rangeURI !== MULTILINE_RANGE_URI && rangeURI !== MULTI_CHOICE_RANGE_URI;
     }
 
     static isAutoIncrement(dataType: PropDescType): boolean {
diff --git a/packages/components/src/internal/components/domainproperties/models.tsx b/packages/components/src/internal/components/domainproperties/models.tsx
index 7fd7719da2..8c982ac494 100644
--- a/packages/components/src/internal/components/domainproperties/models.tsx
+++ b/packages/components/src/internal/components/domainproperties/models.tsx
@@ -1419,10 +1419,6 @@ export class DomainField
         return !field.isMultiChoiceField();
     }
 
-    static allowAdvancedSettings(field: DomainField): boolean {
-        return !field.isMultiChoiceField();
-    }
-
     static hasRegExValidation(field: DomainField): boolean {
         return (
             field.dataType.isString() &&

From 586184758c91b9a114fe71ac53cea0f9ef029020 Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Wed, 14 Jan 2026 20:01:19 -0800
Subject: [PATCH 19/20] show advanced settings

---
 packages/components/package-lock.json | 4 ++--
 packages/components/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 5fbf4f6501..405a548141 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.19",
+  "version": "7.13.0-fb-mvtc.20",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.13.0-fb-mvtc.19",
+      "version": "7.13.0-fb-mvtc.20",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index c4e1aaf973..dd4458ad13 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.13.0-fb-mvtc.19",
+  "version": "7.13.0-fb-mvtc.20",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

From 67efa7c26ff69f434750e907371a0b9599d75e6f Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Thu, 15 Jan 2026 17:58:48 -0800
Subject: [PATCH 20/20] code review changes

---
 .../components/domainproperties/DomainRow.tsx |  8 +--
 .../components/domainproperties/actions.ts    | 20 ++++----
 .../components/domainproperties/models.tsx    |  3 +-
 .../internal/components/editable/actions.ts   |  2 +-
 .../components/forms/input/SelectInput.tsx    | 17 ++-----
 .../search/FilterFacetedSelector.tsx          | 46 ++++++++---------
 .../components/search/QueryFilterPanel.tsx    | 49 ++++++++++++-------
 .../internal/renderers/MultiValueRenderer.tsx |  2 +-
 8 files changed, 73 insertions(+), 74 deletions(-)

diff --git a/packages/components/src/internal/components/domainproperties/DomainRow.tsx b/packages/components/src/internal/components/domainproperties/DomainRow.tsx
index 0dfe7f4bf4..ec539e292e 100644
--- a/packages/components/src/internal/components/domainproperties/DomainRow.tsx
+++ b/packages/components/src/internal/components/domainproperties/DomainRow.tsx
@@ -385,6 +385,10 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
         const draggableId = createFormInputId('domaindrag', domainIndex, index);
         // Use undefined instead of false to allow for css to handle the highlight color for hover
         const highlighted = dragging ? true : isDragDisabled ? false : undefined;
+        const showAdvancedSettingsButton =
+            expanded &&
+            !isFieldFullyLocked(field.lockType) &&
+            !appPropertiesOnly;
 
         return (
             <Draggable
@@ -527,9 +531,7 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
                                     <div
                                         className={expanded ? 'domain-field-buttons-expanded' : 'domain-field-buttons'}
                                     >
-                                        {expanded &&
-                                            !isFieldFullyLocked(field.lockType) &&
-                                            !appPropertiesOnly && (
+                                        {showAdvancedSettingsButton && (
                                                 <button
                                                     className="domain-row-button btn btn-default"
                                                     disabled={isFieldFullyLocked(field.lockType)}
diff --git a/packages/components/src/internal/components/domainproperties/actions.ts b/packages/components/src/internal/components/domainproperties/actions.ts
index ad087a1925..b974efa879 100644
--- a/packages/components/src/internal/components/domainproperties/actions.ts
+++ b/packages/components/src/internal/components/domainproperties/actions.ts
@@ -884,19 +884,17 @@ export function updateDataType(field: DomainField, value: any): DomainField {
             field = field.merge(DomainField.resolveLookupConfig(field, dataType)) as DomainField;
         }
 
-        if (field.isTextChoiceField() || field.isMultiChoiceField()) {
+        if ((field.isTextChoiceField() || field.isMultiChoiceField()) && !wasTextChoice) {
             // when changing a field to a Text Choice, add the default textChoiceValidator and
             // remove/reset all other propertyValidators and other text option settings
-            if (!wasTextChoice) {
-                field = field.merge({
-                    textChoiceValidator: DEFAULT_TEXT_CHOICE_VALIDATOR,
-                    lookupValidator: undefined,
-                    rangeValidators: [],
-                    regexValidators: [],
-                    scale: MAX_TEXT_LENGTH,
-                    valueExpression: undefined,
-                }) as DomainField;
-            }
+            field = field.merge({
+                textChoiceValidator: DEFAULT_TEXT_CHOICE_VALIDATOR,
+                lookupValidator: undefined,
+                rangeValidators: [],
+                regexValidators: [],
+                scale: MAX_TEXT_LENGTH,
+                valueExpression: undefined,
+            }) as DomainField;
         } else if (field.isCalculatedField()) {
             field = field.merge({
                 importAliases: undefined,
diff --git a/packages/components/src/internal/components/domainproperties/models.tsx b/packages/components/src/internal/components/domainproperties/models.tsx
index 8c982ac494..4b3b2f31b1 100644
--- a/packages/components/src/internal/components/domainproperties/models.tsx
+++ b/packages/components/src/internal/components/domainproperties/models.tsx
@@ -811,10 +811,11 @@ export class PropertyValidator
                 if (rawPropertyValidator[i].type === type) {
                     const expressionStr = rawPropertyValidator[i].expression;
                     const hasExpressionStr = expressionStr !== undefined && expressionStr !== null;
+                    const isChoice = type === 'TextChoice' || type === 'MultiChoice';
 
                     // if we are loading a textChoiceValidator from JSON, we need to set the properties.validValues
                     if (
-                        (type === 'TextChoice' || type === 'MultiChoice') &&
+                        isChoice &&
                         !rawPropertyValidator[i]?.properties?.validValues
                     ) {
                         rawPropertyValidator[i].properties.validValues =
diff --git a/packages/components/src/internal/components/editable/actions.ts b/packages/components/src/internal/components/editable/actions.ts
index 69840b134b..f720c0baac 100644
--- a/packages/components/src/internal/components/editable/actions.ts
+++ b/packages/components/src/internal/components/editable/actions.ts
@@ -480,7 +480,7 @@ interface CellData {
 }
 
 async function convertRowToEditorModelData(
-    data: [] | boolean | number | string,
+    data: boolean | number | string | string[],
     col: QueryColumn,
     containerPath: string
 ): Promise<CellData> {
diff --git a/packages/components/src/internal/components/forms/input/SelectInput.tsx b/packages/components/src/internal/components/forms/input/SelectInput.tsx
index c7593e64b8..5d4f340248 100644
--- a/packages/components/src/internal/components/forms/input/SelectInput.tsx
+++ b/packages/components/src/internal/components/forms/input/SelectInput.tsx
@@ -32,6 +32,7 @@ import {
 } from '../constants';
 import { QueryColumn } from '../../../../public/QueryColumn';
 import { generateId } from '../../../util/utils';
+import {naturalSortByProperty} from "../../../../public/sort";
 
 const WARN_COLOR = '#8A6D3B';
 const WARN_BG_COLOR = '#FCF8E3';
@@ -481,15 +482,8 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
 
         if (autoValue) {
             if (sortValues && Array.isArray(selectedOptions))
-                selectedOptions.sort((a, b) => {
-                    const aValue = valueKey ? a[valueKey] : a.value;
-                    const bValue = valueKey ? b[valueKey] : b.value;
-                    if (!aValue)
-                        return -1;
-                    if (!bValue)
-                        return 1;
-                    return aValue.toLocaleString().localeCompare(bValue.toLocaleString());
-                });
+                selectedOptions.sort(naturalSortByProperty(valueKey ?? 'value'));
+
             this.setState({ selectedOptions });
         }
 
@@ -500,10 +494,7 @@ export class SelectInputImpl extends Component<SelectInputImplProps, State> {
         } else if (selectedOptions !== undefined) {
             if (multiple) {
                 if (Array.isArray(selectedOptions)) {
-                    formValue = selectedOptions.reduce((arr, option) => {
-                        arr.push(valueKey ? option[valueKey] : option.value);
-                        return arr;
-                    }, []).sort();
+                    formValue = selectedOptions.map(option => (valueKey ? option[valueKey] : option.value));
 
                     if (!skipJoinValues) {
                         // consider removing altogether?
diff --git a/packages/components/src/internal/components/search/FilterFacetedSelector.tsx b/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
index 10913e1a79..73d16e3a22 100644
--- a/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
+++ b/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
@@ -35,7 +35,7 @@ interface Props {
     field?: QueryColumn;
     fieldFilters: Filter.IFilter[];
     fieldKey: string;
-    onFieldFilterUpdate?: (newFilters: Filter.IFilter[], index) => void;
+    onFieldFilterUpdate?: (newFilter: Filter.IFilter[]) => void;
     selectDistinctOptions: Query.SelectDistinctOptions;
     // show search box if number of unique values > N
     showSearchLength?: number;
@@ -82,9 +82,7 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
         // eslint-disable-next-line react-hooks/exhaustive-deps -- only on fieldKey change, reload selection values
     }, [fieldKey]);
 
-    const multiChoices = useMemo(() => {
-        return field?.isMultiChoice ? field.validValues : null;
-    }, [field]);
+    const multiChoices = field?.isMultiChoice ? field.validValues : null;
 
     const filterOptions = useMemo(() => {
         return field?.isMultiChoice ? getFilterOptionsForType(field, false) : null;
@@ -100,11 +98,8 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
 
                 let allValues: any[] = [];
                 if (!multiChoices) {
-                    const filterArray = searchStr
-                        ? [Filter.create(fieldKey, searchStr, Filter.Types.CONTAINS)].concat(
-                              selectDistinctOptions?.filterArray
-                          )
-                        : selectDistinctOptions?.filterArray;
+                    const filterArray = selectDistinctOptions?.filterArray ?? [];
+                    if (searchStr) filterArray.push(Filter.create(fieldKey, searchStr, Filter.Types.CONTAINS));
 
                     // if multi value, get all options
                     const result = await api.query.selectDistinctRows({
@@ -218,16 +213,18 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
         (value: string, checked: boolean, uncheckOthers?: boolean) => {
             if (disabled) return;
 
+            let oldFilter = fieldFilters?.[0]; // choose values applies only to the first filter
+            if (!oldFilter && multiChoices) oldFilter = Filter.create(fieldKey, [], Filter.Types.ARRAY_CONTAINS_ALL);
+
             const newFilter = getUpdatedChooseValuesFilter(
                 allShown ? fieldDistinctValues : undefined,
                 fieldKey,
                 value,
                 checked,
-                fieldFilters?.[0] ??
-                    (multiChoices ? Filter.create(fieldKey, [], Filter.Types.ARRAY_CONTAINS_ALL) : null), // choose values applies only to the first filter
+                oldFilter,
                 uncheckOthers
             );
-            onFieldFilterUpdate([newFilter], 0);
+            onFieldFilterUpdate([newFilter]);
         },
         [disabled, allShown, fieldDistinctValues, fieldKey, fieldFilters, onFieldFilterUpdate, multiChoices]
     );
@@ -253,19 +250,18 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
     const onUpdateFilterType = useCallback(
         (_, filterUrlSuffix: string) => {
             let newFilters = [];
-            if (!filterUrlSuffix) return newFilters;
-
-            const newActiveFilterType = filterOptions?.find(option => option.value === filterUrlSuffix);
-            if (!newActiveFilterType) return newFilters;
-
-            const filterType = resolveFilterType(newActiveFilterType?.value, field);
-            let updatedFilterValues = fieldFilters[0]?.getValue();
-            const shouldClearUpdatedFilterValues = updatedFilterValues && multiChoices && !filterType.isMultiValued();
-            if (shouldClearUpdatedFilterValues) updatedFilterValues = null;
-
-            newFilters = [Filter.create(fieldKey, updatedFilterValues, filterType), null];
+            if (filterUrlSuffix) {
+                const newActiveFilterType = filterOptions.find(option => option.value === filterUrlSuffix);
+                if (newActiveFilterType) {
+                    const filterType = resolveFilterType(newActiveFilterType?.value, field);
+                    let updatedFilterValues = fieldFilters[0]?.getValue();
+                    const shouldClearUpdatedFilterValues = updatedFilterValues && multiChoices && !filterType.isMultiValued();
+                    if (shouldClearUpdatedFilterValues) updatedFilterValues = null;
+                    newFilters = [Filter.create(fieldKey, updatedFilterValues, filterType)];
+                }
+            }
 
-            onFieldFilterUpdate(newFilters, 0);
+            onFieldFilterUpdate(newFilters);
         },
         [onFieldFilterUpdate, filterOptions, field, fieldFilters, fieldKey, multiChoices]
     );
@@ -287,7 +283,7 @@ export const FilterFacetedSelector: FC<Props> = memo(props => {
                         options={filterOptions}
                         placeholder="Select a filter type..."
                         required={true}
-                        value={fieldFilters?.[0]?.getFilterType()?.getURLSuffix() || 'arraycontainsall'}
+                        value={fieldFilters?.[0]?.getFilterType().getURLSuffix() || 'arraycontainsall'}
                     />
                 )}
                 {(fieldDistinctValues?.length > showSearchLength || searchStr) && (
diff --git a/packages/components/src/internal/components/search/QueryFilterPanel.tsx b/packages/components/src/internal/components/search/QueryFilterPanel.tsx
index 9f10c359d7..4591cba5ab 100644
--- a/packages/components/src/internal/components/search/QueryFilterPanel.tsx
+++ b/packages/components/src/internal/components/search/QueryFilterPanel.tsx
@@ -238,6 +238,30 @@ export const QueryFilterPanel: FC<Props> = memo(props => {
         },
         [api, metricFeatureArea]
     );
+
+    const fieldFilters = useMemo(() => {
+        return currentFieldFilters?.map(filter => filter.filter);
+    }, [currentFieldFilters]);
+
+    const includeAllAncestorFilter = useMemo(() => {
+        return isAncestor && activeField?.fieldKey.toLowerCase() === 'name';
+    }, [isAncestor, activeField])
+
+    const onFieldFilterUpdate = useCallback((newFilters: Filter.IFilter[], index : number = 0) => {
+        onFilterUpdate(activeField, newFilters, index)
+    }, [onFilterUpdate, activeField])
+
+    const facetSelectDistinctOptions = useMemo(() => {
+        return {
+            ...selectDistinctOptions,
+            column: activeFieldKey,
+            schemaName: queryInfo.schemaName,
+            queryName,
+            viewName,
+            filterArray: fieldDistinctValueFilters,
+        }
+    }, [selectDistinctOptions, activeFieldKey, queryInfo, fieldDistinctValueFilters, queryName, viewName]);
+
     const fieldsClassName = `col-xs-${fullWidth ? 12 : 6} col-sm-${
         fullWidth ? 4 : 3
     } field-modal__col filter-modal__col_fields`;
@@ -326,14 +350,10 @@ export const QueryFilterPanel: FC<Props> = memo(props => {
                                             allowRelativeDateFilter={allowRelativeDateFilter}
                                             disabled={hasNotInQueryFilter}
                                             field={activeField}
-                                            fieldFilters={currentFieldFilters?.map(filter => filter.filter)}
-                                            includeAllAncestorFilter={
-                                                isAncestor && activeField?.fieldKey.toLowerCase() === 'name'
-                                            }
+                                            fieldFilters={fieldFilters}
+                                            includeAllAncestorFilter={includeAllAncestorFilter}
                                             key={activeFieldKey}
-                                            onFieldFilterUpdate={(newFilters, index) =>
-                                                onFilterUpdate(activeField, newFilters, index)
-                                            }
+                                            onFieldFilterUpdate={onFieldFilterUpdate}
                                         />
                                     )}
                                 </Tab>
@@ -347,20 +367,11 @@ export const QueryFilterPanel: FC<Props> = memo(props => {
                                         canBeBlank={!activeField?.required && !activeField.nameExpression}
                                         disabled={hasNotInQueryFilter}
                                         field={activeField}
-                                        fieldFilters={currentFieldFilters?.map(filter => filter.filter)}
+                                        fieldFilters={fieldFilters}
                                         fieldKey={activeFieldKey}
                                         key={activeFieldKey}
-                                        onFieldFilterUpdate={(newFilters, index) =>
-                                            onFilterUpdate(activeField, newFilters, index)
-                                        }
-                                        selectDistinctOptions={{
-                                            ...selectDistinctOptions,
-                                            column: activeFieldKey,
-                                            schemaName: queryInfo.schemaName,
-                                            queryName,
-                                            viewName,
-                                            filterArray: fieldDistinctValueFilters,
-                                        }}
+                                        onFieldFilterUpdate={onFieldFilterUpdate}
+                                        selectDistinctOptions={facetSelectDistinctOptions}
                                     />
                                 </Tab>
                             )}
diff --git a/packages/components/src/internal/renderers/MultiValueRenderer.tsx b/packages/components/src/internal/renderers/MultiValueRenderer.tsx
index af4b35953f..28e04aed43 100644
--- a/packages/components/src/internal/renderers/MultiValueRenderer.tsx
+++ b/packages/components/src/internal/renderers/MultiValueRenderer.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React, { FC, Fragment, memo, ReactNode } from 'react';
+import React, { FC, memo, ReactNode } from 'react';
 import { List, Map } from 'immutable';
 import { QueryColumn } from '../../public/QueryColumn';
 import { FileColumnRenderer } from './FileColumnRenderer';