diff --git a/src/www/diag_tables.php b/src/www/diag_tables.php
index 551a5a51f..9b2eef5ea 100644
--- a/src/www/diag_tables.php
+++ b/src/www/diag_tables.php
@@ -1,84 +1,88 @@
 <?php
 
 /*
-	Copyright (C) 2014 Deciso B.V.
-	Copyright (C) 2010 Jim Pingle
+  Copyright (C) 2014 Deciso B.V.
+  Copyright (C) 2010 Jim Pingle
 
-	Portions borrowed from diag_dump_states.php:
-	Copyright (C) 2010 Scott Ullrich
-	All rights reserved.
+  Portions borrowed from diag_dump_states.php:
+  Copyright (C) 2010 Scott Ullrich
+  All rights reserved.
 
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
 
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
 
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
 
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
+  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+  OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
 */
 
-$pgtitle = array(gettext("Diagnostics"), gettext("Tables"));
-$shortcut_section = "aliases";
-
 require_once("guiconfig.inc");
 
-// Set default table
-$tablename = "sshlockout";
-
-if($_REQUEST['type'])
-	$tablename = $_REQUEST['type'];
-
-if($_REQUEST['delete']) {
-	if(is_ipaddr($_REQUEST['delete']) || is_subnet($_REQUEST['delete'])) {
-		exec("/sbin/pfctl -t " . escapeshellarg($_REQUEST['type']) . " -T delete " . escapeshellarg($_REQUEST['delete']), $delete);
-		echo htmlentities($_REQUEST['delete']);
-	}
-	exit;
+if ($_SERVER['REQUEST_METHOD'] === 'GET') {
+    if (!empty($_GET['tablename'])) {
+        $tablename = htmlspecialchars($_GET['tablename']);
+    } else {
+        // Set default table
+        $tablename = "sshlockout";
+    }
+    if (isset($_GET['savemsg'])) {
+        $savemsg = htmlspecialchars($_GET['savemsg']);
+    }
+} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    if (!empty($_POST['tablename'])) {
+          $tablename = $_POST['tablename'];
+    }
+    if (isset($_POST['act']) && $_POST['act'] == 'update_bogons') {
+        try {
+            configd_run("filter update bogons");
+        } catch (Exception $e) {
+            $savemsg = gettext("The bogons database has NOT been updated.");
+        } finally {
+            $savemsg = gettext("The bogons database has been updated.");
+        }
+        echo $savemsg;
+        exit;
+    } elseif (isset($_POST['act']) && $_POST['act'] == 'delete') {
+        // delete entry
+        if((is_ipaddr($_REQUEST['address']) || is_subnet($_REQUEST['address'])) && !empty($tablename)) {
+              $delEntry = escapeshellarg($_REQUEST['address']);
+              $delTable = escapeshellarg($tablename);
+              configd_run("filter delete table {$delTable} {$delEntry}");
+              header("Location: diag_tables.php?tablename=" . $tablename);
+              exit;
+        }
+    } elseif (isset($_POST['act']) && $_POST['act'] == 'flush')  {
+        $delTable = escapeshellarg($tablename);
+        configd_run("filter delete table {$delTable} ALL");
+        header("Location: diag_tables.php?tablename=" . $tablename);
+        exit;
+    }
 }
 
-if($_REQUEST['deleteall']) {
-	exec("/sbin/pfctl -t " . escapeshellarg($tablename) . " -T show", $entries);
-	if(is_array($entries)) {
-		foreach($entries as $entryA) {
-			$entry = trim($entryA);
-			exec("/sbin/pfctl -t " . escapeshellarg($tablename) . " -T delete " . escapeshellarg($entry), $delete);
-		}
-	}
+$pgtitle = array(gettext("Diagnostics"), gettext("Tables"));
+$shortcut_section = "aliases";
+// fetch list of tables and content of selected table
+$tables = json_decode(configd_run("filter list tables json"));
+if (in_array($tablename, $tables)) {
+    $entries = json_decode(configd_run("filter list table {$tablename} json"));
+} else {
+    $entries = array();
 }
 
-if((($tablename == "bogons") || ($tablename == "bogonsv6")) && ($_POST['Download'])) {
-	mwexec_bg('/usr/local/etc/rc.update_bogons now');
-	$maxtimetowait = 0;
-	$loading = true;
-	while($loading == true) {
-		$isrunning = `/bin/ps awwwux | /usr/bin/grep -v grep | /usr/bin/grep bogons`;
-		if($isrunning == "")
-			$loading = false;
-		$maxtimetowait++;
-		if($maxtimetowait > 89)
-			$loading = false;
-		sleep(1);
-	}
-	if($maxtimetowait < 90)
-		$savemsg = gettext("The bogons database has been updated.");
-}
-
-exec("/sbin/pfctl -t " . escapeshellarg($tablename) . " -T show", $entries);
-exec("/sbin/pfctl -sT", $tables);
-
 include("head.inc");
 ?>
 <body>
@@ -86,100 +90,113 @@ include("head.inc");
 
 
 <script type="text/javascript">
-//<![CDATA[
-	function method_change(entrytype) {
-		window.location='diag_tables.php?type=' + entrytype;
-	}
-	function del_entry(entry) {
-		jQuery.ajax("diag_tables.php?type=<?php echo htmlspecialchars($tablename);?>&delete=" + entry, {
-		complete: function(response) {
-			if (200 == response.status) {
-				// Escape all dots to not confuse jQuery selectors
-				name = response.responseText.replace(/\./g,'\\.');
-				name = name.replace(/\//g,'\\/');
-				jQuery('#' + name).fadeOut(1000);
-			}
-		}
-		});
-	}
-//]]>
+$( document ).ready(function() {
+    // on change pfTable selection
+     $("#tablename").change(function(){
+         window.location='diag_tables.php?tablename=' + $(this).val();
+     });
+
+    // delete entry
+    $(".act_delete").click(function(event){
+        event.preventDefault()
+        var address = $(this).attr("data-address");
+        $("#address").val(address);
+        $("#action").val("delete");
+        $("#iform").submit();
+    });
+
+    // update bogons
+    $("#update_bogons").click(function(event){
+        event.preventDefault()
+        $("#update_bogons_progress").addClass("fa fa-spinner fa-pulse");
+        //update_bogons
+        jQuery.ajax({
+            type: "post",
+            url: "/diag_tables.php",
+            data:{'act':'update_bogons'},
+            success: function(data) {
+                // reload page when finished, send result as savemessage.
+                window.location='diag_tables.php?tablename=' + $("#tablename").val()+'&savemsg='+data;
+            }
+        });
+    });
+
+    // flush table.. first ask user if it's ok to do so..
+    $("#flushtable").click(function(event){
+      event.preventDefault()
+      BootstrapDialog.show({
+        type:BootstrapDialog.TYPE_INFO,
+        title: "<?= gettext("Tables");?>",
+        message: "<?=gettext("Do you really want to flush this table?");?>",
+        buttons: [{
+          label: "<?= gettext("No");?>",
+          action: function(dialogRef) {
+            dialogRef.close();
+          }}, {
+            label: "<?= gettext("Yes");?>",
+            action: function(dialogRef) {
+              $("#action").val("flush");
+              $("#iform").submit()
+            }
+          }]
+      });
+    });
+});
 </script>
 
 <section class="page-content-main">
-	<div class="container-fluid">
-		<div class="row">
-		    <form method="post" action="<?=$_SERVER['REQUEST_URI'];?>">
-			<section class="col-xs-12">
-
-
-				<?php if (isset($savemsg)) print_info_box($savemsg); ?>
-
-
-				<select id="type" onchange="method_change(jQuery('#type').val());" name="type" class='form-control'>
-					<option value="">Table</option>
-					<?php foreach ($tables as $table) {
-						echo "<option value=\"{$table}\"";
-						if ($tablename == $table)
-							echo " selected=\"selected\"";
-						echo ">{$table}</option>\n";
-						}
-					?>
-				</select>
-
-			</section>
-
-			<section class="col-xs-12">
-				  <div class="content-box">
-
-                    <div class="table-responsive">
-
-						<table class="table table-striped table-sort sortable __nomb">
-							<tr>
-								<td class="listhdrr"><?=gettext("IP Address");?></td>
-							</tr>
-						<?php $count = 0; foreach($entries as $entryA): ?>
-							<?php $entry = trim($entryA); ?>
-							<tr id="<?=$entry?>">
-								<td>
-									<?php echo $entry; ?>
-								</td>
-								<td>
-									<?php if ( ($tablename != "bogons") && ($tablename != "bogonsv6") ) { ?>
-									<a onclick="del_entry('<?=htmlspecialchars($entry)?>');" alt="delete">
-										<span class="glyphicon glyphicon-remove"></span>
-									</a>
-									<?php } ?>
-								</td>
-							</tr>
-						<?php $count++; endforeach; ?>
-						<?php
-							if($count == 0)
-								if( ($tablename == "bogons") || ($tablename == "bogonsv6") )
-									echo "<tr><td>" . gettext("No entries exist in this table.") . "&nbsp;&nbsp;" . "<input name=\"Download\" type=\"submit\" class=\"formbtn\" value=\"" . gettext("Download") . "\" /> " . gettext(" the latest bogon data.");
-								else
-									echo "<tr><td>" . gettext("No entries exist in this table.");
-						?>
-
-						<?php
-							if($count > 0)
-								if( ($tablename == "bogons") || ($tablename == "bogonsv6") ) {
-									$last_updated = exec('/usr/bin/grep -i -m 1 -E "^# last updated" /etc/' . escapeshellarg($tablename));
-									echo "<tr><td>&nbsp;<b>$count</b> " . gettext("entries in this table.") . "&nbsp;&nbsp;" . "<input name=\"Download\" type=\"submit\" class=\"formbtn\" value=\"" . gettext("Download") . "\" /> " . gettext(" the latest bogon data.") . "<br />" . "$last_updated";
-								}
-								else
-									echo "<tr><td>" . gettext("Delete") . " <a href=\"diag_tables.php?deleteall=true&amp;type=" . htmlspecialchars($tablename) . "\">" . gettext("all") . "</a> " . "<b>$count</b> " . gettext("entries in this table.");
-						?>
-							</td></tr>
-						</table>
-					</div>
-				</div>
-
-            </section>
-
-			</form>
-        </div>
-
-	</div>
+  <div class="container-fluid">
+    <div class="row">
+      <?php if (isset($savemsg)) print_info_box($savemsg); ?>
+      <form method="post" id="iform" action="<?=$_SERVER['REQUEST_URI'];?>">
+        <input type="hidden" name="act" id="action"/>
+        <input type="hidden" name="address" id="address"/>
+        <section class="col-xs-12">
+          <select id="tablename" name="tablename" class="selectpicker" data-width="auto" data-live-search="true">
+<?php
+          foreach ($tables as $table):?>
+            <option value="<?=$table;?>" <?=$tablename == $table ? " selected=\"selected\"" : "";?>>
+                <?=$table;?>
+            </option>
+<?php
+           endforeach;?>
+          </select>
+          <button class="btn btn-default" id="flushtable"><?=gettext("Flush");?></button>
+          <button class="btn btn-default pull-right" id="update_bogons"><i id="update_bogons_progress" class=""></i>
+            <?=gettext("Update bogons");?>
+          </button>
+        </section>
+        <section class="col-xs-12">
+          <div class="content-box">
+            <div class="table-responsive">
+              <table class="table table-striped">
+                <tr>
+                  <td colspan="2"><?=gettext("IP Address");?></td>
+                </tr>
+<?php
+               if (count($entries) ==0):?>
+                <tr>
+                  <td colspan="2"><?=gettext("No entries exist in this table.");?></td>
+                </tr>
+<?php
+              endif;
+              foreach ($entries as $entry):?>
+                <tr>
+                  <td><?=$entry;?></td>
+                  <td>
+                    <a data-address="<?=$entry;?>" title="<?=gettext("delete this entry"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
+                      <span class="glyphicon glyphicon-remove"></span>
+                    </a>
+                  </td>
+                </tr>
+<?php
+              endforeach;?>
+              </table>
+            </div>
+          </div>
+        </section>
+      </form>
+    </div>
+  </div>
 </section>
-
 <?php include('foot.inc');?>