diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 0254d7e46..d026d4912 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1620,13 +1620,13 @@ class InterfaceFilterForm(BootstrapMixin, forms.Form): class InterfaceListFilterForm(BootstrapMixin, forms.Form): q = forms.CharField(required=False, label='Search') site = forms.ModelChoiceField(required=False, queryset=Site.objects.all(), to_field_name='slug') - rack_group_id = ModelChoiceField( + rack_group_id = forms.ModelChoiceField( required=False, queryset=RackGroup.objects.select_related('site').annotate(filter_count=Count('racks__devices')), label='Rack group', null_option=(0, 'None') ) - rack_id = ModelChoiceField( + rack_id = forms.ModelChoiceField( required=False, queryset=Rack.objects.annotate(filter_count=Count('devices')), label='Rack',