From 7219c3449f94df9f785de9c1576247155375486e Mon Sep 17 00:00:00 2001
From: checktheroads <matt@allroads.io>
Date: Sun, 23 May 2021 11:39:08 -0700
Subject: [PATCH] #6372: Fix invalid filter form fields

---
 netbox/dcim/forms.py | 2 +-
 netbox/ipam/forms.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index e6e78cfcd..050ef3b4a 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -4379,7 +4379,7 @@ class CableFilterForm(BootstrapMixin, CustomFieldFilterForm):
     field_groups = [
         ['type', 'status', 'color'],
         ['device_id', 'rack_id'],
-        ['region_id', 'site_group_id', 'site_id', 'tenant_id'],
+        ['region_id', 'site_id', 'tenant_id'],
         ['tag']
     ]
     region_id = DynamicModelMultipleChoiceField(
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index efdd794a8..d161f6ce1 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -179,7 +179,7 @@ class RouteTargetFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilter
     model = RouteTarget
     field_order = ['name', 'tenant_group_id', 'tenant_id', 'importing_vrfs', 'exporting_vrfs']
     field_groups = [
-        ['name', 'importing_vrfs', 'exporting_vrfs'],
+        ['importing_vrf_id', 'exporting_vrf_id'],
         ['tenant_group_id', 'tenant_id'],
     ]
     importing_vrf_id = DynamicModelMultipleChoiceField(
@@ -333,7 +333,7 @@ class AggregateFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterFo
     model = Aggregate
     field_order = ['family', 'rir', 'tenant_group_id', 'tenant_id']
     field_groups = [
-        ['family', 'rir'],
+        ['family', 'rir_id'],
         ['tenant_group_id', 'tenant_id']
     ]
     family = forms.ChoiceField(