diff --git a/server/api_server/api_server_start.py b/server/api_server/api_server_start.py
index 204ae5af..582ef2d1 100755
--- a/server/api_server/api_server_start.py
+++ b/server/api_server/api_server_start.py
@@ -64,8 +64,15 @@ def graphql_endpoint():
     # Execute the GraphQL query
     result = devicesSchema.execute(data.get("query"), variables=data.get("variables"))
 
-    # Return the result as JSON
-    return jsonify(result.data)
+    # Initialize response
+    response = {}
+
+    if result.errors:
+        response["errors"] = [str(e) for e in result.errors]
+    if result.data:
+        response["data"] = result.data
+
+    return jsonify(response)
 
 # --------------------------
 # Device Endpoints
diff --git a/server/api_server/graphql_endpoint.py b/server/api_server/graphql_endpoint.py
index 45da39f0..f4dc053b 100755
--- a/server/api_server/graphql_endpoint.py
+++ b/server/api_server/graphql_endpoint.py
@@ -125,7 +125,7 @@ class Query(ObjectType):
             device["devParentChildrenCount"] = get_number_of_children(device["devMac"], devices_data)
             device["devIpLong"] = format_ip_long(device.get("devLastIP", ""))
         
-        mylog('verbose', f'[graphql_schema] devices_data: {devices_data}')
+        mylog('trace', f'[graphql_schema] devices_data: {devices_data}')
 
 
         # Apply sorting if options are provided
@@ -134,16 +134,16 @@ class Query(ObjectType):
             # Define status-specific filtering
             if options.status:
                 status = options.status
-                mylog('verbose', f'[graphql_schema] Applying status filter: {status}')
+                mylog('trace', f'[graphql_schema] Applying status filter: {status}')
 
                 # Include devices matching criteria in UI_MY_DEVICES
                 allowed_statuses = get_setting_value("UI_MY_DEVICES")  
                 hidden_relationships = get_setting_value("UI_hide_rel_types")  
                 network_dev_types = get_setting_value("NETWORK_DEVICE_TYPES")  
 
-                mylog('verbose', f'[graphql_schema] allowed_statuses: {allowed_statuses}')
-                mylog('verbose', f'[graphql_schema] hidden_relationships: {hidden_relationships}')
-                mylog('verbose', f'[graphql_schema] network_dev_types: {network_dev_types}')
+                mylog('trace', f'[graphql_schema] allowed_statuses: {allowed_statuses}')
+                mylog('trace', f'[graphql_schema] hidden_relationships: {hidden_relationships}')
+                mylog('trace', f'[graphql_schema] network_dev_types: {network_dev_types}')
 
                 # Filtering based on the "status"
                 if status == "my_devices":
@@ -249,7 +249,7 @@ class Query(ObjectType):
             return SettingResult(settings=[], count=0)
 
 
-        mylog('verbose', f'[graphql_schema] settings_data: {settings_data}')
+        mylog('trace', f'[graphql_schema] settings_data: {settings_data}')
 
         # Convert to Setting objects
         settings = [Setting(**setting) for setting in settings_data]
diff --git a/test/test_graphq_endpoints.py b/test/test_graphq_endpoints.py
index 222deb3a..506ec99d 100755
--- a/test/test_graphq_endpoints.py
+++ b/test/test_graphq_endpoints.py
@@ -50,7 +50,12 @@ def test_graphql_post_devices(client, api_token):
         "query": """
         {
             devices {
-                devices { devName devMac devIsRandomMac devParentChildrenCount }
+                devices { 
+                    devGUID
+                    devGroup
+                    devIsRandomMac
+                    devParentChildrenCount
+                }
                 count
             }
         }
@@ -58,9 +63,17 @@ def test_graphql_post_devices(client, api_token):
     }
     resp = client.post("/graphql", json=query, headers=auth_headers(api_token))
     assert resp.status_code == 200
-    data = resp.json.get("data", {})
+
+    body = resp.get_json()
+    # print("FULL RESPONSE:", body)
+
+    # GraphQL spec: response always under "data"
+    assert "data" in body
+    data = body["data"]
+
     assert "devices" in data
     assert isinstance(data["devices"]["devices"], list)
+    assert isinstance(data["devices"]["count"], int)
 
 def test_graphql_post_settings(client, api_token):
     """POST /graphql should return settings data"""