diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
index 19fa41dd..fdd2f022 100644
--- a/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
@@ -74,8 +74,8 @@ sub search_aliases {
     else {
         $q = "\%$q\%" if $q !~ m/\%/;
         $clause = [
-            'me.ip::text'  => { '-ilike' => $q },
-            'device_ips.alias::text' => { '-ilike' => $q },
+            'me.dns'  => { '-ilike' => $q },
+            'device_ips.dns' => { '-ilike' => $q },
         ];
     }
 
diff --git a/Netdisco/lib/App/Netdisco/Web/Device.pm b/Netdisco/lib/App/Netdisco/Web/Device.pm
index 3af1247c..867a1199 100644
--- a/Netdisco/lib/App/Netdisco/Web/Device.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Device.pm
@@ -90,14 +90,13 @@ get '/device' => sub {
     my $q = param('q');
     my $dev = schema('netdisco')->resultset('Device')->single({
         -or => [
-            ip => $q,
-            dns => $q,
+            'me.ip::text' => $q,
+            'me.dns' => $q,
         ],
     });
 
-    if (! $dev) {
-        redirect uri_for('/', {nosuchdevice => 1});
-        return;
+    if (!defined $dev) {
+        return redirect uri_for('/', {nosuchdevice => 1});
     }
 
     params->{'tab'} ||= 'details';