diff --git a/lib/App/Netdisco/Web/Plugin/Report/ApClients.pm b/lib/App/Netdisco/Web/Plugin/Report/ApClients.pm
index ff1ff6fb..2a19f3b3 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/ApClients.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/ApClients.pm
@@ -17,20 +17,18 @@ register_report(
 
 get '/ajax/content/report/apclients' => require_login sub {
     my @results = schema(vars->{'tenant'})->resultset('Device')->search(
-        { 'nodes.time_last' => { '>=', \'me.last_macsuck' } },
-        {   select => [ 'ip', 'dns', 'name', 'model', 'location' ],
-            join       => { 'ports' => { 'ssid' => 'nodes' } },
+        { 'nodes.time_last' => { '>=', \'me.last_macsuck' },
+          'ports.port' => { '-in' => schema(vars->{'tenant'})->resultset('DevicePortWireless')->get_column('port')->as_query },
+        },
+        {   select => [ 'ip', 'model', 'ports.port', 'ports.name', 'ports.type' ],
+            join       => { 'ports' =>  'nodes' },
             '+columns' => [
-                { 'port'        => 'ports.port' },
-                { 'description' => 'ports.name' },
-                { 'ssid'        => 'ssid.ssid' },
-                { 'mac_count'   => { count => 'nodes.mac' } },
+                { 'mac_count' => { count => 'nodes.mac' } },
             ],
             group_by => [
-                'me.ip',       'me.dns',     'me.name',     'me.model',
-                'me.location', 'ports.port', 'ports.descr', 'ports.name', 'ssid.ssid',
+                'me.ip', 'me.model', 'ports.port', 'ports.name', 'ports.type',
             ],
-            order_by => { -desc => [qw/count/] },
+            order_by => { -asc => [qw/ports.name ports.type/] },
         }
     )->hri->all;
 
diff --git a/share/views/ajax/report/apclients.tt b/share/views/ajax/report/apclients.tt
index 56a54b53..f17d7f53 100644
--- a/share/views/ajax/report/apclients.tt
+++ b/share/views/ajax/report/apclients.tt
@@ -1,11 +1,9 @@
 <table id="data-table" class="table table-striped table-bordered" width="100%" cellspacing="0">
   <thead>
     <tr>
-      <th>Device</th>
+      <th>Access Point</th>
       <th>Model</th>
-      <th>Location</th>
-      <th>Port</th>
-      <th>SSID</th>
+      <th>Radio</th>
       <th>Node Count</th>
     </tr>
   </thead>
@@ -15,16 +13,15 @@
 $(document).ready(function() {
   var table = $('#data-table').dataTable({
     "deferRender": true,
-    "order": [[ 5, "desc" ]],
     "data": [% results | none %],
     "columns": [
       {
-        "data": 'ip',
+        "data": 'ports.port',
+        "type": 'portsort',
         "render": function(data, type, row, meta) {
           return type === 'display' ?
-            '<a href="[% uri_for('/device') | none %]?tab=details&q=' + encodeURIComponent(row.ip) + '">'
-            + he.encode(row.dns || row.name || row.ip) + '</a>' :
-          data;
+            '<a href="[% device_ports | none %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '&c_nodes=on">' + he.encode(row.ports.name || '') + '</a>' :
+            he.encode(data || '');
         }
       }, {
         "data": 'model',
@@ -32,20 +29,7 @@ $(document).ready(function() {
           return he.encode(data || '');
         }
       }, {
-        "data": 'location',
-        "render": function(data, type, row, meta) {
-          return he.encode(data || '');
-        }
-      }, {
-        "data": 'port',
-        "type": 'portsort',
-        "render": function(data, type, row, meta) {
-          return type === 'display' ?
-            '<a href="[% device_ports | none %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '&c_nodes=on">' + he.encode(data || '') + '</a>' :
-            he.encode(data || '');
-        }
-      }, {
-        "data": 'ssid',
+        "data": 'ports.type',
         "render": function(data, type, row, meta) {
           return he.encode(data || '');
         }