diff --git a/pydat/README.md b/pydat/README.md
index f783bf9..bf31a4f 100644
--- a/pydat/README.md
+++ b/pydat/README.md
@@ -212,6 +212,7 @@ The following is a list of keys that are recognized for searching specific
 fields:
 
 - **domainName**
+- **tld**
 - **administrativeContact_email**
 - **administrativeContact_name**
 - **administrativeContact_organization**
diff --git a/pydat/pydat/pdns_sources/dnsdb/static/js/dnsdb.js b/pydat/pydat/pdns_sources/dnsdb/static/js/dnsdb.js
index 772561b..e0d03f5 100644
--- a/pydat/pydat/pdns_sources/dnsdb/static/js/dnsdb.js
+++ b/pydat/pydat/pdns_sources/dnsdb/static/js/dnsdb.js
@@ -2,38 +2,28 @@ $(document).ready(function(){
 
     $('#dnsdb-tab').tabs();
     $('.dnsdb-dnsres').dataTable(
-				{
-					"bJQueryUI": true,
-					//"bAutoWidth": false,
-					"oLanguage": {'sSearch': 'Filter:', 
-                                  'sZeroRecords': 'No Records Found',
-                                 },
-                    "aoColumnDefs": [
-                        {"sWidth": "15%", 'bSortable': false, 'aTargets': [-1]},
-                    ],
-					"sPaginationType": "full_numbers",
-                    "sDom" : '<"H"lfirp>t<"F"lfip>',
-					"iDisplayLength" : 50,
-					"fnDrawCallback": function(oSettings) { 
-						$(".resolve").on("click", function() {
-                            $(this).removeClass('link');
-                            $(this).off('click');
-							resolve($(this).attr('domainName'), $(this));
-						});
-					}
-				});
+        {
+            "bJQueryUI": true,
+            //"bAutoWidth": false,
+            "oLanguage": {'sSearch': 'Filter:',
+                            'sZeroRecords': 'No Records Found',
+                            },
+            "aoColumnDefs": [
+                {"sWidth": "15%", 'bSortable': false, 'aTargets': [-1]},
+            ],
+            "sPaginationType": "full_numbers",
+            "sDom" : '<"H"lfirp>t<"F"lfip>',
+            "aLengthMenu": [[50, 100, 200, 300], [50, 100, 200, 300]],
+            "iDisplayLength" : 100,
+            "fnDrawCallback": function(oSettings) {
+                $(".resolve").on("click", function() {
+                    $(this).removeClass('link');
+                    $(this).off('click');
+                    resolve($(this).attr('domainName'), $(this));
+                });
+            }
+        });
 
-    /*
-    var tabName = $(document.createElement('span'));
-    tabName.text("PDNS" + direction + " Results");
-    tabName.css('position', 'absolute');
-    tabName.css('right', '20px');
-    tabName.css('font-size', '20px');
-    tabName.css('top', '13px');
-    $("#pdns-DNSDB").append(tabName);
-    */
-
-    
     $(".pdns_search_form [name='result_format']").change(function(){
         //Filtering should only be visible for List
         if($(this).find("option:selected").val() == "list"){
@@ -41,10 +31,10 @@ $(document).ready(function(){
         }else{
             $(this).parents().find('.form_filter').addClass("novis");
         }
-    }); 
+    });
 
 
     $(".pdns_search_form [name='result_format']").change();
-    
+
 
 });
diff --git a/pydat/pydat/static/js/domain_advanced.js b/pydat/pydat/static/js/domain_advanced.js
index 8a4ce0d..b0597a1 100644
--- a/pydat/pydat/static/js/domain_advanced.js
+++ b/pydat/pydat/static/js/domain_advanced.js
@@ -127,11 +127,11 @@ $(document).ready(function() {
                                     $(this).tooltip( "option", "disabled", true );
                                     $(this).off("click");
                                     resolve($(this).attr('domainName'), $(this));
-                                }).tooltip();
+                                }); // .tooltip();
                             }
                         });
 
-                        $('.dnsres').tooltip({ items: 'td[title]' });
+                        // $('.dnsres').tooltip({ items: 'td[title]' });
                     }
 				});
 
diff --git a/pydat/pydat/static/js/pdns.js b/pydat/pydat/static/js/pdns.js
index aa68eb5..d1d4999 100644
--- a/pydat/pydat/static/js/pdns.js
+++ b/pydat/pydat/static/js/pdns.js
@@ -1,43 +1,3 @@
 $(document).ready(function() {
-
-    //search_toggle(0);
-
     $('#pdns').tabs();
-
-    /*
-	$('#tab-DNSDB').tabs();
-	$('#tab-PassiveTotal').tabs();
-
-    $('.dnsres').dataTable(
-				{
-					"bJQueryUI": true,
-					//"bAutoWidth": false,
-					"oLanguage": {'sSearch': 'Filter:', 
-                                  'sZeroRecords': 'No Records Found',
-                                 },
-                    "aoColumnDefs": [
-                        {"sWidth": "15%", 'bSortable': false, 'aTargets': [-1]},
-                    ],
-					"sPaginationType": "full_numbers",
-                    "sDom" : '<"H"lfirp>t<"F"lfip>',
-					"iDisplayLength" : 50,
-					"fnDrawCallback": function(oSettings) { 
-						$(".resolve").on("click", function() {
-                            $(this).removeClass('link');
-                            $(this).off('click');
-							resolve($(this).attr('domainName'), $(this));
-						});
-					}
-				});
-
-    var tabName = $(document.createElement('span'));
-    tabName.text("PDNS" + direction + " Results");
-    tabName.css('position', 'absolute');
-    tabName.css('right', '20px');
-    //tabName.css('color', 'white');
-    tabName.css('font-size', '20px');
-    tabName.css('top', '13px');
-    $("#pdns-DNSDB").append(tabName);
-    $("#pdns-PassiveTotal").append(tabName);
-    */
 });
diff --git a/pydat/pydat/static/js/pydat.js b/pydat/pydat/static/js/pydat.js
index c6d07f3..6be3b67 100644
--- a/pydat/pydat/static/js/pydat.js
+++ b/pydat/pydat/static/js/pydat.js
@@ -2,9 +2,9 @@ $(document).ready(function() {
     //Associate toggle with click
 	$(".accordion" ).accordion({heightStyle: "content", collapsible: true});
 
-    $("#searchIcon").on("click", function() { search_toggle();}); 
+    $("#searchIcon").on("click", function() { search_toggle();});
 
-    $('.tooltip').tooltip();
+    // $('.tooltip').tooltip();
 
     $("#" + active + "_link").addClass("tab_active");
 
@@ -30,7 +30,7 @@ $(document).ready(function() {
         }else{
             $(this).parents('tbody').find('.form_filter').addClass("novis");
         }
-    }); 
+    });
 
     $(".search_form [name='fmt']").change();
 
@@ -83,7 +83,7 @@ function search_toggle(duration){
 
 
 function resolve(domain, target) {
-  var ep_url = resolve_url + domain + "/"; 
+  var ep_url = resolve_url + domain + "/";
   $.ajax({
 	type: 'GET',
 	url: ep_url,
@@ -101,7 +101,7 @@ function resolve(domain, target) {
             var arCell = document.createElement('td');
             var anch = document.createElement('a');
             $(anch).attr("href", data.ips[i].url);
-            $(anch).html(data.ips[i].ip); 
+            $(anch).html(data.ips[i].ip);
 
             $(arCell).append(anch);
             $(arRow).append(arCell);
@@ -121,11 +121,11 @@ function resolve(domain, target) {
 //Authors: Zygimantas Berziunas, Allan Jardine and vex
 jQuery.fn.dataTableExt.oApi.fnSetFilteringDelay = function ( oSettings, iDelay ) {
     var _that = this;
- 
+
     if ( iDelay === undefined ) {
         iDelay = 250;
     }
-      
+
     this.each( function ( i ) {
         $.fn.dataTableExt.iApiIndex = i;
         var
@@ -133,20 +133,20 @@ jQuery.fn.dataTableExt.oApi.fnSetFilteringDelay = function ( oSettings, iDelay )
             oTimerId = null,
             sPreviousSearch = null,
             anControl = $( 'input', _that.fnSettings().aanFeatures.f );
-          
+
             anControl.unbind( 'keyup' ).bind( 'keyup', function() {
             var $$this = $this;
-  
+
             if (sPreviousSearch === null || sPreviousSearch != anControl.val()) {
                 window.clearTimeout(oTimerId);
-                sPreviousSearch = anControl.val(); 
+                sPreviousSearch = anControl.val();
                 oTimerId = window.setTimeout(function() {
                     $.fn.dataTableExt.iApiIndex = i;
                     _that.fnFilter( anControl.val() );
                 }, iDelay);
             }
         });
-          
+
         return this;
     } );
     return this;