diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 5697aab1f..96e9631b3 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1618,16 +1618,15 @@ class InterfaceFilterForm(BootstrapMixin, forms.Form):
 
 
 class InterfaceListFilterForm(BootstrapMixin, forms.Form):
-    model = Interface
     q = forms.CharField(required=False, label='Search')
     site = FilterChoiceField(
-        queryset=Site.objects.annotate(filter_count=Count('member_interfaces')),
+        queryset=Site.objects.annotate(filter_count=Count('devices')),
         to_field_name='slug'
     )
     enabled = forms.ChoiceField(choices=add_blank_choice(IFACE_ENABLED_CHOICES), required=False)
     role = FilterChoiceField(
         required=False,
-        queryset=DeviceRole.objects.annotate(filter_count=Count('member_interfaces')),
+        queryset=DeviceRole.objects.annotate(filter_count=Count('devices')),
         to_field_name='slug'
     )
 
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 29fefc1f8..36bf7b088 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -559,7 +559,6 @@ class InterfaceListTable(BaseTable):
     device = tables.LinkColumn('dcim:device', accessor=Accessor('device'),
                                  args=[Accessor('device.pk')], verbose_name='Device')
     name = tables.TemplateColumn(template_code=INTERFACE_LINK, verbose_name='Interface')
-    #name = tables.Column(verbose_name='Interface')
     enabled = tables.TemplateColumn(template_code=INTERFACE_ENABLED, verbose_name='Enabled')
     form_factor = tables.Column(verbose_name='Form Factor')
     mac_address = tables.Column(verbose_name='MAC Address')