diff --git a/public/templates/dhcp_leases.html b/public/templates/dhcp_leases.html
index 9dabafa..9508c66 100644
--- a/public/templates/dhcp_leases.html
+++ b/public/templates/dhcp_leases.html
@@ -35,7 +35,7 @@
 		"aaSorting": []
 	});
 
-    $('.option_data').click(function(){
+    $(document).on("click",".option_data",function() {
         var lease = $(this).attr("lease");
         if ( $("#" + lease).is(":visible") ) {
             $("#" + lease).hide();
@@ -44,7 +44,7 @@
             $("#" + lease).show();
             $(this).text('Hide');
         }
-    })
+    });
 </script>
 
 
diff --git a/routes/dhcp_leases.js b/routes/dhcp_leases.js
index 2f83d83..a144a8a 100644
--- a/routes/dhcp_leases.js
+++ b/routes/dhcp_leases.js
@@ -38,6 +38,10 @@ router.get('/', function(req, res, next) {
 		table_data = table_data + '<tr>' + table_row + '</tr>';
 
 		count++;
+
+		if(count >= 1000){
+			break;
+		}
 	}
 
 	table_data = template_render.set_template_variable(dhcp_leases, "table_data", table_data);