diff --git a/agc_2-X/trunk/agi/agi-NVA_recording.agi b/agc_2-X/trunk/agi/agi-NVA_recording.agi
index 70abb6bf..8b92ace4 100644
--- a/agc_2-X/trunk/agi/agi-NVA_recording.agi
+++ b/agc_2-X/trunk/agi/agi-NVA_recording.agi
@@ -162,6 +162,7 @@ if (length($user) > 0)
 if ($record_call =~ /Y/)
 	{
 	$filename = "$filedate$US$accountcode$US$extension";
+	$filename =~ s/\"|\'//gi;
 	### code to record call goes here ###
 
 	$AGI->exec("Monitor wav|/var/spool/asterisk/monitor/MIX/$filename"); 
diff --git a/agc_2-X/trunk/docs/CALLCARD.txt b/agc_2-X/trunk/docs/CALLCARD.txt
index 7f6f2599..28fc2aa0 100644
--- a/agc_2-X/trunk/docs/CALLCARD.txt
+++ b/agc_2-X/trunk/docs/CALLCARD.txt
@@ -23,7 +23,7 @@ Web scripts involved:
 
 
 For the calls to be properly logged, use these settings(or add to existing URLs) in the in-group that is handling these calls:
-- Start Call URL: "&minuteswarning=1&callcard=1"
+- Start Call URL: "&minuteswarning=1&callcard=1" or "&minuteswarning=1&callcard=1&nextstep=HANGUP&destination=8300&nextmessage=timeout_hangup&"
 - Dispo URL: "&callcard=--A--talk_time_min--B--"
 
 
diff --git a/agc_2-X/trunk/www/agc/vdc_db_query.php b/agc_2-X/trunk/www/agc/vdc_db_query.php
index ed7df6dd..7febd1f1 100644
--- a/agc_2-X/trunk/www/agc/vdc_db_query.php
+++ b/agc_2-X/trunk/www/agc/vdc_db_query.php
@@ -1847,21 +1847,21 @@ if ($ACTION == 'manDiaLnextCaLL')
 					$order_stmt = '';
 					if (eregi("DOWN",$lead_order)){$order_stmt = 'order by lead_id asc';}
 					if (eregi("UP",$lead_order)){$order_stmt = 'order by lead_id desc';}
-					if (eregi("UP LAST NAME",$lead_order)){$order_stmt = 'order by last_name desc, $last_order';}
-					if (eregi("DOWN LAST NAME",$lead_order)){$order_stmt = 'order by last_name, $last_order';}
-					if (eregi("UP PHONE",$lead_order)){$order_stmt = 'order by phone_number desc, $last_order';}
-					if (eregi("DOWN PHONE",$lead_order)){$order_stmt = 'order by phone_number, $last_order';}
-					if (eregi("UP COUNT",$lead_order)){$order_stmt = 'order by called_count desc, $last_order';}
-					if (eregi("DOWN COUNT",$lead_order)){$order_stmt = 'order by called_count, $last_order';}
-					if (eregi("UP LAST CALL TIME",$lead_order)){$order_stmt = 'order by last_local_call_time desc, $last_order';}
-					if (eregi("DOWN LAST CALL TIME",$lead_order)){$order_stmt = 'order by last_local_call_time, $last_order';}
-					if (eregi("RANDOM",$lead_order)){$order_stmt = 'order by RAND()';}
-					if (eregi("UP RANK",$lead_order)){$order_stmt = 'order by rank desc, $last_order';}
-					if (eregi("DOWN RANK",$lead_order)){$order_stmt = 'order by rank, $last_order';}
-					if (eregi("UP OWNER",$lead_order)){$order_stmt = 'order by owner desc, $last_order';}
-					if (eregi("DOWN OWNER",$lead_order)){$order_stmt = 'order by owner, $last_order';}
-					if (eregi("UP TIMEZONE",$lead_order)){$order_stmt = 'order by gmt_offset_now desc, $last_order';}
-					if (eregi("DOWN TIMEZONE",$lead_order)){$order_stmt = 'order by gmt_offset_now, $last_order';}
+					if (eregi("UP LAST NAME",$lead_order)){$order_stmt = "order by last_name desc, $last_order";}
+					if (eregi("DOWN LAST NAME",$lead_order)){$order_stmt = "order by last_name, $last_order";}
+					if (eregi("UP PHONE",$lead_order)){$order_stmt = "order by phone_number desc, $last_order";}
+					if (eregi("DOWN PHONE",$lead_order)){$order_stmt = "order by phone_number, $last_order";}
+					if (eregi("UP COUNT",$lead_order)){$order_stmt = "order by called_count desc, $last_order";}
+					if (eregi("DOWN COUNT",$lead_order)){$order_stmt = "order by called_count, $last_order";}
+					if (eregi("UP LAST CALL TIME",$lead_order)){$order_stmt = "order by last_local_call_time desc, $last_order";}
+					if (eregi("DOWN LAST CALL TIME",$lead_order)){$order_stmt = "order by last_local_call_time, $last_order";}
+					if (eregi("RANDOM",$lead_order)){$order_stmt = "order by RAND()";}
+					if (eregi("UP RANK",$lead_order)){$order_stmt = "order by rank desc, $last_order";}
+					if (eregi("DOWN RANK",$lead_order)){$order_stmt = "order by rank, $last_order";}
+					if (eregi("UP OWNER",$lead_order)){$order_stmt = "order by owner desc, $last_order";}
+					if (eregi("DOWN OWNER",$lead_order)){$order_stmt = "order by owner, $last_order";}
+					if (eregi("UP TIMEZONE",$lead_order)){$order_stmt = "order by gmt_offset_now desc, $last_order";}
+					if (eregi("DOWN TIMEZONE",$lead_order)){$order_stmt = "order by gmt_offset_now, $last_order";}
 
 					$stmt="UPDATE vicidial_list SET status='QUEUE',user='$user' where called_since_last_reset='N' and status IN($Dsql) and list_id IN($camp_lists) and ($all_gmtSQL) $DLTsql $fSQL $adooSQL $order_stmt LIMIT 1;";
 					if ($DB) {echo "$stmt\n";}
diff --git a/agc_2-X/trunk/www/vicidial/non_agent_api.php b/agc_2-X/trunk/www/vicidial/non_agent_api.php
index 008bb003..50402b29 100644
--- a/agc_2-X/trunk/www/vicidial/non_agent_api.php
+++ b/agc_2-X/trunk/www/vicidial/non_agent_api.php
@@ -240,7 +240,7 @@ if ($non_latin < 1)
 	$multi_alt_phones = ereg_replace("[^- \+\!\:\_0-9a-zA-Z]","",$multi_alt_phones);
 		$multi_alt_phones = ereg_replace("\+"," ",$multi_alt_phones);
 	$source = ereg_replace("[^0-9a-zA-Z]","",$source);
-	$phone_login = ereg_replace("[^0-9a-zA-Z]","",$phone_login);
+	$phone_login = ereg_replace("[^-\_0-9a-zA-Z]","",$phone_login);
 	$session_id = ereg_replace("[^0-9]","",$session_id);
 	$server_ip = ereg_replace("[^\.0-9]","",$server_ip);
 	$stage = ereg_replace("[^a-zA-Z]","",$stage);