From 4d94fa57a63d3b8b066cc2de5c3fd171fcbbf970 Mon Sep 17 00:00:00 2001
From: Josh Johnson <josh@joshuajohnson.co.uk>
Date: Thu, 3 Aug 2017 10:58:17 +0100
Subject: [PATCH] Resolve search issue

---
 assets/scripts/src/choices.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/assets/scripts/src/choices.js b/assets/scripts/src/choices.js
index 3afa6c2..5442825 100644
--- a/assets/scripts/src/choices.js
+++ b/assets/scripts/src/choices.js
@@ -388,14 +388,16 @@ class Choices {
     let choiceLimit = rendererableChoices.length;
 
     if (this.isSearching) {
-      choiceLimit = Math.min(searchResultLimit, rendererableChoices.length - 1);
+      choiceLimit = searchResultLimit;
     } else if (renderChoiceLimit > 0 && !withinGroup) {
-      choiceLimit = Math.min(renderChoiceLimit, rendererableChoices.length - 1);
+      choiceLimit = renderChoiceLimit;
     }
 
     // Add each choice to dropdown within range
     for (let i = 0; i < choiceLimit; i++) {
-      appendChoice(rendererableChoices[i]);
+      if (rendererableChoices[i]) {
+        appendChoice(rendererableChoices[i]);
+      }
     };
 
     return choicesFragment;