diff --git a/netbox/project-static/js/forms.js b/netbox/project-static/js/forms.js
index e421f6283..348e7aaba 100644
--- a/netbox/project-static/js/forms.js
+++ b/netbox/project-static/js/forms.js
@@ -9,14 +9,6 @@ $(document).ready(function() {
             $('#select_all').prop('checked', false);
         }
     });
-    // Enable hidden buttons when "select all" is checked
-    $('#select_all').click(function (event) {
-        if ($(this).is(':checked')) {
-            $('#select_all_box').find('button').prop('disabled', '');
-        } else {
-            $('#select_all_box').find('button').prop('disabled', 'disabled');
-        }
-    });
     // Uncheck the "toggle all" checkbox if an item is unchecked
     $('input:checkbox[name=pk]').click(function (event) {
         if (!$(this).attr('checked')) {
@@ -68,38 +60,45 @@ $(document).ready(function() {
     });
 
     // API select widget
-    $('select[filter-for]').change(function() {
+    $('select[filter-for]').change(function () {
+        var choice = $(this).val()
 
         // Resolve child field by ID specified in parent
         var child_name = $(this).attr('filter-for');
         var child_field = $('#id_' + child_name);
-        var child_selected = child_field.val();
 
-        // Wipe out any existing options within the child field and create a default option
+        // Wipe out any existing options within the child field
         child_field.empty();
-        child_field.append($("<option></option>").attr("value", "").text("---------"));
+        child_field.append($("<option></option>").attr("value", "").text(""));
+
+        if (!choice && $(this).attr('default_value')) {
+            choice = $(this).attr('default_value')
+        }
+        if (choice) {
 
-        if ($(this).val() || $(this).attr('nullable') == 'true') {
             var api_url = child_field.attr('api-url');
             var disabled_indicator = child_field.attr('disabled-indicator');
             var initial_value = child_field.attr('initial');
             var display_field = child_field.attr('display-field') || 'name';
 
-            // Determine the filter fields needed to make an API call
-            var filter_regex = /\{\{([a-z_]+)\}\}/g;
-            var match;
-            while (match = filter_regex.exec(api_url)) {
-                var filter_field = $('#id_' + match[1]);
-                if (filter_field.val()) {
-                    api_url = api_url.replace(match[0], filter_field.val());
-                } else if ($(this).attr('nullable') == 'true') {
-                    api_url = api_url.replace(match[0], '0');
+            // Gather the values of all other filter fields for this child
+            $("select[filter-for='" + child_name + "']").each(function() {
+                var filter_field = $(this);
+                var choice = filter_field.val()
+                if (!choice && filter_field.attr('default_value')) {
+                    choice = filter_field.attr('default_value')
                 }
-            }
+                if (choice) {
+                    api_url = api_url.replace('{{' + filter_field.attr('name') + '}}', choice);
+                } else {
+                    // Not all filters have been selected yet
+                    return false;
+                }
+
+            });
 
             // If all URL variables have been replaced, make the API call
             if (api_url.search('{{') < 0) {
-                console.log(child_name + ": Fetching " + api_url);
                 $.ajax({
                     url: api_url,
                     dataType: 'json',
@@ -107,9 +106,7 @@ $(document).ready(function() {
                         $.each(response, function (index, choice) {
                             var option = $("<option></option>").attr("value", choice.id).text(choice[display_field]);
                             if (disabled_indicator && choice[disabled_indicator] && choice.id != initial_value) {
-                                option.attr("disabled", "disabled");
-                            } else if (choice.id == child_selected) {
-                                option.attr("selected", "selected");
+                                option.attr("disabled", "disabled")
                             }
                             child_field.append(option);
                         });
@@ -123,4 +120,4 @@ $(document).ready(function() {
         child_field.change();
 
     });
-});
+});
\ No newline at end of file