diff --git a/InvenTree/InvenTree/metadata.py b/InvenTree/InvenTree/metadata.py
index 89b5b14493..34490d1079 100644
--- a/InvenTree/InvenTree/metadata.py
+++ b/InvenTree/InvenTree/metadata.py
@@ -90,7 +90,7 @@ class InvenTreeMetadata(SimpleMetadata):
         to any fields whose Meta.model specifies a default value
         """
 
-        field_info = super().get_serializer_info(serializer)
+        serializer_info = super().get_serializer_info(serializer)
 
         try:
             ModelClass = serializer.Meta.model
@@ -100,7 +100,7 @@ class InvenTreeMetadata(SimpleMetadata):
             # Iterate through simple fields
             for name, field in model_fields.fields.items():
 
-                if field.has_default() and name in field_info.keys():
+                if field.has_default() and name in serializer_info.keys():
 
                     default = field.default
 
@@ -110,27 +110,27 @@ class InvenTreeMetadata(SimpleMetadata):
                         except:
                             continue
 
-                    field_info[name]['default'] = default
+                    serializer_info[name]['default'] = default
 
             # Iterate through relations
             for name, relation in model_fields.relations.items():
 
-                if relation.reverse:
-                    print("skipping reverse relation -", name)
+                if name not in serializer_info.keys():
+                    # Skip relation not defined in serializer
                     continue
 
-                print('filters:', name, relation.model_field.get_limit_choices_to())
+                if relation.reverse:
+                    # Ignore reverse relations
+                    continue
 
-                continue
                 # Extract and provide the "limit_choices_to" filters
-                field_info[name]['filters'] = relation.model_field.get_limit_choices_to()
+                # This is used to automatically filter AJAX requests
+                serializer_info[name]['filters'] = relation.model_field.get_limit_choices_to()
 
         except AttributeError:
             pass
 
-        print(field_info.keys())
-
-        return field_info
+        return serializer_info
 
     def get_field_info(self, field):
         """
diff --git a/InvenTree/company/templates/company/index.html b/InvenTree/company/templates/company/index.html
index f02ae1e6c8..fef338078a 100644
--- a/InvenTree/company/templates/company/index.html
+++ b/InvenTree/company/templates/company/index.html
@@ -45,6 +45,12 @@
                 method: 'POST',
                 title: '{% trans "Edit Part Details" %}',
                 fields: {
+                    part: {
+                        filters: {
+                        }
+                    },
+                    quantity: {},
+                    /*
                     name: {
                         onEdit: function() {
                             console.log('Edited name field');
@@ -67,7 +73,6 @@
                     purchaseable: {},
                     salable: {},
                     component: {},
-                    /*
                     'website',
                     'address',
                     'phone',
diff --git a/InvenTree/templates/js/forms.js b/InvenTree/templates/js/forms.js
index 9c24aa7780..9343751926 100644
--- a/InvenTree/templates/js/forms.js
+++ b/InvenTree/templates/js/forms.js
@@ -267,8 +267,8 @@ function constructFormBody(fields, options) {
         // Copy custom options across to the fields object
         if (field_options) {
 
-            // Query filters
-            fields[field].filters = field_options.filters;
+            // Override existing query filters (if provided!)
+            fields[field].filters = Object.assign(fields[field].filters || {}, field_options.filters);
 
             // Secondary modal options
             fields[field].secondary = field_options.secondary;