diff --git a/index.php b/index.php
index f3b9e8d..78d1ee9 100644
--- a/index.php
+++ b/index.php
@@ -116,6 +116,36 @@ if ($blocklogin === TRUE) {
     <div id="clearlogs" style="display: none;">
         Are you sure you want to clear all the logs? Maybe save them first?
     </div>
+    <div id="searchlogs" style="display: none; text-align: right;">
+        <table border="0">
+        <tr><td>User:</td><td><input type="text" id ="searchlogs-user"><br></td></tr>
+        <tr><td>Log Entry:</td><td><input type="text" id ="searchlogs-entry"></td></tr>
+        </table>
+    </div>
+    <div id="searchzone" style="display: none; text-align: right;">
+        <table border="0">
+        <tr><td>Label:</td><td><input type="text" id ="searchzone-label"><br></td></tr>
+        <tr><td>Type:</td><td style="text-align: left;"><select id="searchzone-type">
+            <option value=""></option>
+            <option value="A">A</option>
+            <option value="AAAA">AAAA</option>
+            <option value="CERT">CERT</option>
+            <option value="CNAME">CNAME</option>
+            <option value="LOC">LOC</option>
+            <option value="MX">MX</option>
+            <option value="NAPTR">NAPTR</option>
+            <option value="NS">NS</option>
+            <option value="PTR">PTR</option>
+            <option value="SOA">SOA</option>
+            <option value="SPF">SPF</option>
+            <option value="SRV">SRV</option>
+            <option value="SSHFP">SSHFP</option>
+            <option value="TLSA">TLSA</option>
+            <option value="TXT">TXT</option>
+        </select><br></td></tr>
+        <tr><td>Content:</td><td><input type="text" id ="searchzone-content"></td></tr>
+        </table>
+    </div>
     <div id="menu" class="jtable-main-container <?php if ($menutype === 'horizontal') { ?>horizontal<?php } ?>">
         <div class="jtable-title menu-title">
             <div class="jtable-title-text">
@@ -473,6 +503,40 @@ $(document).ready(function () {
                             addNewRecord: 'Add to ' + zone.name,
                             noDataAvailable: 'No records for ' + zone.name
                         },
+                        toolbar: {
+                            items: [
+                                {
+                                    text: 'Search zone',
+                                    click: function() {
+                                        $("#searchzone").dialog({
+                                            modal: true,
+                                            title: "Search zone for ...",
+                                            width: 'auto',
+                                            buttons: {
+                                                Search: function() {
+                                                    $( this ).dialog( 'close' );
+                                                    opentable.find('.jtable-title-text').text(opentableTitle + " (filtered)");
+                                                    opentable.jtable('load', {
+                                                        label: $('#searchzone-label').val(),
+                                                        type: $('#searchzone-type').val(),
+                                                        content: $('#searchzone-content').val()
+                                                    });
+                                                },
+                                                Reset: function() {
+                                                    $('#searchzone-label').val('');
+                                                    $('#searchzone-type').val('');
+                                                    $('#searchzone-content').val('');
+                                                    $( this ).dialog( 'close' );
+                                                    opentable.find('.jtable-title-text').text(opentableTitle);
+                                                    opentable.jtable('load');
+                                                    return false;
+                                                }
+                                            }
+                                        });
+                                    }
+                                }
+                            ],
+                        },
                         paging: true,
                         sorting: true,
                         pageSize: 20,
@@ -609,6 +673,8 @@ $(document).ready(function () {
                             },
                         }
                     }, function (data) {
+                        opentable=data.childTable;
+                        opentableTitle=opentable.find('.jtable-title-text').text();
                         data.childTable.jtable('load');
                     });
             });
@@ -949,6 +1015,34 @@ $(document).ready(function () {
             hoverAnimationDuration: 60,
             hoverAnimationEasing: undefined,
             items: [
+                {
+                    text: 'Search logs',
+                    click: function() {
+                        $("#searchlogs").dialog({
+                            modal: true,
+                            title: "Search logs for ...",
+                            width: 'auto',
+                            buttons: {
+                                Search: function() {
+                                    $( this ).dialog( 'close' );
+                                    $('#Logs').find('.jtable-title-text').text('Logs (filtered)');
+                                    $('#Logs').jtable('load', {
+                                        user: $('#searchlogs-user').val(),
+                                        entry: $('#searchlogs-entry').val()
+                                    });
+                                },
+                                Reset: function() {
+                                    $('#searchlogs-user').val('');
+                                    $('#searchlogs-entry').val('');
+                                    $( this ).dialog( 'close' );
+                                    $('#Logs').find('.jtable-title-text').text('Logs');
+                                    $('#Logs').jtable('load');
+                                    return false;
+                                }
+                            }
+                        });
+                    }
+                },
                 {
                     icon: 'img/delete_inverted.png',
                     text: 'Clear logs',
diff --git a/logs.php b/logs.php
index de379d4..1f4d32f 100644
--- a/logs.php
+++ b/logs.php
@@ -27,7 +27,25 @@ case "list":
     if ($logging !== TRUE)
         jtable_respond(null, 'error', 'Logging is disabled');
 
-    jtable_respond(getlogs());
+    $entries=getlogs();
+
+    if(!empty($_POST['user'])) {
+        $entries=array_filter($entries,
+            function ($val) {
+                return(stripos($val['user'], $_POST['user']) !== FALSE);
+            }
+        );
+    }
+
+    if(!empty($_POST['entry'])) {
+        $entries=array_filter($entries,
+            function ($val) {
+                return(stripos($val['log'], $_POST['entry']) !== FALSE);
+            }
+        );
+    }
+
+    jtable_respond($entries);
     break;
 
 case "delete":
diff --git a/zones.php b/zones.php
index b7f1ca5..b3618a0 100644
--- a/zones.php
+++ b/zones.php
@@ -188,6 +188,31 @@ case "listrecords":
     $zone = new Zone();
     $zone->parse($zonedata);
     $records = $zone->rrsets2records();
+
+    if(!empty($_POST['label'])) {
+        $records=array_filter($records,
+            function ($val) {
+                return(stripos($val['name'], $_POST['label']) !== FALSE);
+            }
+        );
+    }
+
+    if(!empty($_POST['type'])) {
+        $records=array_filter($records,
+            function ($val) {
+                return($val['type'] == $_POST['type']);
+            }
+        );
+    }
+
+    if(!empty($_POST['content'])) {
+        $records=array_filter($records,
+            function ($val) {
+                return(stripos($val['content'], $_POST['content']) !== FALSE);
+            }
+        );
+    }
+
     if (isset($_GET['jtSorting'])) {
         list($scolumn, $sorder) = preg_split("/ /", $_GET['jtSorting']);
         switch ($scolumn) {
@@ -488,4 +513,4 @@ default:
 }
 } catch (Exception $e) {
     jtable_respond(null, 'error', $e->getMessage());
-}
\ No newline at end of file
+}