diff --git a/index.js b/index.js
index 21945a7..1a1e9b9 100644
--- a/index.js
+++ b/index.js
@@ -47,14 +47,15 @@ const cdrPool = mariadb.createPool(config.cdrdb);
 
 
 const json2csv = (obj) => { // Specifically for CDR
-	let csv = "call_date,src,dst,caller_id,duration,context\n";
+	let csv = "call_date,src,dst,caller_id,duration,billsec,context\n";
 	for (let key in obj) {
 		data = [
-			obj[key].call_date,
+			obj[key].calldate,
 			obj[key].src,
 			obj[key].dst,
 			obj[key].clid,
 			obj[key].duration,
+			obj[key].billsec,
 			obj[key].dcontext
 		];
 		csv += data.join(",") + "\n";
@@ -1331,7 +1332,7 @@ dcClient.on('interactionCreate', async interaction => {
 					if (result.status == "exists") {
 						// The user has an ext, use the cdrdb to get the records
 						cdrPool.getConnection().then((conn) => {
-							conn.query(`SELECT * FROM cdr WHERE src = '${result.result.fetchExtension.user.extension}' AND calldate BETWEEN '${startDate.toISOString()}' AND '${endDate.toISOString()}'`).then((result) => {
+							conn.query(`SELECT * FROM cdr WHERE src = '${result.result.fetchExtension.user.extension}' OR dst = '${result.result.fetchExtension.user.extension}' AND calldate BETWEEN '${startDate.toISOString()}' AND '${endDate.toISOString()}'`).then((result) => {
 								if (result.length == 0) {
 									interaction.editReply({
 										content: "No CDR records found",