diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index aecf046bb..9ddc8ae80 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -2025,6 +2025,15 @@ class PlatformBulkEditForm(BootstrapMixin, CustomFieldModelBulkEditForm):
         nullable_fields = ['manufacturer', 'napalm_driver', 'description']
 
 
+class PlatformFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
+    model = Platform
+    manufacturer_id = DynamicModelMultipleChoiceField(
+        queryset=Manufacturer.objects.all(),
+        required=False,
+        label=_('Manufacturer')
+    )
+
+
 #
 # Devices
 #
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index a1547fc3b..d38d95aee 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1218,6 +1218,8 @@ class PlatformListView(generic.ObjectListView):
         vm_count=count_related(VirtualMachine, 'platform')
     )
     table = tables.PlatformTable
+    filterset = filtersets.PlatformFilterSet
+    filterset_form = forms.PlatformFilterForm
 
 
 class PlatformView(generic.ObjectView):
diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html
index c19790b1e..3a45905e9 100644
--- a/netbox/templates/dcim/platform.html
+++ b/netbox/templates/dcim/platform.html
@@ -5,7 +5,7 @@
 {% block breadcrumbs %}
   {{ block.super }}
   {% if object.manufacturer %}
-    <li class="breadcrumb-item"><a href="{% url 'dcim:platform_list' %}?manufacturer={{ object.manufacturer.slug }}">{{ object.manufacturer }}</a></li>
+    <li class="breadcrumb-item"><a href="{% url 'dcim:platform_list' %}?manufacturer_id={{ object.manufacturer.pk }}">{{ object.manufacturer }}</a></li>
   {% endif %}
 {% endblock %}
 
diff --git a/netbox/templates/tenancy/tenantgroup.html b/netbox/templates/tenancy/tenantgroup.html
index c442cfcd3..6394fc717 100644
--- a/netbox/templates/tenancy/tenantgroup.html
+++ b/netbox/templates/tenancy/tenantgroup.html
@@ -5,7 +5,7 @@
 {% block breadcrumbs %}
   {{ block.super }}
   {% for tenantgroup in object.get_ancestors %}
-    <li class="breadcrumb-item"><a href="{% url 'tenancy:tenantgroup_list' %}?parent={{ tenantgroup.slug }}">{{ tenantgroup }}</a></li>
+    <li class="breadcrumb-item"><a href="{% url 'tenancy:tenantgroup_list' %}?parent_id={{ tenantgroup.pk }}">{{ tenantgroup }}</a></li>
   {% endfor %}
 {% endblock %}
 
diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py
index 17c325815..19e2fc38c 100644
--- a/netbox/tenancy/forms.py
+++ b/netbox/tenancy/forms.py
@@ -62,6 +62,15 @@ class TenantGroupBulkEditForm(BootstrapMixin, CustomFieldModelBulkEditForm):
         nullable_fields = ['parent', 'description']
 
 
+class TenantGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
+    model = TenantGroup
+    parent_id = DynamicModelMultipleChoiceField(
+        queryset=TenantGroup.objects.all(),
+        required=False,
+        label=_('Parent group')
+    )
+
+
 #
 # Tenants
 #
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index b4a29a2e6..22d669a0d 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -20,6 +20,8 @@ class TenantGroupListView(generic.ObjectListView):
         'tenant_count',
         cumulative=True
     )
+    filterset = filtersets.TenantGroupFilterSet
+    filterset_form = forms.TenantGroupFilterForm
     table = tables.TenantGroupTable