diff --git a/apps/assets/api/gathered_user.py b/apps/assets/api/gathered_user.py
index b9f137648..e024fedb1 100644
--- a/apps/assets/api/gathered_user.py
+++ b/apps/assets/api/gathered_user.py
@@ -18,5 +18,5 @@ class GatheredUserViewSet(OrgModelViewSet):
     permission_classes = [IsOrgAdmin]
     extra_filter_backends = [AssetRelatedByNodeFilterBackend]
 
-    filter_fields = ['asset', 'username', 'present']
+    filter_fields = ['asset', 'username', 'present', 'asset__ip', 'asset__hostname']
     search_fields = ['username', 'asset__ip', 'asset__hostname']
diff --git a/apps/assets/serializers/asset.py b/apps/assets/serializers/asset.py
index e238c29a7..e36f41946 100644
--- a/apps/assets/serializers/asset.py
+++ b/apps/assets/serializers/asset.py
@@ -144,14 +144,8 @@ class AssetDisplaySerializer(AssetSerializer):
     connectivity = ConnectivitySerializer(read_only=True, label=_("Connectivity"))
 
     class Meta(AssetSerializer.Meta):
-        fields = [
-            'id', 'ip', 'hostname', 'protocol', 'port',
-            'protocols', 'is_active', 'public_ip',
-            'number', 'vendor', 'model', 'sn',
-            'cpu_model', 'cpu_count', 'cpu_cores', 'cpu_vcpus', 'memory',
-            'disk_total', 'disk_info', 'os', 'os_version', 'os_arch',
-            'hostname_raw', 'comment', 'created_by', 'date_created',
-            'hardware_info', 'connectivity',
+        fields = AssetSerializer.Meta.fields + [
+            'connectivity',
         ]
 
     @classmethod