diff --git a/src/main/resources/public/js/emissary.js b/src/main/resources/public/js/emissary.js
index 493edbdbc4..d54264fb95 100644
--- a/src/main/resources/public/js/emissary.js
+++ b/src/main/resources/public/js/emissary.js
@@ -1,31 +1,61 @@
 $(document).ready(function () {
-    $.ajaxSetup({
-        beforeSend: function(xhr, settings) {
-            if (!(/^(GET|HEAD|OPTIONS)$/.test(settings.type)) && !this.crossDomain) {
-                xhr.setRequestHeader('X-Requested-By', 'emissary');
-            }
-        }
-    });
+  $.ajaxSetup({
+    beforeSend: function(xhr, settings) {
+      if (!(/^(GET|HEAD|OPTIONS)$/.test(settings.type)) && !this.crossDomain) {
+        xhr.setRequestHeader('X-Requested-By', 'emissary');
+      }
+    }
+  });
 
-    $.get('/emissary/Nav.action', function( data ) {
-        $('header').prepend(data);
+  $.get('/emissary/Nav.action', function( data ) {
+    $('header').prepend(data);
 
-        var url = window.location.pathname;
-        $('ul.navbar-nav a[href="'+ url +'"]').parent().addClass('active');
-        $('ul.navbar-nav a').filter(function() {
-             return this.href == url;
-        }).parent().addClass('active');
+    var url = window.location.pathname;
+    $('ul.navbar-nav a[href="'+ url +'"]').parent().addClass('active');
+    $('ul.navbar-nav a').filter(function() {
+      return this.href == url;
+    }).parent().addClass('active');
 
-        document.title = document.title + ' - ' + $('#app-name').text();
-    });
+    document.title = document.title + ' - ' + $('#app-name').text();
+  });
 });
 
 function doPost( url, messageHolderId) {
-    $.post(url)
-        .done(function(data){
-            $("#" + messageHolderId).append(data);
-        })
-        .fail(function(){
-            $("#" + messageHolderId).append("request failed!");
-        });
+  $.post(url)
+    .done(function(data){
+      $("#" + messageHolderId).append(data);
+    })
+    .fail(function(){
+      $("#" + messageHolderId).append("request failed!");
+    });
+}
+
+function searchTable() {
+  let input, filter, table, tr, td, i, txtValue;
+  let result = 0;
+  input = document.getElementById("searchInput");
+  filter = input.value.toUpperCase();
+  table = document.getElementById("tableToSearch");
+  tr = table.getElementsByTagName("tr");
+
+  for (i = 0; i < tr.length; i++) {
+    td = tr[i].getElementsByTagName("td")[0];
+    if (td) {
+      txtValue = td.textContent || td.innerText;
+      if (txtValue.toUpperCase().indexOf(filter) > -1) {
+        tr[i].style.display = "";
+        if (tr[i - 1].getElementsByTagName("td").length == 1) {
+          tr[i - 1].style.display = "";
+        }
+        result += 1;
+      } else {
+        tr[i].style.display = "none";
+      }
+    }
+  }
+  if (result == 0) {
+    document.getElementById("empty-message").style.display = "";
+  } else {
+    document.getElementById("empty-message").style.display = "none";
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/dump_directory.mustache b/src/main/resources/templates/dump_directory.mustache
index 3633a617f1..de51bbba52 100644
--- a/src/main/resources/templates/dump_directory.mustache
+++ b/src/main/resources/templates/dump_directory.mustache
@@ -3,7 +3,7 @@
   <head>
     <title>Directory Listing</title>
     <link rel="stylesheet" href="/css/lib/bootstrap.min.css">
-      <link type="text/css" rel="stylesheet" href="/css/emissary.css"/>
+    <link type="text/css" rel="stylesheet" href="/css/emissary.css"/>
   </head>
 
   <body>
@@ -11,33 +11,43 @@
   <main class="container">
     <h2>Directory Listing</h2>
     <h6>{{directory-label}}</h6>
-    <p/>
-    <h4>Directory Entries</h4>
-    <table class="table table-striped">
-       <thead>
-          <tr>
-              <th>Key</th>
-              <th>Cost</th>
-              <th>Quality</th>
-              <th title="Computed from Cost and quality">Expense</th>
-              <th title="HH:MM:SS">Age</th>
-          </tr>
-       </thead>
-       <tbody>
+    <p></p>
+      <div class="row">
+        <div class="col-md-10">
+          <h4>Directory Entries</h4>
+        </div>
+        <div class="col-md-2">
+          <label>
+            <input type="text" id="searchInput" onkeyup="searchTable()" placeholder="Search for Place...">
+          </label>
+        </div>
+      </div>
+    <table class="table table-striped" id="tableToSearch">
+      <thead>
+        <tr>
+          <th>Key</th>
+          <th>Cost</th>
+          <th>Quality</th>
+          <th title="Computed from Cost and quality">Expense</th>
+          <th title="HH:MM:SS">Age</th>
+        </tr>
+      </thead>
+      <tbody>
        {{#entrykeys}}
          {{#dataId}}<tr class="sep"><td colspan="6">{{.}}</td></tr>{{/dataId}}
          {{#entrylist}}
          <tr class='{{stripe}}'>
-            <td>{{key}}</td>
-            <td class="num">{{cost}}</td>
-            <td class="num">{{quality}}</td>
-            <td class="num">{{expense}}</td>
-            <td class="num">{{age}}</td>
+           <td>{{key}}</td>
+           <td class="num">{{cost}}</td>
+           <td class="num">{{quality}}</td>
+           <td class="num">{{expense}}</td>
+           <td class="num">{{age}}</td>
           </tr>
          {{/entrylist}}
        {{/entrykeys}}
-       </tbody>
+      </tbody>
     </table>
+    <p id="empty-message" style="display: none; width: 99%; text-align: center;"><b><i>No places found in table...</i></b></p>
 
     <h4>Peer Directories</h4>
     <ul>
@@ -47,10 +57,10 @@
     </ul>
   </main>
 
-    <script src="/js/lib/jquery.min.js"></script>
-    <script src="/js/lib/popper.min.js"></script>
-    <script src="/js/lib/bootstrap.min.js"></script>
-    <script src="/js/emissary.js" type="text/javascript" ></script>
+  <script src="/js/lib/jquery.min.js"></script>
+  <script src="/js/lib/popper.min.js"></script>
+  <script src="/js/lib/bootstrap.min.js"></script>
+  <script src="/js/emissary.js" type="text/javascript" ></script>
 
   </body>
 </html>

Key	Cost	Quality	Expense	Age
{{.}}
{{key}}	{{cost}}	{{quality}}	{{expense}}	{{age}}	{{key}}	{{cost}}	{{quality}}	{{expense}}	{{age}}