diff --git a/app/access_controls/access_control_edit.php b/app/access_controls/access_control_edit.php
index 0a335a205f..55681a7576 100644
--- a/app/access_controls/access_control_edit.php
+++ b/app/access_controls/access_control_edit.php
@@ -43,13 +43,14 @@
 	$text = $language->get();
 
 //action add or update
-	if (is_uuid($_REQUEST["id"])) {
+	if (!empty($_REQUEST["id"]) && is_uuid($_REQUEST["id"])) {
 		$action = "update";
 		$access_control_uuid = $_REQUEST["id"];
 		$id = $_REQUEST["id"];
 	}
 	else {
 		$action = "add";
+		$access_control_uuid = uuid();
 	}
 
 //get http post variables and set them to php variables
@@ -151,11 +152,6 @@
 				return;
 			}
 
-		//add the access_control_uuid
-			if (!is_uuid($_POST["access_control_uuid"])) {
-				$access_control_uuid = uuid();
-			}
-
 		//prepare the array
 			$array['access_controls'][0]['access_control_uuid'] = $access_control_uuid;
 			$array['access_controls'][0]['access_control_name'] = $access_control_name;
@@ -231,14 +227,19 @@
 			}
 	}
 
+//set default values
+	$access_control_name = '';
+	$access_control_default = '';
+	$access_control_description = '';
+
 //pre-populate the form
-	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
+	if (!empty($access_control_uuid) && is_uuid($access_control_uuid) && empty($_POST["persistformvar"])) {
 		$sql = "select * from v_access_controls ";
 		$sql .= "where access_control_uuid = :access_control_uuid ";
 		$parameters['access_control_uuid'] = $access_control_uuid;
 		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
-		if (is_array($row) && @sizeof($row) != 0) {
+		if (!empty($row) && count($row) > 0) {
 			$access_control_name = $row["access_control_name"];
 			$access_control_default = $row["access_control_default"];
 			$access_control_description = $row["access_control_description"];
@@ -247,7 +248,7 @@
 	}
 
 //get the child data
-	if (is_uuid($access_control_uuid)) {
+	if (!empty($access_control_uuid) && is_uuid($access_control_uuid)) {
 		$sql = "select * from v_access_control_nodes ";
 		$sql .= "where access_control_uuid = :access_control_uuid ";
 		$sql .= "order by node_cidr asc";
@@ -258,19 +259,19 @@
 	}
 
 //add the $access_control_node_uuid
-	if (!is_uuid($access_control_node_uuid)) {
+	if (empty($access_control_node_uuid)) {
 		$access_control_node_uuid = uuid();
 	}
 
 //add an empty row
-	if (is_array($access_control_nodes) && @sizeof($access_control_nodes) != 0) {
+	if (!empty($access_control_nodes) && count($access_control_nodes) > 0) {
 		$x = count($access_control_nodes);
 	}
 	else {
 		$access_control_nodes = array();
 		$x = 0;
 	}
-	$access_control_nodes[$x]['access_control_uuid'] = $access_control_uuid;
+	$access_control_nodes[$x]['access_control_uuid'] = $access_control_uuid ?? '';
 	$access_control_nodes[$x]['access_control_node_uuid'] = uuid();
 	$access_control_nodes[$x]['node_type'] = '';
 	$access_control_nodes[$x]['node_cidr'] = '';
diff --git a/app/access_controls/access_controls.php b/app/access_controls/access_controls.php
index 18b82136b7..8f922869ba 100644
--- a/app/access_controls/access_controls.php
+++ b/app/access_controls/access_controls.php
@@ -45,15 +45,21 @@
 	$language = new text;
 	$text = $language->get();
 
+//define variable
+	$search = '';
+
+//set from session variables
+	$list_row_edit_button = !empty($_SESSION['theme']['list_row_edit_button']['boolean']) ? $_SESSION['theme']['list_row_edit_button']['boolean'] : 'false';
+
 //get the http post data
-	if (is_array($_POST['access_controls'])) {
-		$action = $_POST['action'];
-		$search = $_POST['search'];
+	if (!empty($_POST['access_controls'])) {
+		$action = $_POST['action'] ?? '';
+		$search = $_POST['search'] ?? '';
 		$access_controls = $_POST['access_controls'];
 	}
 
 //process the http post data by action
-	if ($action != '' && is_array($access_controls) && @sizeof($access_controls) != 0) {
+	if (!empty($action) && !empty($access_controls) && count($access_controls) > 0) {
 
 		//validate the token
 		$token = new token;
@@ -95,13 +101,13 @@
 		}
 
 		//redirect the user
-		header('Location: access_controls.php'.($search != '' ? '?search='.urlencode($search) : null));
+		header('Location: access_controls.php'.(!empty($search) ? '?search='.urlencode($search) : null));
 		exit;
 	}
 
 //get order and order by
-	$order_by = $_GET["order_by"];
-	$order = $_GET["order"];
+	$order_by = $_GET["order_by"] ?? '';
+	$order = $_GET["order"] ?? '';
 
 //add the search
 	if (isset($_GET["search"])) {
@@ -112,7 +118,7 @@
 //get the count
 	$sql = "select count(access_control_uuid) ";
 	$sql .= "from v_access_controls ";
-	if (isset($_GET["search"])) {
+	if (!empty($search)) {
 		$sql .= "where (";
 		$sql .= "	lower(access_control_name) like :search ";
 		$sql .= "	or lower(access_control_default) like :search ";
@@ -120,7 +126,7 @@
 		$sql .= ") ";
 	}
 	$database = new database;
-	$num_rows = $database->select($sql, $parameters, 'column');
+	$num_rows = $database->select($sql, $parameters ?? '', 'column');
 
 //get the list
 	$sql = "select ";
@@ -129,7 +135,7 @@
 	$sql .= "access_control_default, ";
 	$sql .= "access_control_description ";
 	$sql .= "from v_access_controls ";
-	if (isset($_GET["search"])) {
+	if (!empty($search)) {
 		$sql .= "where (";
 		$sql .= "	lower(access_control_name) like :search ";
 		$sql .= "	or lower(access_control_default) like :search ";
@@ -137,9 +143,8 @@
 		$sql .= ") ";
 	}
 	$sql .= order_by($order_by, $order, 'access_control_name', 'asc');
-	$sql .= limit_offset($rows_per_page, $offset);
 	$database = new database;
-	$access_controls = $database->select($sql, $parameters, 'all');
+	$access_controls = $database->select($sql, $parameters ?? '', 'all');
 	unset($sql, $parameters);
 
 //create token
@@ -154,7 +159,7 @@
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-access_controls']." (".$num_rows.")</b></div>\n";
 	echo "	<div class='actions'>\n";
-	echo button::create(['label'=>$text['button-reload'],'icon'=>$_SESSION['theme']['button_icon_reload'],'type'=>'button','id'=>'button_reload','link'=>'access_controls_reload.php'.($search != '' ? '?search='.urlencode($search) : null),'style'=>'margin-right: 15px;']);
+	echo button::create(['label'=>$text['button-reload'],'icon'=>$_SESSION['theme']['button_icon_reload'],'type'=>'button','id'=>'button_reload','link'=>'access_controls_reload.php'.(!empty($search) ? '?search='.urlencode($search) : null),'style'=>'margin-right: 15px;']);
 	if (permission_exists('access_control_add')) {
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','name'=>'btn_add','link'=>'access_control_edit.php']);
 	}
@@ -168,9 +173,6 @@
 	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
 	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
 	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'access_controls.php','style'=>($search == '' ? 'display: none;' : null)]);
-	if ($paging_controls_mini != '') {
-		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
-	}
 	echo "		</form>\n";
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
@@ -194,18 +196,18 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('access_control_add') || permission_exists('access_control_edit') || permission_exists('access_control_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($access_controls ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".(!empty($access_controls) ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	echo th_order_by('access_control_name', $text['label-access_control_name'], $order_by, $order);
 	echo th_order_by('access_control_default', $text['label-access_control_default'], $order_by, $order);
 	echo "	<th class='hide-sm-dn'>".$text['label-access_control_description']."</th>\n";
-	if (permission_exists('access_control_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
+	if (permission_exists('access_control_edit') && $list_row_edit_button == 'true') {
 		echo "	<td class='action-button'>&nbsp;</td>\n";
 	}
 	echo "</tr>\n";
 
-	if (is_array($access_controls) && @sizeof($access_controls) != 0) {
+	if (!empty($access_controls) && count($access_controls) > 0) {
 		$x = 0;
 		foreach ($access_controls as $row) {
 			if (permission_exists('access_control_edit')) {
@@ -228,7 +230,7 @@
 			echo "	</td>\n";
 			echo "	<td>".escape($row['access_control_default'])."</td>\n";
 			echo "	<td class='description overflow hide-sm-dn'>".escape($row['access_control_description'])."</td>\n";
-			if (permission_exists('access_control_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
+			if (permission_exists('access_control_edit') && $list_row_edit_button == 'true') {
 				echo "	<td class='action-button'>\n";
 				echo button::create(['type'=>'button','title'=>$text['button-edit'],'icon'=>$_SESSION['theme']['button_icon_edit'],'link'=>$list_row_url]);
 				echo "	</td>\n";
@@ -241,7 +243,6 @@
 
 	echo "</table>\n";
 	echo "<br />\n";
-	echo "<div align='center'>".$paging_controls."</div>\n";
 
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";