diff --git a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DevicePortFlattened.pm b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DevicePortFlattened.pm
index fa1eb77e..ca0c3c74 100644
--- a/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DevicePortFlattened.pm
+++ b/Netdisco/lib/App/Netdisco/DB/Result/Virtual/DevicePortFlattened.pm
@@ -23,6 +23,8 @@ SELECT
     (SELECT array_agg(ssid.ssid) FROM device_port_ssid ssid WHERE ssid.ip = dp.ip AND ssid.port = dp.port) AS ssids,
     neighbor_alias.ip AS neighbor_alias_ip,
     neighbor_alias.dns AS neighbor_alias_dns,
+    d.dns AS device_dns,
+    d.name AS device_name,  
     d.uptime AS device_uptime,
     d.last_discover AS device_last_discover,
     dpp.admin AS power_admin,
@@ -51,9 +53,13 @@ __PACKAGE__->add_columns(
   "ssids",
   { data_type => "text[]", is_nullable => 1 },
   "neighbor_alias_ip",
-  { data_type => "inet", is_nullable => 0 },
+  { data_type => "inet", is_nullable => 1 },
   "neighbor_alias_dns",
   { data_type => "text", is_nullable => 1 },
+  "device_dns",
+  { data_type => "text", is_nullable => 1 },
+  "device_name",
+  { data_type => "text", is_nullable => 1 },
   "device_uptime",
   { data_type => "bigint", is_nullable => 1 },
   "device_last_discover",