From 6bd075d04f16bdf957dec3fd062b0cc55b6770d5 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Fri, 23 Aug 2019 10:05:59 -0500
Subject: [PATCH] Account for `keys` and fields with null `key` in "add field"
 search terms (re: #5763)

---
 modules/ui/form_fields.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/ui/form_fields.js b/modules/ui/form_fields.js
index 985ecfe19..d8a1d9018 100644
--- a/modules/ui/form_fields.js
+++ b/modules/ui/form_fields.js
@@ -54,11 +54,16 @@ export function uiFormFields(context) {
         var moreFields = notShown.map(function(field) {
             var label = field.label();
             titles.push(label);
+            
+            var terms = field.terms();
+            if (field.key) terms.push(field.key);
+            if (field.keys) terms = terms.concat(field.keys);
+
             return {
                 title: label,
                 value: label,
                 field: field,
-                terms: field.terms().concat(field.key)
+                terms: terms
             };
         });