diff --git a/server/api_server/graphql_endpoint.py b/server/api_server/graphql_endpoint.py
index 33a3b658..3cbb26fc 100755
--- a/server/api_server/graphql_endpoint.py
+++ b/server/api_server/graphql_endpoint.py
@@ -71,18 +71,18 @@ class Device(ObjectType):
     devIsArchived = Int(description="Is archived flag (0 or 1)")
     devParentMAC = String(description="Parent device MAC address")
     devParentPort = String(description="Parent device port")
-    devIcon = String(description="Device icon name")
+    devIcon = String(description="Base64-encoded HTML/SVG markup used to render the device icon")
     devGUID = String(description="Unique device GUID")
     devSite = String(description="Site name")
     devSSID = String(description="SSID connected to")
     devSyncHubNode = String(description="Sync hub node name")
     devSourcePlugin = String(description="Plugin that discovered the device")
-    devCustomProps = String(description="Custom properties in JSON format")
+    devCustomProps = String(description="Base64-encoded custom properties in JSON format")
     devStatus = String(description="Online/Offline status")
     devIsRandomMac = Int(description="Calculated: Is MAC address randomized?")
     devParentChildrenCount = Int(description="Calculated: Number of children attached to this parent")
     devIpLong = Int(description="Calculated: IP address in long format")
-    devFilterStatus = String(description="Calculated: Status for UI filtering")
+    devFilterStatus = String(description="Calculated: Device status for UI filtering")
     devFQDN = String(description="Fully Qualified Domain Name")
     devParentRelType = String(description="Relationship type to parent")
     devReqNicsOnline = Int(description="Required NICs online flag")
@@ -101,7 +101,7 @@ class Setting(ObjectType):
     setKey = String(description="Unique configuration key")
     setName = String(description="Human-readable setting name")
     setDescription = String(description="Detailed description of the setting")
-    setType = String(description="Data type (string, bool, int, etc.)")
+    setType = String(description="Config-driven type definition used to determine value type and UI rendering")
     setOptions = String(description="JSON string of available options")
     setGroup = String(description="UI group for categorization")
     setValue = String(description="Current value")