diff --git a/app/access_controls/access_controls.php b/app/access_controls/access_controls.php
index f75fe1465b..71f5de23f8 100644
--- a/app/access_controls/access_controls.php
+++ b/app/access_controls/access_controls.php
@@ -96,11 +96,11 @@
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = '';
+	$param = "&search=".$search;
 	$page = $_GET['page'];
 	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
-	list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
-	list($paging_controls_mini, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page, true);
+	list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
+	list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true);
 	$offset = $rows_per_page * $page;
 
 //get the list
@@ -164,7 +164,7 @@
 		$x = 0;
 		foreach($access_controls as $row) {
 			if (permission_exists('access_control_edit')) {
-				$list_row_url = "access_control_edit.php?id=".escape($row['access_control_uuid']);
+				$list_row_url = "access_control_edit.php?id=".urlencode($row['access_control_uuid']);
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			echo "	<td class='checkbox'>\n";
diff --git a/app/bridges/bridges.php b/app/bridges/bridges.php
index cff3a7b202..08625fd64e 100644
--- a/app/bridges/bridges.php
+++ b/app/bridges/bridges.php
@@ -123,8 +123,8 @@
 	}
 	$page = $_GET['page'];
 	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
-	list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
-	list($paging_controls_mini, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page, true);
+	list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
+	list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true);
 	$offset = $rows_per_page * $page;
 
 //get the list
@@ -203,7 +203,7 @@
 		$x = 0;
 		foreach($bridges as $row) {
 			if (permission_exists('bridge_edit')) {
-				$list_row_url = "bridge_edit.php?id=".escape($row['bridge_uuid']);
+				$list_row_url = "bridge_edit.php?id=".urlencode($row['bridge_uuid']);
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			echo "	<td class='checkbox'>\n";
diff --git a/app/call_block/call_block.php b/app/call_block/call_block.php
index 7cdfdd0e56..7524ff66be 100644
--- a/app/call_block/call_block.php
+++ b/app/call_block/call_block.php
@@ -111,11 +111,11 @@
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "";
+	$param = "&search=".$search;
 	$page = $_GET['page'];
 	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
-	list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
-	list($paging_controls_mini, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page, true);
+	list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
+	list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true);
 	$offset = $rows_per_page * $page;
 
 //get the list
@@ -149,7 +149,7 @@
 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]);
 	}
 	/*
-	if (permission_exists('bridge_all')) {
+	if (permission_exists('call_block_all')) {
 		if ($_GET['show'] == 'all') {
 			echo "	<input type='hidden' name='show' value='all'>";
 		}
@@ -196,7 +196,7 @@
 		$x = 0;
 		foreach($result as $row) {
 			if (permission_exists('call_block_edit')) {
-				$list_row_url = "call_block_edit.php?id=".escape($row['call_block_uuid']);
+				$list_row_url = "call_block_edit.php?id=".urlencode($row['call_block_uuid']);
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			echo "	<td class='checkbox'>\n";