diff --git a/lib/App/Netdisco/Web/GenericReport.pm b/lib/App/Netdisco/Web/GenericReport.pm
index af543ceb..dccd1e04 100644
--- a/lib/App/Netdisco/Web/GenericReport.pm
+++ b/lib/App/Netdisco/Web/GenericReport.pm
@@ -78,14 +78,14 @@ foreach my $report (@{setting('reports')}) {
                 is_custom_report => true,
                 column_options => \%column_config,
                 headings => [map {$column_config{$_}->{displayname}} @column_order],
-                columns => [@column_order] }, { layout => undef };
+                columns => [@column_order] }, { layout => 'noop' };
       }
       else {
           header( 'Content-Type' => 'text/comma-separated-values' );
           template 'ajax/report/generic_report_csv.tt',
               { results => \@results,
                 headings => [map {$column_config{$_}->{displayname}} @column_order],
-                columns => [@column_order] }, { layout => undef };
+                columns => [@column_order] }, { layout => 'noop' };
       }
   };
 }
diff --git a/lib/App/Netdisco/Web/Plugin/Device/Modules.pm b/lib/App/Netdisco/Web/Plugin/Device/Modules.pm
index 9917d59f..241aab54 100644
--- a/lib/App/Netdisco/Web/Plugin/Device/Modules.pm
+++ b/lib/App/Netdisco/Web/Plugin/Device/Modules.pm
@@ -24,7 +24,7 @@ ajax '/ajax/content/device/modules' => require_login sub {
     content_type('text/html');
     template 'ajax/device/modules.tt', {
       nodes => $results,
-    }, { layout => undef };
+    }, { layout => 'noop' };
 };
 
 true;
diff --git a/lib/App/Netdisco/Web/Plugin/Device/Ports.pm b/lib/App/Netdisco/Web/Plugin/Device/Ports.pm
index 3a2236b6..3fa630d7 100644
--- a/lib/App/Netdisco/Web/Plugin/Device/Ports.pm
+++ b/lib/App/Netdisco/Web/Plugin/Device/Ports.pm
@@ -218,7 +218,7 @@ get '/ajax/content/device/ports' => require_login sub {
           ips   => $ips_name,
           device => $device,
           vlans  => $vlans,
-        }, { layout => undef };
+        }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
@@ -228,7 +228,7 @@ get '/ajax/content/device/ports' => require_login sub {
           ips   => $ips_name,
           device => $device,
           vlans  => $vlans,
-        }, { layout => undef };
+        }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Device/Vlans.pm b/lib/App/Netdisco/Web/Plugin/Device/Vlans.pm
index e5111e07..827f469c 100644
--- a/lib/App/Netdisco/Web/Plugin/Device/Vlans.pm
+++ b/lib/App/Netdisco/Web/Plugin/Device/Vlans.pm
@@ -25,12 +25,12 @@ get '/ajax/content/device/vlans' => require_login sub {
     if (request->is_ajax) {
       my $json = to_json( \@results );
       template 'ajax/device/vlans.tt', { results => $json },
-        { layout => undef };
+        { layout => 'noop' };
     }
     else {
       header( 'Content-Type' => 'text/comma-separated-values' );
       template 'ajax/device/vlans_csv.tt', { results => \@results },
-        { layout => undef };
+        { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/ApChannelDist.pm b/lib/App/Netdisco/Web/Plugin/Report/ApChannelDist.pm
index 4b90afab..90823281 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/ApChannelDist.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/ApChannelDist.pm
@@ -29,11 +29,11 @@ get '/ajax/content/report/apchanneldist' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json( \@results );
-        template 'ajax/report/apchanneldist.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/apchanneldist.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
-        template 'ajax/report/apchanneldist_csv.tt', { results => \@results }, { layout => undef };
+        template 'ajax/report/apchanneldist_csv.tt', { results => \@results }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/ApClients.pm b/lib/App/Netdisco/Web/Plugin/Report/ApClients.pm
index 4b1ddcc8..33e256a4 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/ApClients.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/ApClients.pm
@@ -38,12 +38,12 @@ get '/ajax/content/report/apclients' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json( \@results );
-        template 'ajax/report/apclients.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/apclients.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/apclients_csv.tt',
-            { results => \@results }, { layout => undef };
+            { results => \@results }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/ApRadioChannelPower.pm b/lib/App/Netdisco/Web/Plugin/Report/ApRadioChannelPower.pm
index d0fa66b6..54ec63be 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/ApRadioChannelPower.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/ApRadioChannelPower.pm
@@ -39,7 +39,7 @@ get '/ajax/content/report/apradiochannelpower/data' => require_login sub {
 get '/ajax/content/report/apradiochannelpower' => require_login sub {
 
     if ( request->is_ajax ) {
-        template 'ajax/report/apradiochannelpower.tt', {}, { layout => undef };
+        template 'ajax/report/apradiochannelpower.tt', {}, { layout => 'noop' };
     }
     else {
         my @results
@@ -50,7 +50,7 @@ get '/ajax/content/report/apradiochannelpower' => require_login sub {
 
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/apradiochannelpower_csv.tt',
-            { results => \@results, }, { layout => undef };
+            { results => \@results, }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/DeviceAddrNoDNS.pm b/lib/App/Netdisco/Web/Plugin/Report/DeviceAddrNoDNS.pm
index 80c9f941..ae0c1fc1 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/DeviceAddrNoDNS.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/DeviceAddrNoDNS.pm
@@ -29,12 +29,12 @@ get '/ajax/content/report/deviceaddrnodns' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json (\@results);
-        template 'ajax/report/deviceaddrnodns.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/deviceaddrnodns.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/deviceaddrnodns_csv.tt',
-            { results => \@results, }, { layout => undef };
+            { results => \@results, }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/DeviceByLocation.pm b/lib/App/Netdisco/Web/Plugin/Report/DeviceByLocation.pm
index e9148817..233b647e 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/DeviceByLocation.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/DeviceByLocation.pm
@@ -25,12 +25,12 @@ get '/ajax/content/report/devicebylocation' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json( \@results );
-        template 'ajax/report/devicebylocation.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/devicebylocation.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/devicebylocation_csv.tt',
-            { results => \@results }, { layout => undef };
+            { results => \@results }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/DeviceDnsMismatch.pm b/lib/App/Netdisco/Web/Plugin/Report/DeviceDnsMismatch.pm
index da8ed090..e8a1ef3c 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/DeviceDnsMismatch.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/DeviceDnsMismatch.pm
@@ -28,12 +28,12 @@ get '/ajax/content/report/devicednsmismatch' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json( \@results );
-        template 'ajax/report/devicednsmismatch.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/devicednsmismatch.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/devicednsmismatch_csv.tt',
-            { results => \@results }, { layout => undef };
+            { results => \@results }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/DevicePoeStatus.pm b/lib/App/Netdisco/Web/Plugin/Report/DevicePoeStatus.pm
index 3998da61..b5617d49 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/DevicePoeStatus.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/DevicePoeStatus.pm
@@ -40,7 +40,7 @@ get '/ajax/content/report/devicepoestatus/data' => require_login sub {
 get '/ajax/content/report/devicepoestatus' => require_login sub {
 
     if ( request->is_ajax ) {
-        template 'ajax/report/devicepoestatus.tt', {}, { layout => undef };
+        template 'ajax/report/devicepoestatus.tt', {}, { layout => 'noop' };
     }
     else {
         my @results
@@ -51,7 +51,7 @@ get '/ajax/content/report/devicepoestatus' => require_login sub {
 
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/devicepoestatus_csv.tt',
-            { results => \@results, }, { layout => undef };
+            { results => \@results, }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/DuplexMismatch.pm b/lib/App/Netdisco/Web/Plugin/Report/DuplexMismatch.pm
index dc87792a..ab978a7c 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/DuplexMismatch.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/DuplexMismatch.pm
@@ -23,12 +23,12 @@ get '/ajax/content/report/duplexmismatch' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json( \@results );
-        template 'ajax/report/duplexmismatch.tt', { results => $json, }, { layout => undef };
+        template 'ajax/report/duplexmismatch.tt', { results => $json, }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/duplexmismatch_csv.tt',
-            { results => \@results, }, { layout => undef };
+            { results => \@results, }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/HalfDuplex.pm b/lib/App/Netdisco/Web/Plugin/Report/HalfDuplex.pm
index 7e24abdd..d6a65162 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/HalfDuplex.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/HalfDuplex.pm
@@ -30,12 +30,12 @@ get '/ajax/content/report/halfduplex' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json( \@results );
-        template 'ajax/report/halfduplex.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/halfduplex.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/halfduplex_csv.tt',
-            { results => \@results }, { layout => undef };
+            { results => \@results }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm b/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm
index 1b371cab..77f55118 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm
@@ -193,11 +193,11 @@ get '/ajax/content/report/ipinventory' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json( \@results );
-        template 'ajax/report/ipinventory.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/ipinventory.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
-        template 'ajax/report/ipinventory_csv.tt', { results => \@results, }, { layout => undef };
+        template 'ajax/report/ipinventory_csv.tt', { results => \@results, }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/ModuleInventory.pm b/lib/App/Netdisco/Web/Plugin/Report/ModuleInventory.pm
index 2d1e0584..221b8f3f 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/ModuleInventory.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/ModuleInventory.pm
@@ -131,13 +131,13 @@ get '/ajax/content/report/moduleinventory' => require_login sub {
         my $json = to_json( \@results );
         template 'ajax/report/moduleinventory.tt',
             { results => $json, opt => $has_opt },
-            { layout => undef };
+            { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/moduleinventory_csv.tt',
             { results => \@results, opt => $has_opt },
-            { layout => undef };
+            { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/Netbios.pm b/lib/App/Netdisco/Web/Plugin/Report/Netbios.pm
index 3aee2dda..83f0ea25 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/Netbios.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/Netbios.pm
@@ -97,13 +97,13 @@ get '/ajax/content/report/netbios' => require_login sub {
         my $json = to_json( \@results );
         template 'ajax/report/netbios.tt',
             { results => $json, opt => $domain },
-            { layout => undef };
+            { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/netbios_csv.tt',
             { results => \@results, opt => $domain },
-            { layout => undef };
+            { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/NodeMultiIPs.pm b/lib/App/Netdisco/Web/Plugin/Report/NodeMultiIPs.pm
index c6900ccc..30303f70 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/NodeMultiIPs.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/NodeMultiIPs.pm
@@ -38,12 +38,12 @@ get '/ajax/content/report/nodemultiips' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json( \@results );
-        template 'ajax/report/nodemultiips.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/nodemultiips.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/nodemultiips_csv.tt',
-            { results => \@results }, { layout => undef };
+            { results => \@results }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/NodeVendor.pm b/lib/App/Netdisco/Web/Plugin/Report/NodeVendor.pm
index 6be6aa35..480fcb93 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/NodeVendor.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/NodeVendor.pm
@@ -120,13 +120,13 @@ get '/ajax/content/report/nodevendor' => require_login sub {
         my $json = to_json( \@results );
         template 'ajax/report/nodevendor.tt',
             { results => $json, opt => $vendor },
-            { layout => undef };
+            { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/nodevendor_csv.tt',
             { results => \@results, opt => $vendor },
-            { layout => undef };
+            { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/NodesDiscovered.pm b/lib/App/Netdisco/Web/Plugin/Report/NodesDiscovered.pm
index f1d77a90..a55178e0 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/NodesDiscovered.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/NodesDiscovered.pm
@@ -64,12 +64,12 @@ get '/ajax/content/report/nodesdiscovered' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json( \@results );
-        template 'ajax/report/nodesdiscovered.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/nodesdiscovered.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/nodesdiscovered_csv.tt',
-            { results => \@results }, { layout => undef };
+            { results => \@results }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm b/lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm
index 41798dea..a1dfdb14 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm
@@ -32,12 +32,12 @@ get '/ajax/content/report/portadmindown' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json (\@results);
-        template 'ajax/report/portadmindown.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/portadmindown.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/portadmindown_csv.tt',
-            { results => \@results, }, { layout => undef };
+            { results => \@results, }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/PortBlocking.pm b/lib/App/Netdisco/Web/Plugin/Report/PortBlocking.pm
index 5efcb8d8..8cef49a9 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/PortBlocking.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/PortBlocking.pm
@@ -32,12 +32,12 @@ get '/ajax/content/report/portblocking' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json (\@results);
-        template 'ajax/report/portblocking.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/portblocking.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/portblocking_csv.tt',
-            { results => \@results, }, { layout => undef };
+            { results => \@results, }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/PortLog.pm b/lib/App/Netdisco/Web/Plugin/Report/PortLog.pm
index dd5b97cf..5d3e7409 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/PortLog.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/PortLog.pm
@@ -60,7 +60,7 @@ ajax '/ajax/content/report/portlog' => require_login sub {
     content_type('text/html');
     template 'ajax/report/portlog.tt', {
       results => $set,
-    }, { layout => undef };
+    }, { layout => 'noop' };
 };
 
 true;
diff --git a/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm b/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm
index a7551b8a..2b4790d0 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm
@@ -46,12 +46,12 @@ get '/ajax/content/report/portmultinodes' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json (\@results);
-        template 'ajax/report/portmultinodes.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/portmultinodes.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/portmultinodes_csv.tt',
-            { results => \@results, }, { layout => undef };
+            { results => \@results, }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/PortSsid.pm b/lib/App/Netdisco/Web/Plugin/Report/PortSsid.pm
index 66dcafca..f0970ca6 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/PortSsid.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/PortSsid.pm
@@ -71,12 +71,12 @@ get '/ajax/content/report/portssid' => require_login sub {
     if ( request->is_ajax ) {
         my $json = to_json( \@results );
         template 'ajax/report/portssid.tt',
-            { results => $json, opt => $ssid }, { layout => undef };
+            { results => $json, opt => $ssid }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
         template 'ajax/report/portssid_csv.tt',
-            { results => \@results, opt => $ssid }, { layout => undef };
+            { results => \@results, opt => $ssid }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm b/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm
index 9402c6e3..5cbed3e9 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/PortUtilization.pm
@@ -37,11 +37,11 @@ get '/ajax/content/report/portutilization' => require_login sub {
 
     if (request->is_ajax) {
         my $json = to_json (\@results);
-        template 'ajax/report/portutilization.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/portutilization.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
-        template 'ajax/report/portutilization_csv.tt', { results => \@results, }, { layout => undef };
+        template 'ajax/report/portutilization_csv.tt', { results => \@results, }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/PortVLANMismatch.pm b/lib/App/Netdisco/Web/Plugin/Report/PortVLANMismatch.pm
index 0b2729ec..6fc0cbcd 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/PortVLANMismatch.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/PortVLANMismatch.pm
@@ -21,11 +21,11 @@ get '/ajax/content/report/portvlanmismatch' => require_login sub {
 
     if (request->is_ajax) {
         my $json = to_json (\@results);
-        template 'ajax/report/portvlanmismatch.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/portvlanmismatch.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
-        template 'ajax/report/portvlanmismatch_csv.tt', { results => \@results, }, { layout => undef };
+        template 'ajax/report/portvlanmismatch_csv.tt', { results => \@results, }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/SsidInventory.pm b/lib/App/Netdisco/Web/Plugin/Report/SsidInventory.pm
index 29e44cdd..9a7844b3 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/SsidInventory.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/SsidInventory.pm
@@ -23,11 +23,11 @@ get '/ajax/content/report/ssidinventory' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json( \@results );
-        template 'ajax/report/portssid.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/portssid.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
-        template 'ajax/report/portssid_csv.tt', { results => \@results }, { layout => undef };
+        template 'ajax/report/portssid_csv.tt', { results => \@results }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm b/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm
index 57f40750..c4351a03 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/SubnetUtilization.pm
@@ -48,11 +48,11 @@ get '/ajax/content/report/subnets' => require_login sub {
     return unless scalar @results;
 
     if ( request->is_ajax ) {
-        template 'ajax/report/subnets.tt', { results => \@results }, { layout => undef };
+        template 'ajax/report/subnets.tt', { results => \@results }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
-        template 'ajax/report/subnets_csv.tt', { results => \@results }, { layout => undef };
+        template 'ajax/report/subnets_csv.tt', { results => \@results }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Report/VlanInventory.pm b/lib/App/Netdisco/Web/Plugin/Report/VlanInventory.pm
index 1cc99f4d..5fd56cda 100644
--- a/lib/App/Netdisco/Web/Plugin/Report/VlanInventory.pm
+++ b/lib/App/Netdisco/Web/Plugin/Report/VlanInventory.pm
@@ -37,11 +37,11 @@ get '/ajax/content/report/vlaninventory' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json (\@results);
-        template 'ajax/report/vlaninventory.tt', { results => $json }, { layout => undef };
+        template 'ajax/report/vlaninventory.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
-        template 'ajax/report/vlaninventory_csv.tt', { results => \@results }, { layout => undef };
+        template 'ajax/report/vlaninventory_csv.tt', { results => \@results }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Search/Device.pm b/lib/App/Netdisco/Web/Plugin/Search/Device.pm
index 75eeefbe..76306878 100644
--- a/lib/App/Netdisco/Web/Plugin/Search/Device.pm
+++ b/lib/App/Netdisco/Web/Plugin/Search/Device.pm
@@ -87,11 +87,11 @@ get '/ajax/content/search/device' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json( \@results );
-        template 'ajax/search/device.tt', { results => $json }, { layout => undef };;
+        template 'ajax/search/device.tt', { results => $json }, { layout => 'noop' };;
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
-        template 'ajax/search/device_csv.tt', { results => \@results, }, { layout => undef };
+        template 'ajax/search/device_csv.tt', { results => \@results, }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Search/Node.pm b/lib/App/Netdisco/Web/Plugin/Search/Node.pm
index fdc8badb..30c2fda1 100644
--- a/lib/App/Netdisco/Web/Plugin/Search/Node.pm
+++ b/lib/App/Netdisco/Web/Plugin/Search/Node.pm
@@ -190,7 +190,7 @@ get '/ajax/content/search/node' => require_login sub {
           ports     => $ports,
           wireless  => $wireless,
           netbios   => $netbios,
-        }, { layout => undef };
+        }, { layout => 'noop' };
     }
     else {
         my $ports = param('deviceports')
@@ -203,7 +203,7 @@ get '/ajax/content/search/node' => require_login sub {
               ports     => $ports,
               wireless  => $wireless,
               netbios   => $netbios,
-            }, { layout => undef };
+            }, { layout => 'noop' };
         }
     }
 
@@ -248,7 +248,7 @@ get '/ajax/content/search/node' => require_login sub {
     return template 'ajax/search/node_by_ip.tt', {
       macs => $set,
       archive_filter => {@active},
-    }, { layout => undef };
+    }, { layout => 'noop' };
 };
 
 true;
diff --git a/lib/App/Netdisco/Web/Plugin/Search/Port.pm b/lib/App/Netdisco/Web/Plugin/Search/Port.pm
index 60210adb..e93d2e9a 100644
--- a/lib/App/Netdisco/Web/Plugin/Search/Port.pm
+++ b/lib/App/Netdisco/Web/Plugin/Search/Port.pm
@@ -100,11 +100,11 @@ get '/ajax/content/search/port' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json( \@results );
-        template 'ajax/search/port.tt', { results => $json }, { layout => undef };
+        template 'ajax/search/port.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
-        template 'ajax/search/port_csv.tt', { results => \@results }, { layout => undef };
+        template 'ajax/search/port_csv.tt', { results => \@results }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Plugin/Search/VLAN.pm b/lib/App/Netdisco/Web/Plugin/Search/VLAN.pm
index 8e97f90c..3bd47476 100644
--- a/lib/App/Netdisco/Web/Plugin/Search/VLAN.pm
+++ b/lib/App/Netdisco/Web/Plugin/Search/VLAN.pm
@@ -40,11 +40,11 @@ get '/ajax/content/search/vlan' => require_login sub {
 
     if (request->is_ajax) {
         my $json = to_json( \@results );
-        template 'ajax/search/vlan.tt', { results => $json }, { layout => undef };
+        template 'ajax/search/vlan.tt', { results => $json }, { layout => 'noop' };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
-        template 'ajax/search/vlan_csv.tt', { results => \@results }, { layout => undef };
+        template 'ajax/search/vlan_csv.tt', { results => \@results }, { layout => 'noop' };
     }
 };
 
diff --git a/lib/App/Netdisco/Web/Statistics.pm b/lib/App/Netdisco/Web/Statistics.pm
index 07a929a1..9c523a68 100644
--- a/lib/App/Netdisco/Web/Statistics.pm
+++ b/lib/App/Netdisco/Web/Statistics.pm
@@ -14,7 +14,7 @@ get '/ajax/content/statistics' => require_login sub {
     var( nav => 'statistics' );
     template 'ajax/statistics.tt',
         { stats => $stats },
-        { layout => undef };
+        { layout => 'noop' };
 };
 
 true;