diff --git a/app/fax_queue/fax_queue.php b/app/fax_queue/fax_queue.php
index 4b29d447c3..415dacef7e 100644
--- a/app/fax_queue/fax_queue.php
+++ b/app/fax_queue/fax_queue.php
@@ -98,7 +98,7 @@
 
 //get the count
 	$sql = "select count(fax_queue_uuid) ";
-	$sql .= "from v_fax_queue ";
+	$sql .= "from v_fax_queue as q ";
 	if ($_GET['show'] == "all" && permission_exists('fax_queue_all')) {
 		//show faxes for all domains
 		$sql .= "where true ";
@@ -111,28 +111,28 @@
 	else {
 		//show only assigned fax extensions
 		$sql = trim($sql);
-		$sql .= ", v_fax as f, v_fax_users as u ";
-		$sql .= "where f.fax_uuid = u.fax_uuid ";
-		$sql .= "and q.domain_uuid = :domain_uuid ";
-		$sql .= "and u.user_uuid = :user_uuid ";
+		$sql .= ", v_fax as f, v_fax_users as u \n";
+		$sql .= "where f.fax_uuid = u.fax_uuid \n";
+		$sql .= "and q.domain_uuid = :domain_uuid \n";
+		$sql .= "and u.user_uuid = :user_uuid \n";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['user_uuid'] = $_SESSION['user_uuid'];
 	}
 	if (isset($search)) {
-		$sql .= "and (";
-		$sql .= "	lower(hostname) like :search ";
-		$sql .= "	or lower(fax_caller_id_name) like :search ";
-		$sql .= "	or lower(fax_caller_id_number) like :search ";
-		$sql .= "	or lower(fax_number) like :search ";
-		$sql .= "	or lower(fax_email_address) like :search ";
-		$sql .= "	or lower(fax_file) like :search ";
-		$sql .= "	or lower(fax_status) like :search ";
-		$sql .= "	or lower(fax_accountcode) like :search ";
+		$sql .= "and (\n";
+		$sql .= "	lower(q.hostname) like :search \n";
+		$sql .= "	or lower(q.fax_caller_id_name) like :search \n";
+		$sql .= "	or lower(q.fax_caller_id_number) like :search \n";
+		$sql .= "	or lower(q.fax_number) like :search \n";
+		$sql .= "	or lower(q.fax_email_address) like :search \n";
+		$sql .= "	or lower(q.fax_file) like :search \n";
+		$sql .= "	or lower(q.fax_status) like :search \n";
+		$sql .= "	or lower(q.fax_accountcode) like :search \n";
 		$sql .= ") ";
 		$parameters['search'] = '%'.$search.'%';
 	}
 	if (isset($_GET["fax_status"]) && $_GET["fax_status"] != '') {
-		$sql .= "and fax_status = :fax_status ";
+		$sql .= "and q.fax_status = :fax_status \n";
 		$parameters['fax_status'] = $_GET["fax_status"];
 	}
 	$database = new database;
@@ -149,66 +149,66 @@
 	$offset = $rows_per_page * $page;
 
 //get the list
-	$sql = "select ";
-	$sql .= "d.domain_name, ";
-	$sql .= "q.fax_queue_uuid, ";
-	$sql .= "q.fax_uuid, ";
-	$sql .= "q.fax_date, ";
+	$sql = "select \n";
+	$sql .= "d.domain_name, \n";
+	$sql .= "q.fax_queue_uuid, \n";
+	$sql .= "q.fax_uuid, \n";
+	$sql .= "q.fax_date, \n";
 	$sql .= "to_char(timezone(:time_zone, q.fax_date), 'DD Mon YYYY') as fax_date_formatted, \n";
 	$sql .= "to_char(timezone(:time_zone, q.fax_date), 'HH12:MI:SS am') as fax_time_formatted, \n";	
-	$sql .= "q.hostname, ";
-	$sql .= "q.fax_caller_id_name, ";
-	$sql .= "q.fax_caller_id_number, ";
-	$sql .= "q.fax_number, ";
-	$sql .= "q.fax_prefix, ";
-	$sql .= "q.fax_email_address, ";
-	$sql .= "q.fax_file, ";
-	$sql .= "q.fax_status, ";
-	$sql .= "q.fax_retry_date, ";
+	$sql .= "q.hostname, \n";
+	$sql .= "q.fax_caller_id_name, \n";
+	$sql .= "q.fax_caller_id_number, \n";
+	$sql .= "q.fax_number, \n";
+	$sql .= "q.fax_prefix, \n";
+	$sql .= "q.fax_email_address, \n";
+	$sql .= "q.fax_file, \n";
+	$sql .= "q.fax_status, \n";
+	$sql .= "q.fax_retry_date, \n";
 	$sql .= "to_char(timezone(:time_zone, q.fax_retry_date), 'DD Mon YYYY') as fax_retry_date_formatted, \n";
 	$sql .= "to_char(timezone(:time_zone, q.fax_retry_date), 'HH12:MI:SS am') as fax_retry_time_formatted, \n";	
-	$sql .= "q.fax_notify_date, ";
+	$sql .= "q.fax_notify_date, \n";
 	$sql .= "to_char(timezone(:time_zone, q.fax_notify_date), 'DD Mon YYYY') as fax_notify_date_formatted, \n";
 	$sql .= "to_char(timezone(:time_zone, q.fax_notify_date), 'HH12:MI:SS am') as fax_notify_time_formatted, \n";	
-	$sql .= "q.fax_retry_count, ";
-	$sql .= "q.fax_accountcode, ";
-	$sql .= "q.fax_command ";
-	$sql .= "from v_fax_queue as q, v_domains as d ";
+	$sql .= "q.fax_retry_count, \n";
+	$sql .= "q.fax_accountcode, \n";
+	$sql .= "q.fax_command \n";
+	$sql .= "from v_fax_queue as q, v_domains as d \n";
 	if ($_GET['show'] == "all" && permission_exists('fax_queue_all')) {
 		//show faxes for all domains
-		$sql .= "where true ";
+		$sql .= "where true \n";
 	}
 	elseif (permission_exists('fax_queue_domain')) {
 		//show faxes for one domain
-		$sql .= "where q.domain_uuid = :domain_uuid ";
+		$sql .= "where q.domain_uuid = :domain_uuid \n";
 		$parameters['domain_uuid'] = $domain_uuid;
 	}
 	else {
 		//show only assigned fax extensions
 		$sql = trim($sql);
-		$sql .= ", v_fax as f, v_fax_users as u ";
-		$sql .= "where f.fax_uuid = u.fax_uuid ";
-		$sql .= "and q.domain_uuid = :domain_uuid ";
-		$sql .= "and u.user_uuid = :user_uuid ";
+		$sql .= ", v_fax as f, v_fax_users as u \n";
+		$sql .= "where f.fax_uuid = u.fax_uuid \n";
+		$sql .= "and q.domain_uuid = :domain_uuid \n";
+		$sql .= "and u.user_uuid = :user_uuid \n";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['user_uuid'] = $_SESSION['user_uuid'];
 	}
 	$sql .= "and q.domain_uuid = d.domain_uuid ";
 	if (isset($_GET["search"])) {
-		$sql .= "and (";
-		$sql .= "	lower(hostname) like :search ";
-		$sql .= "	or lower(fax_caller_id_name) like :search ";
-		$sql .= "	or lower(fax_caller_id_number) like :search ";
-		$sql .= "	or lower(fax_number) like :search ";
-		$sql .= "	or lower(fax_email_address) like :search ";
-		$sql .= "	or lower(fax_file) like :search ";
-		$sql .= "	or lower(fax_status) like :search ";
-		$sql .= "	or lower(fax_accountcode) like :search ";
+		$sql .= "and ( \n";
+		$sql .= "	lower(q.hostname) like :search \n";
+		$sql .= "	or lower(q.fax_caller_id_name) like :search \n";
+		$sql .= "	or lower(q.fax_caller_id_number) like :search \n";
+		$sql .= "	or lower(q.fax_number) like :search \n";
+		$sql .= "	or lower(q.fax_email_address) like :search \n";
+		$sql .= "	or lower(q.fax_file) like :search \n";
+		$sql .= "	or lower(q.fax_status) like :search \n";
+		$sql .= "	or lower(q.fax_accountcode) like :search \n";
 		$sql .= ") ";
 		$parameters['search'] = '%'.$search.'%';
 	}
 	if (isset($_GET["fax_status"]) && $_GET["fax_status"] != '') {
-		$sql .= "and fax_status = :fax_status ";
+		$sql .= "and q.fax_status = :fax_status \n";
 		$parameters['fax_status'] = $_GET["fax_status"];
 	}
 	$sql .= order_by($order_by, $order, 'fax_date', 'desc');