diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index b3769bdd0..98161e946 100644
Binary files a/netbox/project-static/dist/netbox.js and b/netbox/project-static/dist/netbox.js differ
diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
index 8988e2e49..9ddc10fd8 100644
Binary files a/netbox/project-static/dist/netbox.js.map and b/netbox/project-static/dist/netbox.js.map differ
diff --git a/netbox/project-static/src/htmx.ts b/netbox/project-static/src/htmx.ts
index 2410a5fd9..8d92b60c8 100644
--- a/netbox/project-static/src/htmx.ts
+++ b/netbox/project-static/src/htmx.ts
@@ -1,11 +1,11 @@
 import { getElements, isTruthy } from './util';
 import { initButtons } from './buttons';
-import { initSelect } from './select';
+import { initSelects } from './select';
 import { initObjectSelector } from './objectSelector';
 import { initBootstrap } from './bs';
 
 function initDepedencies(): void {
-  for (const init of [initButtons, initSelect, initObjectSelector, initBootstrap]) {
+  for (const init of [initButtons, initSelects, initObjectSelector, initBootstrap]) {
     init();
   }
 }
diff --git a/netbox/project-static/src/netbox.ts b/netbox/project-static/src/netbox.ts
index dc3d9e26b..8c274c64b 100644
--- a/netbox/project-static/src/netbox.ts
+++ b/netbox/project-static/src/netbox.ts
@@ -1,8 +1,7 @@
 import { initForms } from './forms';
 import { initBootstrap } from './bs';
 import { initQuickSearch } from './search';
-// import { initSelect } from './select';
-import { initSelects } from './tomSelect';
+import { initSelects } from './select';
 import { initButtons } from './buttons';
 import { initColorMode } from './colorMode';
 import { initMessages } from './messages';
@@ -23,7 +22,6 @@ function initDocument(): void {
     initMessages,
     initForms,
     initQuickSearch,
-    // initSelect,
     initSelects,
     initDateSelector,
     initButtons,
diff --git a/netbox/project-static/src/tomSelect.ts b/netbox/project-static/src/select/classes/dynamicTomSelect.ts
similarity index 57%
rename from netbox/project-static/src/tomSelect.ts
rename to netbox/project-static/src/select/classes/dynamicTomSelect.ts
index 74039db24..370eba60d 100644
--- a/netbox/project-static/src/tomSelect.ts
+++ b/netbox/project-static/src/select/classes/dynamicTomSelect.ts
@@ -1,15 +1,15 @@
-import { getElements } from './util';
-import { RecursivePartial, TomInput, TomOption, TomSettings } from 'tom-select/src/types';
+import { RecursivePartial, TomInput, TomSettings } from 'tom-select/dist/types/types';
 import { addClasses } from 'tom-select/src/vanilla'
 import queryString from 'query-string';
 import TomSelect from 'tom-select';
 import type { Stringifiable } from 'query-string';
 
 // Transitional
-import { QueryFilter } from './select/api/types'
+import { QueryFilter } from '../../select_old/api/types'
 
 
-class DynamicTomSelect extends TomSelect {
+// Extends TomSelect to provide enhanced fetching of options via the REST API
+export class DynamicTomSelect extends TomSelect {
 
   /*
    * Transitional code from APISelect
@@ -24,6 +24,7 @@ class DynamicTomSelect extends TomSelect {
   constructor( input_arg: string|TomInput, user_settings: RecursivePartial<TomSettings> ) {
     super(input_arg, user_settings);
 
+    // Glean the REST API endpoint URL from the <select> element
     this.api_url = this.input.getAttribute('data-url') as string;
 
     // Populate static query parameters.
@@ -35,6 +36,7 @@ class DynamicTomSelect extends TomSelect {
 
   load(value: string) {
     const self = this;
+    const url = self.getRequestUrl(value);
 
     // Automatically clear any cached options. (Only options included
     // in the API response should be present.)
@@ -45,16 +47,13 @@ class DynamicTomSelect extends TomSelect {
     addClasses(self.wrapper, self.settings.loadingClass);
     self.loading++;
 
-    const callback = self.loadCallback.bind(self);
-    const url = self.getRequestUrl(value);
-
     // Make the API request
     fetch(url)
       .then(response => response.json())
       .then(json => {
-          callback(json.results);
+          self.loadCallback(json.results, []);
       }).catch(()=>{
-          callback();
+          self.loadCallback([], []);
       });
 
   }
@@ -63,9 +62,7 @@ class DynamicTomSelect extends TomSelect {
    * Custom methods
    */
 
-  /**
-   * Formulate and return the complete URL for an API request, including any query parameters.
-   */
+  // Formulate and return the complete URL for an API request, including any query parameters.
   getRequestUrl(search: string): string {
     const url = this.api_url;
 
@@ -91,13 +88,9 @@ class DynamicTomSelect extends TomSelect {
    * Transitional methods
    */
 
-  /**
-   * Determine if this instance's options should be filtered by static values passed from the
-   * server.
-   *
-   * Looks for the DOM attribute `data-static-params`, the value of which is a JSON array of
-   * objects containing key/value pairs to add to `this.staticParams`.
-   */
+  // Determine if this instance's options should be filtered by static values passed from the
+  // server. Looks for the DOM attribute `data-static-params`, the value of which is a JSON
+  // array of objects containing key/value pairs to add to `this.staticParams`.
   private getStaticParams(): void {
     const serialized = this.input.getAttribute('data-static-params');
 
@@ -122,53 +115,3 @@ class DynamicTomSelect extends TomSelect {
   }
 
 }
-
-// Initialize <select> elements with statically-defined options
-function initStaticSelects(): void {
-
-  for (const select of getElements<HTMLSelectElement>('select:not(.api-select):not(.color-select)')) {
-    new TomSelect(select, {
-      plugins: ['clear_button']
-    });
-  }
-
-}
-
-// Initialize <select> elements which are populated via a REST API call
-function initDynamicSelects(): void {
-
-  for (const select of getElements<HTMLSelectElement>('select.api-select')) {
-    new DynamicTomSelect(select, {
-      plugins: ['clear_button'],
-      valueField: 'id',
-      labelField: 'display',
-      searchField: [],
-      copyClassesToDropdown: false,
-      dropdownParent: 'body',
-      controlInput: '<input>',
-      preload: 'focus',
-	});
-  }
-
-}
-
-// Initialize color selection fields
-function initColorSelects(): void {
-
-  for (const select of getElements<HTMLSelectElement>('select.color-select')) {
-    new TomSelect(select, {
-      render: {
-        option: function(item: TomOption, escape: Function) {
-          return `<div style="background-color: #${escape(item.value)}">${escape(item.text)}</div>`;
-        }
-      }
-    });
-  }
-
-}
-
-export function initSelects(): void {
-  initStaticSelects();
-  initDynamicSelects();
-  initColorSelects();
-}
diff --git a/netbox/project-static/src/select/dynamic.ts b/netbox/project-static/src/select/dynamic.ts
new file mode 100644
index 000000000..9f6e7dbf1
--- /dev/null
+++ b/netbox/project-static/src/select/dynamic.ts
@@ -0,0 +1,21 @@
+import { getElements } from '../util';
+import { DynamicTomSelect } from './classes/dynamicTomSelect'
+
+
+// Initialize <select> elements which are populated via a REST API call
+export function initDynamicSelects(): void {
+
+  for (const select of getElements<HTMLSelectElement>('select.api-select')) {
+    new DynamicTomSelect(select, {
+      plugins: ['clear_button'],
+      valueField: 'id',
+      labelField: 'display',
+      searchField: [],
+      copyClassesToDropdown: false,
+      dropdownParent: 'body',
+      controlInput: '<input>',
+      preload: 'focus',
+	});
+  }
+
+}
diff --git a/netbox/project-static/src/select/index.ts b/netbox/project-static/src/select/index.ts
index 356c8004f..a7d855f8a 100644
--- a/netbox/project-static/src/select/index.ts
+++ b/netbox/project-static/src/select/index.ts
@@ -1,9 +1,9 @@
-import { initApiSelect } from './api';
-import { initColorSelect } from './color';
-import { initStaticSelect } from './static';
+import { initColorSelects, initStaticSelects } from './static';
+import { initDynamicSelects } from './dynamic';
 
-export function initSelect(): void {
-  for (const func of [initApiSelect, initColorSelect, initStaticSelect]) {
-    func();
-  }
+
+export function initSelects(): void {
+  initStaticSelects();
+  initDynamicSelects();
+  initColorSelects();
 }
diff --git a/netbox/project-static/src/select/static.ts b/netbox/project-static/src/select/static.ts
index 19031bb7d..919e7c999 100644
--- a/netbox/project-static/src/select/static.ts
+++ b/netbox/project-static/src/select/static.ts
@@ -1,27 +1,30 @@
-import SlimSelect from 'slim-select';
 import { getElements } from '../util';
+import { TomOption } from 'tom-select/src/types';
+import TomSelect from 'tom-select';
 
-export function initStaticSelect(): void {
-  for (const select of getElements<HTMLSelectElement>('.netbox-static-select:not([data-ssid])')) {
-    if (select !== null) {
-      const label = document.querySelector(`label[for="${select.id}"]`) as HTMLLabelElement;
 
-      let placeholder;
-      if (label !== null) {
-        placeholder = `Select ${label.innerText.trim()}`;
-      }
+// Initialize <select> elements with statically-defined options
+export function initStaticSelects(): void {
 
-      const instance = new SlimSelect({
-        select,
-        allowDeselect: true,
-        deselectLabel: `<i class="mdi mdi-close-circle"></i>`,
-        placeholder,
-      });
-
-      // Don't copy classes from select element to SlimSelect instance.
-      for (const className of select.classList) {
-        instance.slim.container.classList.remove(className);
-      }
-    }
+  for (const select of getElements<HTMLSelectElement>('select:not(.api-select):not(.color-select)')) {
+    new TomSelect(select, {
+      plugins: ['clear_button']
+    });
   }
+
 }
+
+// Initialize color selection fields
+export function initColorSelects(): void {
+
+  for (const select of getElements<HTMLSelectElement>('select.color-select')) {
+    new TomSelect(select, {
+      render: {
+        option: function(item: TomOption, escape: Function) {
+          return `<div style="background-color: #${escape(item.value)}">${escape(item.text)}</div>`;
+        }
+      }
+    });
+  }
+
+}
\ No newline at end of file
diff --git a/netbox/project-static/src/select/api/apiSelect.ts b/netbox/project-static/src/select_old/api/apiSelect.ts
similarity index 100%
rename from netbox/project-static/src/select/api/apiSelect.ts
rename to netbox/project-static/src/select_old/api/apiSelect.ts
diff --git a/netbox/project-static/src/select/api/dynamicParams.ts b/netbox/project-static/src/select_old/api/dynamicParams.ts
similarity index 100%
rename from netbox/project-static/src/select/api/dynamicParams.ts
rename to netbox/project-static/src/select_old/api/dynamicParams.ts
diff --git a/netbox/project-static/src/select/api/index.ts b/netbox/project-static/src/select_old/api/index.ts
similarity index 100%
rename from netbox/project-static/src/select/api/index.ts
rename to netbox/project-static/src/select_old/api/index.ts
diff --git a/netbox/project-static/src/select/api/types.ts b/netbox/project-static/src/select_old/api/types.ts
similarity index 100%
rename from netbox/project-static/src/select/api/types.ts
rename to netbox/project-static/src/select_old/api/types.ts
diff --git a/netbox/project-static/src/select/color.ts b/netbox/project-static/src/select_old/color.ts
similarity index 100%
rename from netbox/project-static/src/select/color.ts
rename to netbox/project-static/src/select_old/color.ts
diff --git a/netbox/project-static/src/select_old/index.ts b/netbox/project-static/src/select_old/index.ts
new file mode 100644
index 000000000..356c8004f
--- /dev/null
+++ b/netbox/project-static/src/select_old/index.ts
@@ -0,0 +1,9 @@
+import { initApiSelect } from './api';
+import { initColorSelect } from './color';
+import { initStaticSelect } from './static';
+
+export function initSelect(): void {
+  for (const func of [initApiSelect, initColorSelect, initStaticSelect]) {
+    func();
+  }
+}
diff --git a/netbox/project-static/src/select_old/static.ts b/netbox/project-static/src/select_old/static.ts
new file mode 100644
index 000000000..19031bb7d
--- /dev/null
+++ b/netbox/project-static/src/select_old/static.ts
@@ -0,0 +1,27 @@
+import SlimSelect from 'slim-select';
+import { getElements } from '../util';
+
+export function initStaticSelect(): void {
+  for (const select of getElements<HTMLSelectElement>('.netbox-static-select:not([data-ssid])')) {
+    if (select !== null) {
+      const label = document.querySelector(`label[for="${select.id}"]`) as HTMLLabelElement;
+
+      let placeholder;
+      if (label !== null) {
+        placeholder = `Select ${label.innerText.trim()}`;
+      }
+
+      const instance = new SlimSelect({
+        select,
+        allowDeselect: true,
+        deselectLabel: `<i class="mdi mdi-close-circle"></i>`,
+        placeholder,
+      });
+
+      // Don't copy classes from select element to SlimSelect instance.
+      for (const className of select.classList) {
+        instance.slim.container.classList.remove(className);
+      }
+    }
+  }
+}
diff --git a/netbox/project-static/src/select/util.ts b/netbox/project-static/src/select_old/util.ts
similarity index 100%
rename from netbox/project-static/src/select/util.ts
rename to netbox/project-static/src/select_old/util.ts