diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php
index 49993d73fa..b908aea8e7 100644
--- a/app/xml_cdr/resources/classes/xml_cdr.php
+++ b/app/xml_cdr/resources/classes/xml_cdr.php
@@ -645,9 +645,12 @@ if (!class_exists('xml_cdr')) {
 
 				$sql .= "(\n";
 				$sql .= "select count(*) from v_xml_cdr \n";
-				$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
-				$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
-				$sql .= "and domain_uuid = e.domain_uuid \n";
+				$sql .= "where domain_uuid = e.domain_uuid\n";
+				$sql .= "and (\n";
+				$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
+				$sql .= " or \n";
+				$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
+				$sql .= ")\n";
 				$sql .= "and (answer_stamp is not null and bridge_uuid is not null) \n";
 				if ($this->include_internal) {
 					$sql .= " and (direction = 'inbound' or direction = 'local') \n";
@@ -660,9 +663,12 @@ if (!class_exists('xml_cdr')) {
 
 				$sql .= "(\n";
 				$sql .= "select count(*) from v_xml_cdr \n";
-				$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
-				$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
-				$sql .= "and domain_uuid = e.domain_uuid \n";
+				$sql .= "where domain_uuid = e.domain_uuid\n";
+				$sql .= "and (\n";
+				$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
+				$sql .= " or \n";
+				$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
+				$sql .= ")\n";
 				$sql .= "and (answer_stamp is not null and bridge_uuid is null) \n";
 				$sql .= "and direction = 'inbound' \n";
 				if (!$this->include_internal) {
@@ -673,9 +679,12 @@ if (!class_exists('xml_cdr')) {
 
 				$sql .= "(\n";
 				$sql .= "select count(*) from v_xml_cdr \n";
-				$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
-				$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
-				$sql .= "and domain_uuid = e.domain_uuid \n";
+				$sql .= "where domain_uuid = e.domain_uuid\n";
+				$sql .= "and (\n";
+				$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
+				$sql .= " or \n";
+				$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
+				$sql .= ")\n";
 				$sql .= "and hangup_cause = 'NO_ANSWER' \n";
 				if ($this->include_internal) {
 					$sql .= " and (direction = 'inbound' or direction = 'local') \n";
@@ -688,9 +697,12 @@ if (!class_exists('xml_cdr')) {
 
 				$sql .= "(\n";
 				$sql .= "select count(*) from v_xml_cdr \n";
-				$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
-				$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
-				$sql .= "and domain_uuid = e.domain_uuid \n";
+				$sql .= "where domain_uuid = e.domain_uuid\n";
+				$sql .= "and (\n";
+				$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
+				$sql .= " or \n";
+				$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
+				$sql .= ")\n";
 				$sql .= "and hangup_cause = 'USER_BUSY' \n";
 				if ($this->include_internal) {
 					$sql .= " and (direction = 'inbound' or direction = 'local') \n";
@@ -703,9 +715,12 @@ if (!class_exists('xml_cdr')) {
 
 				$sql .= "(\n";
 				$sql .= "select SUM(billsec) / count(*) from v_xml_cdr \n";
-				$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
-				$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
-				$sql .= "and domain_uuid = e.domain_uuid \n";
+				$sql .= "where domain_uuid = e.domain_uuid\n";
+				$sql .= "and (\n";
+				$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
+				$sql .= " or \n";
+				$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
+				$sql .= ")\n";
 				if (!$this->include_internal) {
 					$sql .= " and (direction = 'inbound' or direction = 'outbound') \n";
 				}
@@ -714,9 +729,12 @@ if (!class_exists('xml_cdr')) {
 
 				$sql .= "(\n";
 				$sql .= "select count(*) from v_xml_cdr \n";
-				$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
-				$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
-				$sql .= "and domain_uuid = e.domain_uuid \n";
+				$sql .= "where domain_uuid = e.domain_uuid\n";
+				$sql .= "and (\n";
+				$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
+				$sql .= " or \n";
+				$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
+				$sql .= ")\n";
 				if ($this->include_internal) {
 					$sql .= " and (direction = 'inbound' or direction = 'local') \n";
 				}
@@ -728,9 +746,12 @@ if (!class_exists('xml_cdr')) {
 
 				$sql .= "(\n";
 				$sql .= "select SUM(billsec) from v_xml_cdr \n";
-				$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
-				$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
-				$sql .= "and domain_uuid = e.domain_uuid \n";
+				$sql .= "where domain_uuid = e.domain_uuid\n";
+				$sql .= "and (\n";
+				$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
+				$sql .= " or \n";
+				$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
+				$sql .= ")\n";
 				if ($this->include_internal) {
 					$sql .= " and (direction = 'inbound' or direction = 'local') \n";
 				}
@@ -742,18 +763,24 @@ if (!class_exists('xml_cdr')) {
 
 				$sql .= "(\n";
 				$sql .= "select count(*) from v_xml_cdr \n";
-				$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
-				$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
-				$sql .= "and domain_uuid = e.domain_uuid \n";
+				$sql .= "where domain_uuid = e.domain_uuid\n";
+				$sql .= "and (\n";
+				$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
+				$sql .= " or \n";
+				$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
+				$sql .= ")\n";
 				$sql .= "and direction = 'outbound' \n";
 				$sql .= $sql_date_range;
 				$sql .= ") as outbound_calls, \n";
 
 				$sql .= "(";
 				$sql .= "select SUM(billsec) from v_xml_cdr \n";
-				$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
-				$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
-				$sql .= "and domain_uuid = e.domain_uuid \n";
+				$sql .= "where domain_uuid = e.domain_uuid\n";
+				$sql .= "and (\n";
+				$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
+				$sql .= " or \n";
+				$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
+				$sql .= ")\n";
 				$sql .= "and direction = 'outbound' \n";
 				$sql .= $sql_date_range;
 				$sql .= ") as outbound_duration, \n";