diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index c2ee2c1255..1d84ecb026 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -40,8 +40,9 @@ else {
 //additional includes
 	require_once "includes/header.php";
 	require_once "includes/paging.php";
-	
+
 //xml cdr include
+	$rows_per_page = 100;
 	require_once "xml_cdr_inc.php";
 
 //page title and description
diff --git a/app/xml_cdr/xml_cdr_csv.php b/app/xml_cdr/xml_cdr_csv.php
index adf95cbb99..e26b20d98d 100644
--- a/app/xml_cdr/xml_cdr_csv.php
+++ b/app/xml_cdr/xml_cdr_csv.php
@@ -35,6 +35,7 @@ else {
 }
 
 //additional includes
+	$rows_per_page = 0;
 	require_once "xml_cdr_inc.php";
 
 //set the http headers
diff --git a/app/xml_cdr/xml_cdr_import_update.php b/app/xml_cdr/xml_cdr_import_update.php
index 4a0aa19c39..46401878e3 100644
--- a/app/xml_cdr/xml_cdr_import_update.php
+++ b/app/xml_cdr/xml_cdr_import_update.php
@@ -156,4 +156,5 @@
 			$db->commit();
 		//echo finished
 			echo "completed\n";
-	}
\ No newline at end of file
+	}
+?>
diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php
index 99f1431d66..0b53086953 100644
--- a/app/xml_cdr/xml_cdr_inc.php
+++ b/app/xml_cdr/xml_cdr_inc.php
@@ -162,34 +162,39 @@ else {
 //set the default
 	$num_rows = '0';
 
-//get the number of rows in the v_xml_cdr 
-	$sql = "select count(*) as num_rows from v_xml_cdr ";
-	$sql .= $sql_where;
-	$prep_statement = $db->prepare(check_sql($sql));
-	if ($prep_statement) {
-		$prep_statement->execute();
-		$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
-		if ($row['num_rows'] > 0) {
-			$num_rows = $row['num_rows'];
-		}
-		else {
-			$num_rows = '0';
-		}
-	}
-	unset($prep_statement, $result);
+//page results if rows_per_page is greater than zero
+	if ($rows_per_page > 0) {
+		//get the number of rows in the v_xml_cdr 
+			$sql = "select count(*) as num_rows from v_xml_cdr ";
+			$sql .= $sql_where;
+			$prep_statement = $db->prepare(check_sql($sql));
+			if ($prep_statement) {
+				$prep_statement->execute();
+				$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
+				if ($row['num_rows'] > 0) {
+					$num_rows = $row['num_rows'];
+				}
+				else {
+					$num_rows = '0';
+				}
+			}
+			unset($prep_statement, $result);
 
-//prepare to page the results
-	$rows_per_page = 150;
-	$page = $_GET['page'];
-	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } 
-	list($paging_controls, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page); 
-	$offset = $rows_per_page * $page; 
+		//prepare to page the results
+			//$rows_per_page = 150; //set on the page that includes this page
+			$page = $_GET['page'];
+			if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } 
+			list($paging_controls, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page); 
+			$offset = $rows_per_page * $page;
+	}
 
 //get the results from the db
 	$sql = "select * from v_xml_cdr ";
 	$sql .= $sql_where;
 	if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
-	$sql .= " limit $rows_per_page offset $offset ";
+	if ($rows_per_page > 0) {
+		$sql .= " limit $rows_per_page offset $offset ";
+	}
 	$prep_statement = $db->prepare(check_sql($sql));
 	$prep_statement->execute();
 	$result = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
diff --git a/app/xml_cdr/xml_cdr_search.php b/app/xml_cdr/xml_cdr_search.php
index 22358e6316..6de1b68a39 100644
--- a/app/xml_cdr/xml_cdr_search.php
+++ b/app/xml_cdr/xml_cdr_search.php
@@ -59,7 +59,6 @@ else {
 	require_once "includes/header.php";
 	echo "<div align='center'>";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
-
 	echo "<tr class='border'>\n";
 	echo "	<td align=\"left\">\n";
 	echo "		<br>";