diff --git a/netbox/extras/filtersets.py b/netbox/extras/filtersets.py
index 8f1782c8f..ef094c2d0 100644
--- a/netbox/extras/filtersets.py
+++ b/netbox/extras/filtersets.py
@@ -201,10 +201,6 @@ class SavedFilterFilterSet(BaseFilterSet):
 
 
 class BookmarkFilterSet(BaseFilterSet):
-    q = django_filters.CharFilter(
-        method='search',
-        label=_('Search'),
-    )
     created = django_filters.DateTimeFilter()
     object_type_id = MultiValueNumberFilter()
     object_type = ContentTypeFilter()
@@ -223,11 +219,6 @@ class BookmarkFilterSet(BaseFilterSet):
         model = Bookmark
         fields = ['id', 'object_id']
 
-    # def search(self, queryset, name, value):
-    #     if not value.strip():
-    #         return queryset
-    #     return queryset.filter(name__icontains=value)
-
 
 class ImageAttachmentFilterSet(BaseFilterSet):
     q = django_filters.CharFilter(
diff --git a/netbox/netbox/models/features.py b/netbox/netbox/models/features.py
index b91403c94..3fd1d8369 100644
--- a/netbox/netbox/models/features.py
+++ b/netbox/netbox/models/features.py
@@ -310,7 +310,9 @@ class BookmarksMixin(models.Model):
     Enables support for user bookmarks.
     """
     images = GenericRelation(
-        to='extras.Bookmark'
+        to='extras.Bookmark',
+        content_type_field='object_type',
+        object_id_field='object_id'
     )
 
     class Meta: