From 02add6e3ff6fab17cb55bfa6a5214d2653ae1bfd Mon Sep 17 00:00:00 2001
From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com>
Date: Fri, 6 Nov 2020 16:14:58 -0500
Subject: [PATCH] Fix issue where existing multiCombo field values wouldn't
 appear (close #8155)

---
 modules/ui/fields/combo.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js
index 8ff6d753a..59458c66c 100644
--- a/modules/ui/fields/combo.js
+++ b/modules/ui/fields/combo.js
@@ -432,11 +432,13 @@ export function uiFieldCombo(field, context) {
             if (_isMulti) {
                 // Build _multiData array containing keys already set..
                 for (var k in tags) {
-                    if ((field.key && k.indexOf(field.key) !== 0) || field.keys.indexOf(k) === -1) continue;
+                    if (field.key && k.indexOf(field.key) !== 0) continue;
+                    if (!field.key && field.keys.indexOf(k) === -1) continue;
+
                     var v = tags[k];
                     if (!v || (typeof v === 'string' && v.toLowerCase() === 'no')) continue;
 
-                    var suffix = field.key ? k.substring(field.key.length) : k;
+                    var suffix = field.key ? k.substr(field.key.length) : k;
                     _multiData.push({
                         key: k,
                         value: displayValue(suffix),