diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php
index 334140ebdd..6eec914748 100644
--- a/app/destinations/destinations.php
+++ b/app/destinations/destinations.php
@@ -79,13 +79,15 @@ require_once "resources/paging.php";
 	//prepare to page the results
 		$sql = " select count(*) as num_rows from v_destinations ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
-		$sql .= "and (";
-		$sql .= "	destination_type = '".$search."' ";
-		$sql .= " 	or destination_number = '".$search."' ";
-		$sql .= " 	or destination_context = '".$search."' ";
-		$sql .= " 	or destination_enabled = '".$search."' ";
-		$sql .= " 	or destination_description = '".$search."' ";
-		$sql .= ") ";
+		if (strlen($search) > 0) {
+			$sql .= "and (";
+			$sql .= "	destination_type = '".$search."' ";
+			$sql .= " 	or destination_number = '".$search."' ";
+			$sql .= " 	or destination_context = '".$search."' ";
+			$sql .= " 	or destination_enabled = '".$search."' ";
+			$sql .= " 	or destination_description = '".$search."' ";
+			$sql .= ") ";
+		}
 		if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
 		$prep_statement = $db->prepare($sql);
 		if ($prep_statement) {
@@ -110,14 +112,16 @@ require_once "resources/paging.php";
 	//get the  list
 		$sql = "select * from v_destinations ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
-		$sql .= "and (";
-		$sql .= "	destination_type = '".$search."' ";
-		$sql .= " 	or destination_number = '".$search."' ";
-		$sql .= " 	or destination_context = '".$search."' ";
-		$sql .= " 	or destination_enabled = '".$search."' ";
-		$sql .= " 	or destination_description = '".$search."' ";
-		$sql .= ") ";
-		if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
+		if (strlen($search) > 0) {
+			$sql .= "and (";
+			$sql .= "	destination_type = '".$search."' ";
+			$sql .= " 	or destination_number = '".$search."' ";
+			$sql .= " 	or destination_context = '".$search."' ";
+			$sql .= " 	or destination_enabled = '".$search."' ";
+			$sql .= " 	or destination_description = '".$search."' ";
+			$sql .= ") ";
+		}
+		if (strlen($order_by) > 0) { $sql .= "order by $order_by $order "; }
 		$sql .= "limit $rows_per_page offset $offset ";
 		$prep_statement = $db->prepare(check_sql($sql));
 		$prep_statement->execute();
diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php
index c95eadd92f..50bd00722c 100644
--- a/app/extensions/extensions.php
+++ b/app/extensions/extensions.php
@@ -78,12 +78,14 @@ require_once "resources/paging.php";
 	//get the number of extensions
 		$sql = "select count(*) as num_rows from v_extensions ";
 		$sql .= "where domain_uuid = '".$domain_uuid."' ";
-		$sql .= "and (";
-		$sql .= "	extension = '".$search."' ";
-		$sql .= " 	or call_group = '".$search."' ";
-		$sql .= " 	or enabled = '".$search."' ";
-		$sql .= " 	or description = '".$search."' ";
-		$sql .= ") ";
+		if (strlen($search) > 0) {
+			$sql .= "and (";
+			$sql .= "	extension = '".$search."' ";
+			$sql .= " 	or call_group = '".$search."' ";
+			$sql .= " 	or enabled = '".$search."' ";
+			$sql .= " 	or description = '".$search."' ";
+			$sql .= ") ";
+		}
 		$prep_statement = $db->prepare(check_sql($sql));
 		if ($prep_statement) {
 			$prep_statement->execute();
@@ -108,13 +110,14 @@ require_once "resources/paging.php";
 	//get the extensions
 		$sql = "select * from v_extensions ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
-		$sql .= "and (";
-		$sql .= "	extension = '".$search."' ";
-		$sql .= " 	or call_group = '".$search."' ";
-		$sql .= " 	or enabled = '".$search."' ";
-		$sql .= " 	or description = '".$search."' ";
-		$sql .= ") ";
-		$sql .= "and (moderator_pin = '".$search."' or participant_pin = '".$search."') ";
+		if (strlen($search) > 0) {
+			$sql .= "and (";
+			$sql .= "	extension = '".$search."' ";
+			$sql .= " 	or call_group = '".$search."' ";
+			$sql .= " 	or enabled = '".$search."' ";
+			$sql .= " 	or description = '".$search."' ";
+			$sql .= ") ";
+		}
 		if (isset($order_by)) {
 			$sql .= "order by $order_by $order ";
 		}