diff --git a/Netdisco/lib/Netdisco/DB/Result/NodeIp.pm b/Netdisco/lib/Netdisco/DB/Result/NodeIp.pm
index 24291132..65d74366 100644
--- a/Netdisco/lib/Netdisco/DB/Result/NodeIp.pm
+++ b/Netdisco/lib/Netdisco/DB/Result/NodeIp.pm
@@ -69,6 +69,7 @@ __PACKAGE__->belongs_to( oui => 'Netdisco::DB::Result::Oui',
               { '=' => \"substring(cast($args->{self_alias}.mac as varchar) for 8)" }
         };
     }
+    , { join_type => 'LEFT' }
 );
 
 __PACKAGE__->has_many( node_ips => 'Netdisco::DB::Result::NodeIp',
diff --git a/Netdisco/views/index.tt b/Netdisco/views/index.tt
index 74c2e0d2..abcbd99f 100644
--- a/Netdisco/views/index.tt
+++ b/Netdisco/views/index.tt
@@ -34,7 +34,7 @@
       [% ELSE %]
       <div class="alert-message success fade in" data-alert="on">
         <a class="close" href="#">×</a>
-        <p>Hit <strong>Enter</strong> in the Search box to view the current Inventory.</p>
+        <p>Hit <strong>Enter</strong> in the Search box to view the current Inventory (<em>temporary feature</em>).</p>
       </div>
       [% END %]
       <div class="hero-unit">
diff --git a/Netdisco/views/layouts/main.tt b/Netdisco/views/layouts/main.tt
index 1fb4546b..05899de0 100644
--- a/Netdisco/views/layouts/main.tt
+++ b/Netdisco/views/layouts/main.tt
@@ -57,7 +57,7 @@
         [% END %]
       </ul>
       <form method="get" action="[% uri_for('/search') %]">
-        <input placeholder="Search" class="span5" name="q" type="text"/>
+        <input placeholder="Device, Node or VLAN Search" class="span5" name="q" type="text"/>
       </form>
       <ul class="nav secondary-nav">
         <li class="menu">