diff --git a/index.html b/index.html
index fccfbc2008d91afbd899ec1f71efce26980b5b6a..7ef86402ae2d1dfd1952c690a86b38e593ec8751 100755
--- a/index.html
+++ b/index.html
@@ -1027,11 +1027,11 @@
                      If not, load this JS after jQuery. -->
                 <script defer src="libraries/tablesorter/jquery.tablesorter.min.js"></script>
                 <script type="text/javascript">
-                  window.onload = function() {
+                  window.addEventListener('load',function() {
                     $(document).ready(function() { 
                         $("#table-sort-demo").tablesorter(); 
                     }); 
-                  }
+                  });
                 </script>
 
               </section>
@@ -1209,7 +1209,7 @@
                          If not, load this JS after jQuery. -->
                     <script defer src="libraries/LiveFilter/js/jquery.liveFilter.js"></script>
                     <script type="text/javascript">
-                      window.onload = function() {
+                      window.addEventListener('load',function() {
                         $(document).ready(function() { 
                           $('#livefilterdemo').liveFilter({
                             fitlerTargetCustomDiv: 'div.live-filter-target-granularity',
@@ -1217,7 +1217,7 @@
                             noMatches: '<p>No matching papers found.</p><a class="button" href="#">You could add a link to advanced search</a> '
                           });
                         }); 
-                      }
+                      });
                     </script>
 
                   </div> <!-- /livefilter -->
diff --git a/libraries/LiveFilter/js/jquery.liveFilter.js b/libraries/LiveFilter/js/jquery.liveFilter.js
index 00d22da2bd67f3fe01d9894dab0746f4c03d1383..bf1150b6a961bc966fbe238e34d659ead2445762 100755
--- a/libraries/LiveFilter/js/jquery.liveFilter.js
+++ b/libraries/LiveFilter/js/jquery.liveFilter.js
@@ -12,7 +12,6 @@
 
 (function($){
   $.fn.liveFilter = function (settings) {
-
     // Default settings
     var defaults = {
       delay: 0,
@@ -36,7 +35,7 @@
 
     // Cache our wrapper element and find our target list.
     var wrap = $(this);
-    var filterTarget = wrap.find('ul, ol, table,' + options.fitlerTargetCustomDiv);
+    var filterTarget = wrap.find('ul, ol, table,div');
 
     // Add no matches text.
     wrap.append('<div class="nomatches">'+options.noMatches+'</div>');
@@ -44,7 +43,7 @@
     nomatches.hide();
 
     // Determine our child element type.
-    if (filterTarget.is(options.fitlerTargetCustomDiv)) {
+    if (options.fitlerTargetCustomDiv) {
       child = options.fitlerTargetCustomDiv;
     } else if (filterTarget.is('ul') || filterTarget.is('ol')) {
       child = 'li';