diff --git a/assets/scripts/src/choices.js b/assets/scripts/src/choices.js
index 5b69f4c..342278d 100644
--- a/assets/scripts/src/choices.js
+++ b/assets/scripts/src/choices.js
@@ -1420,11 +1420,11 @@ class Choices {
               result.placeholder
             );
           }
-
-          if (this.isSelectOneElement) {
-            this._selectPlaceholderChoice();
-          }
         });
+
+        if (this.isSelectOneElement) {
+          this._selectPlaceholderChoice();
+        }
       } else {
         // No results, remove loading state
         this._handleLoadingState(false);
@@ -2792,11 +2792,12 @@ class Choices {
             // If there is a selected choice already or the choice is not
             // the first in the array, add each choice normally
             // Otherwise pre-select the first choice in the array
+            const shouldPreselect = (hasSelectedChoice || (!hasSelectedChoice && index > 0));
             this._addChoice(
               choice.value,
               choice.label,
-              (hasSelectedChoice || index > 0) ? choice.selected : true,
-              (hasSelectedChoice || index > 0) ? choice.disabled : false,
+              (shouldPreselect) ? choice.selected : true,
+              (shouldPreselect) ? choice.disabled : false,
               undefined,
               choice.customProperties,
               choice.placeholder
diff --git a/index.html b/index.html
index 1c3be52..a9f154d 100644
--- a/index.html
+++ b/index.html
@@ -53,7 +53,7 @@
         </p>
       <hr>
 
-<!--       <h2>Text inputs</h2>
+      <h2>Text inputs</h2>
       <label for="choices-text-remove-button">Limited to 5 values with remove button</label>
       <input class="form-control" id="choices-text-remove-button" type="text" value="preset-1,preset-2" placeholder="Enter something">
 
@@ -165,10 +165,14 @@
       <p><small>If the following two examples do not load, the Discogs rate limit has probably been reached. Try again later!</small></p>
 
       <label for="choices-single-remote-fetch">Options from remote source (Fetch API)</label>
-      <select class="form-control" name="choices-single-remote-fetch" id="choices-single-remote-fetch" placeholder="Pick an Arctic Monkeys record"></select>
+      <select class="form-control" name="choices-single-remote-fetch" id="choices-single-remote-fetch">
+        <option placeholder>Pick an Arctic Monkeys' record</option>
+      </select>
 
       <label for="choices-single-remove-xhr">Options from remote source (XHR) &amp; remove button</label>
-      <select class="form-control" name="choices-single-remove-xhr" id="choices-single-remove-xhr" placeholder="Pick a Smiths record"></select>
+      <select class="form-control" name="choices-single-remove-xhr" id="choices-single-remove-xhr">
+        <option placeholder>Pick a Smiths' record</option>
+      </select>
 
       <label for="choices-single-groups">Option groups</label>
       <select class="form-control" data-trigger name="choices-single-groups" id="choices-single-groups" placeholder="This is a placeholder">
@@ -272,273 +276,259 @@
         <option value="Manhattan">Manhattan</option>
         <option value="Queens">Queens</option>
         <option value="Staten Island">Staten Island</option>
-      </select> -->
-
-      <select class="form-control" name="test" id="test" placeholder="Choose a borough">
-        <option selected placeholder>Placeholder</option>
-        <option value="The Bronx">The Bronx</option>
-        <option value="Brooklyn">Brooklyn</option>
-        <option value="Manhattan">Manhattan</option>
-        <option value="Queens">Queens</option>
-        <option value="Staten Island">Staten Island</option>
       </select>
     </div>
   </div>
   <script>
-    document.addEventListener('DOMContentLoaded', function () {
-      var test = new Choices('.form-control', {
-        removeItemButton: true
+    document.addEventListener('DOMContentLoaded', function() {
+      var textRemove = new Choices(document.getElementById('choices-text-remove-button'), {
+        delimiter: ',',
+        editItems: true,
+        maxItemCount: 5,
+        removeItemButton: true,
       });
 
-      // var textRemove = new Choices(document.getElementById('choices-text-remove-button'), {
-      //   delimiter: ',',
-      //   editItems: true,
-      //   maxItemCount: 5,
-      //   removeItemButton: true,
-      // });
+      var textUniqueVals = new Choices('#choices-text-unique-values', {
+        paste: false,
+        duplicateItems: false,
+        editItems: true,
+      });
 
-      // var textUniqueVals = new Choices('#choices-text-unique-values', {
-      //   paste: false,
-      //   duplicateItems: false,
-      //   editItems: true,
-      // });
+      var texti18n = new Choices('#choices-text-i18n', {
+        paste: false,
+        duplicateItems: false,
+        editItems: true,
+        maxItemCount: 5,
+        addItemText: function(value) {
+          return 'Appuyez sur Entrée pour ajouter <b>"' + String(value) + '"</b>';
+        },
+        maxItemText: function(maxItemCount) {
+          return String(maxItemCount) + 'valeurs peuvent être ajoutées';
+        },
+        uniqueItemText: 'Cette valeur est déjà présente',
+      });
 
-      // var texti18n = new Choices('#choices-text-i18n', {
-      //   paste: false,
-      //   duplicateItems: false,
-      //   editItems: true,
-      //   maxItemCount: 5,
-      //   addItemText: function (value) {
-      //     return 'Appuyez sur Entrée pour ajouter <b>"' + String(value) + '"</b>';
-      //   },
-      //   maxItemText: function (maxItemCount) {
-      //     return String(maxItemCount) + 'valeurs peuvent être ajoutées';
-      //   },
-      //   uniqueItemText: 'Cette valeur est déjà présente',
-      // });
+      var textEmailFilter = new Choices('#choices-text-email-filter', {
+        editItems: true,
+        regexFilter: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
+      }).setValue(['joe@bloggs.com']);
 
-      // var textEmailFilter = new Choices('#choices-text-email-filter', {
-      //   editItems: true,
-      //   regexFilter: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
-      // }).setValue(['joe@bloggs.com']);
+      var textDisabled = new Choices('#choices-text-disabled', {
+        addItems: false,
+        removeItems: false,
+      }).disable();
 
-      // var textDisabled = new Choices('#choices-text-disabled', {
-      //   addItems: false,
-      //   removeItems: false,
-      // }).disable();
+      var textPrependAppendVal = new Choices('#choices-text-prepend-append-value', {
+        prependValue: 'item-',
+        appendValue: '-' + Date.now(),
+      }).removeActiveItems();
 
-      // var textPrependAppendVal = new Choices('#choices-text-prepend-append-value', {
-      //   prependValue: 'item-',
-      //   appendValue: '-' + Date.now(),
-      // }).removeActiveItems();
+      var textPresetVal = new Choices('#choices-text-preset-values', {
+        items: ['Josh Johnson', {
+          value: 'joe@bloggs.co.uk',
+          label: 'Joe Bloggs',
+          customProperties: {
+            description: 'Joe Blogg is such a generic name'
+          }
+        }],
+      });
 
-      // var textPresetVal = new Choices('#choices-text-preset-values', {
-      //   items: ['Josh Johnson', {
-      //     value: 'joe@bloggs.co.uk',
-      //     label: 'Joe Bloggs',
-      //     customProperties: {
-      //       description: 'Joe Blogg is such a generic name'
-      //     }
-      //   }],
-      // });
+      var multipleDefault = new Choices(document.getElementById('choices-multiple-groups'));
 
-      // var multipleDefault = new Choices(document.getElementById('choices-multiple-groups'));
+      var multipleFetch = new Choices('#choices-multiple-remote-fetch', {
+        placeholder: true,
+        placeholderValue: 'Pick an Strokes record',
+        maxItemCount: 5,
+      }).ajax(function(callback) {
+        fetch('https://api.discogs.com/artists/55980/releases?token=QBRmstCkwXEvCjTclCpumbtNwvVkEzGAdELXyRyW')
+          .then(function(response) {
+            response.json().then(function(data) {
+              callback(data.releases, 'title', 'title');
+            });
+          })
+          .catch(function(error) {
+            console.error(error);
+          });
+      });
 
-      // var multipleFetch = new Choices('#choices-multiple-remote-fetch', {
-      //   placeholder: true,
-      //   placeholderValue: 'Pick an Strokes record',
-      //   maxItemCount: 5,
-      // }).ajax(function (callback) {
-      //   fetch('https://api.discogs.com/artists/55980/releases?token=QBRmstCkwXEvCjTclCpumbtNwvVkEzGAdELXyRyW')
-      //     .then(function (response) {
-      //       response.json().then(function (data) {
-      //         callback(data.releases, 'title', 'title');
-      //       });
-      //     })
-      //     .catch(function (error) {
-      //       console.error(error);
-      //     });
-      // });
+      var multipleCancelButton = new Choices('#choices-multiple-remove-button', {
+        removeItemButton: true,
+      });
 
-      // var multipleCancelButton = new Choices('#choices-multiple-remove-button', {
-      //   removeItemButton: true,
-      // });
+      /* Use label on event */
+      var choicesSelect = new Choices('#choices-multiple-labels', {
+        removeItemButton: true,
+        choices: [
+          { value: 'One', label: 'Label One' },
+          { value: 'Two', label: 'Label Two', disabled: true },
+          { value: 'Three', label: 'Label Three' },
+        ],
+      }).setChoices([
+        { value: 'Four', label: 'Label Four', disabled: true },
+        { value: 'Five', label: 'Label Five' },
+        { value: 'Six', label: 'Label Six', selected: true },
+      ], 'value', 'label', false);
 
-      // /* Use label on event */
-      // var choicesSelect = new Choices('#choices-multiple-labels', {
-      //   removeItemButton: true,
-      //   choices: [
-      //     { value: 'One', label: 'Label One' },
-      //     { value: 'Two', label: 'Label Two', disabled: true },
-      //     { value: 'Three', label: 'Label Three' },
-      //   ],
-      // }).setChoices([
-      //   { value: 'Four', label: 'Label Four', disabled: true },
-      //   { value: 'Five', label: 'Label Five' },
-      //   { value: 'Six', label: 'Label Six', selected: true },
-      // ], 'value', 'label', false);
+      choicesSelect.passedElement.addEventListener('addItem', function(event) {
+        document.getElementById('message').innerHTML = 'You just added "' + event.detail.label + '"';
+      });
 
-      // choicesSelect.passedElement.addEventListener('addItem', function (event) {
-      //   document.getElementById('message').innerHTML = 'You just added "' + event.detail.label + '"';
-      // });
+      choicesSelect.passedElement.addEventListener('removeItem', function(event) {
+        document.getElementById('message').innerHTML = 'You just removed "' + event.detail.label + '"';
+      });
 
-      // choicesSelect.passedElement.addEventListener('removeItem', function (event) {
-      //   document.getElementById('message').innerHTML = 'You just removed "' + event.detail.label + '"';
-      // });
+      var singleFetch = new Choices('#choices-single-remote-fetch', {
+        searchPlaceholderValue: 'Search for an Arctic Monkeys record',
+      }).ajax(function(callback) {
+        fetch('https://api.discogs.com/artists/391170/releases?token=QBRmstCkwXEvCjTclCpumbtNwvVkEzGAdELXyRyW')
+          .then(function(response) {
+            response.json().then(function(data) {
+              callback(data.releases, 'title', 'title');
+              singleFetch.setValueByChoice('Fake Tales Of San Francisco');
+            });
+          })
+          .catch(function(error) {
+            console.error(error);
+          });
+      });
 
-      // var singleFetch = new Choices('#choices-single-remote-fetch', {
-      //   placeholder: true,
-      //   placeholderValue: 'Pick an Arctic Monkeys record',
-      //   searchPlaceholderValue: 'Search for an Arctic Monkeys record',
-      // }).ajax(function (callback) {
-      //   fetch('https://api.discogs.com/artists/391170/releases?token=QBRmstCkwXEvCjTclCpumbtNwvVkEzGAdELXyRyW')
-      //     .then(function (response) {
-      //       response.json().then(function (data) {
-      //         callback(data.releases, 'title', 'title');
-      //         singleFetch.setValueByChoice('Fake Tales Of San Francisco');
-      //       });
-      //     })
-      //     .catch(function (error) {
-      //       console.error(error);
-      //     });
-      // });
+      var singleXhrRemove = new Choices('#choices-single-remove-xhr', {
+        removeItemButton: true,
+        searchPlaceholderValue: 'Search for a Smiths\' record'
+      }).ajax(function(callback) {
+        var request = new XMLHttpRequest();
+        request.open('get', 'https://api.discogs.com/artists/83080/releases?token=QBRmstCkwXEvCjTclCpumbtNwvVkEzGAdELXyRyW', true);
+        request.onreadystatechange = function() {
+          var status;
+          var data;
+          if (request.readyState === 4) {
+            status = request.status;
+            if (status === 200) {
+              data = JSON.parse(request.responseText);
+              callback(data.releases, 'title', 'title');
+              singleXhrRemove.setValueByChoice('How Soon Is Now?');
+            } else {
+              console.error(status);
+            }
+          }
+        }
+        request.send();
+      });
 
-      // var singleXhrRemove = new Choices('#choices-single-remove-xhr', {
-      //   removeItemButton: true,
-      // }).ajax(function (callback) {
-      //   var request = new XMLHttpRequest();
-      //   request.open('get', 'https://api.discogs.com/artists/83080/releases?token=QBRmstCkwXEvCjTclCpumbtNwvVkEzGAdELXyRyW', true);
-      //   request.onreadystatechange = function () {
-      //     var status;
-      //     var data;
-      //     if (request.readyState === 4) {
-      //       status = request.status;
-      //       if (status === 200) {
-      //         data = JSON.parse(request.responseText);
-      //         callback(data.releases, 'title', 'title');
-      //         singleXhrRemove.setValueByChoice('How Soon Is Now?');
-      //       } else {
-      //         console.error(status);
-      //       }
-      //     }
-      //   }
-      //   request.send();
-      // });
+      var genericExamples = new Choices('[data-trigger]', {
+        placeholderValue: 'This is a placeholder set in the config',
+        searchPlaceholderValue: 'This is a search placeholder'
+      });
 
-      // var genericExamples = new Choices('[data-trigger]', {
-      //   placeholderValue: 'This is a placeholder set in the config',
-      //   searchPlaceholderValue: 'This is a search placeholder'
-      // });
+      var singleNoSearch = new Choices('#choices-single-no-search', {
+        searchEnabled: false,
+        removeItemButton: true,
+        choices: [
+          { value: 'One', label: 'Label One' },
+          { value: 'Two', label: 'Label Two', disabled: true },
+          { value: 'Three', label: 'Label Three' },
+        ],
+      }).setChoices([
+        { value: 'Four', label: 'Label Four', disabled: true },
+        { value: 'Five', label: 'Label Five' },
+        { value: 'Six', label: 'Label Six', selected: true },
+      ], 'value', 'label', false);
 
-      // var singleNoSearch = new Choices('#choices-single-no-search', {
-      //   searchEnabled: false,
-      //   removeItemButton: true,
-      //   choices: [
-      //     { value: 'One', label: 'Label One' },
-      //     { value: 'Two', label: 'Label Two', disabled: true },
-      //     { value: 'Three', label: 'Label Three' },
-      //   ],
-      // }).setChoices([
-      //   { value: 'Four', label: 'Label Four', disabled: true },
-      //   { value: 'Five', label: 'Label Five' },
-      //   { value: 'Six', label: 'Label Six', selected: true },
-      // ], 'value', 'label', false);
+      var singlePresetOpts = new Choices('#choices-single-preset-options', {
+        placeholder: true,
+      }).setChoices([{
+        label: 'Group one',
+        id: 1,
+        disabled: false,
+        choices: [
+          { value: 'Child One', label: 'Child One', selected: true },
+          { value: 'Child Two', label: 'Child Two', disabled: true },
+          { value: 'Child Three', label: 'Child Three' },
+        ]
+      },
+      {
+        label: 'Group two',
+        id: 2,
+        disabled: false,
+        choices: [
+          { value: 'Child Four', label: 'Child Four', disabled: true },
+          { value: 'Child Five', label: 'Child Five' },
+          { value: 'Child Six', label: 'Child Six' },
+        ]
+      }], 'value', 'label');
 
-      // var singlePresetOpts = new Choices('#choices-single-preset-options', {
-      //   placeholder: true,
-      // }).setChoices([{
-      //   label: 'Group one',
-      //   id: 1,
-      //   disabled: false,
-      //   choices: [
-      //     { value: 'Child One', label: 'Child One', selected: true },
-      //     { value: 'Child Two', label: 'Child Two', disabled: true },
-      //     { value: 'Child Three', label: 'Child Three' },
-      //   ]
-      // },
-      // {
-      //   label: 'Group two',
-      //   id: 2,
-      //   disabled: false,
-      //   choices: [
-      //     { value: 'Child Four', label: 'Child Four', disabled: true },
-      //     { value: 'Child Five', label: 'Child Five' },
-      //     { value: 'Child Six', label: 'Child Six' },
-      //   ]
-      // }], 'value', 'label');
+      var singleSelectedOpt = new Choices('#choices-single-selected-option', {
+        searchFields: ['label', 'value', 'customProperties.description'],
+        choices: [
+          { value: 'One', label: 'Label One', selected: true },
+          { value: 'Two', label: 'Label Two', disabled: true },
+          {
+            value: 'Three', label: 'Label Three', customProperties: {
+              description: 'This option is fantastic'
+            }
+          },
+        ],
+      }).setValueByChoice('Two');
 
-      // var singleSelectedOpt = new Choices('#choices-single-selected-option', {
-      //   searchFields: ['label', 'value', 'customProperties.description'],
-      //   choices: [
-      //     { value: 'One', label: 'Label One', selected: true },
-      //     { value: 'Two', label: 'Label Two', disabled: true },
-      //     {
-      //       value: 'Three', label: 'Label Three', customProperties: {
-      //         description: 'This option is fantastic'
-      //       }
-      //     },
-      //   ],
-      // }).setValueByChoice('Two');
+      var singleNoSorting = new Choices('#choices-single-no-sorting', {
+        shouldSort: false,
+      });
 
-      // var singleNoSorting = new Choices('#choices-single-no-sorting', {
-      //   shouldSort: false,
-      // });
+      var states = new Choices(document.getElementById('states'));
 
-      // var states = new Choices(document.getElementById('states'));
+      states.passedElement.addEventListener('change', function(e) {
+        if (e.detail.value === 'New York') {
+          boroughs.enable();
+        } else {
+          boroughs.disable();
+        }
+      });
 
-      // states.passedElement.addEventListener('change', function (e) {
-      //   if (e.detail.value === 'New York') {
-      //     boroughs.enable();
-      //   } else {
-      //     boroughs.disable();
-      //   }
-      // });
+      var customTemplates = new Choices(document.getElementById('choices-single-custom-templates'), {
+        callbackOnCreateTemplates: function(strToEl) {
+          var classNames = this.config.classNames;
+          var itemSelectText = this.config.itemSelectText;
+          return {
+            item: function(data) {
+              return strToEl('\
+                <div\
+                  class="'+ String(classNames.item) + ' ' + String(data.highlighted ? classNames.highlightedState : classNames.itemSelectable) + '"\
+                  data-item\
+                  data-id="'+ String(data.id) + '"\
+                  data-value="'+ String(data.value) + '"\
+                  '+ String(data.active ? 'aria-selected="true"' : '') + '\
+                  '+ String(data.disabled ? 'aria-disabled="true"' : '') + '\
+                  >\
+                  <span style="margin-right:10px;">🎉</span> ' + String(data.label) + '\
+                </div>\
+              ');
+            },
+            choice: function(data) {
+              return strToEl('\
+                <div\
+                  class="'+ String(classNames.item) + ' ' + String(classNames.itemChoice) + ' ' + String(data.disabled ? classNames.itemDisabled : classNames.itemSelectable) + '"\
+                  data-select-text="'+ String(itemSelectText) + '"\
+                  data-choice \
+                  '+ String(data.disabled ? 'data-choice-disabled aria-disabled="true"' : 'data-choice-selectable') + '\
+                  data-id="'+ String(data.id) + '"\
+                  data-value="'+ String(data.value) + '"\
+                  '+ String(data.groupId > 0 ? 'role="treeitem"' : 'role="option"') + '\
+                  >\
+                  <span style="margin-right:10px;">👉🏽</span> ' + String(data.label) + '\
+                </div>\
+              ');
+            },
+          };
+        }
+      });
 
-      // var customTemplates = new Choices(document.getElementById('choices-single-custom-templates'), {
-      //   callbackOnCreateTemplates: function (strToEl) {
-      //     var classNames = this.config.classNames;
-      //     var itemSelectText = this.config.itemSelectText;
-      //     return {
-      //       item: function (data) {
-      //         return strToEl('\
-      //           <div\
-      //             class="'+ String(classNames.item) + ' ' + String(data.highlighted ? classNames.highlightedState : classNames.itemSelectable) + '"\
-      //             data-item\
-      //             data-id="'+ String(data.id) + '"\
-      //             data-value="'+ String(data.value) + '"\
-      //             '+ String(data.active ? 'aria-selected="true"' : '') + '\
-      //             '+ String(data.disabled ? 'aria-disabled="true"' : '') + '\
-      //             >\
-      //             <span style="margin-right:10px;">🎉</span> ' + String(data.label) + '\
-      //           </div>\
-      //         ');
-      //       },
-      //       choice: function (data) {
-      //         return strToEl('\
-      //           <div\
-      //             class="'+ String(classNames.item) + ' ' + String(classNames.itemChoice) + ' ' + String(data.disabled ? classNames.itemDisabled : classNames.itemSelectable) + '"\
-      //             data-select-text="'+ String(itemSelectText) + '"\
-      //             data-choice \
-      //             '+ String(data.disabled ? 'data-choice-disabled aria-disabled="true"' : 'data-choice-selectable') + '\
-      //             data-id="'+ String(data.id) + '"\
-      //             data-value="'+ String(data.value) + '"\
-      //             '+ String(data.groupId > 0 ? 'role="treeitem"' : 'role="option"') + '\
-      //             >\
-      //             <span style="margin-right:10px;">👉🏽</span> ' + String(data.label) + '\
-      //           </div>\
-      //         ');
-      //       },
-      //     };
-      //   }
-      // });
-
-      // var boroughs = new Choices(document.getElementById('boroughs')).disable();
+      var boroughs = new Choices(document.getElementById('boroughs')).disable();
     });
   </script>
 
   <!-- Google Analytics - Ignore me -->
   <script>
-    window.ga = window.ga || function () { (ga.q = ga.q || []).push(arguments) }; ga.l = +new Date;
+    window.ga = window.ga || function() { (ga.q = ga.q || []).push(arguments) }; ga.l = +new Date;
     ga('create', 'UA-31575166-1', 'auto');
     ga('send', 'pageview');
   </script>