diff --git a/agc_2-X/branches/agc_2.2.0/www/agc/vicidial.php b/agc_2-X/branches/agc_2.2.0/www/agc/vicidial.php
index f835a191..ba862cb4 100644
--- a/agc_2-X/branches/agc_2.2.0/www/agc/vicidial.php
+++ b/agc_2-X/branches/agc_2.2.0/www/agc/vicidial.php
@@ -5025,6 +5025,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 								{web_form_vars = '?' + web_form_vars}
 
 							TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars;
+
+							var regWFAqavars = new RegExp("\\?&","ig");
+							var regWFAaavars = new RegExp("&&","ig");
+							TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?');
+							TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&');
 							}
 
 						if (VDIC_web_form_address_two.match(regWFAcustom))
@@ -5120,6 +5125,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 								{web_form_vars_two = '?' + web_form_vars_two}
 
 							TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two;
+
+							var regWFAqavars = new RegExp("\\?&","ig");
+							var regWFAaavars = new RegExp("&&","ig");
+							TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?');
+							TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&');
 							}
 
 						document.getElementById("WebFormSpan").innerHTML = "<a href=\"" + TEMP_VDIC_web_form_address + "\" target=\"" + web_form_target + "\" onMouseOver=\"WebFormRefresH();\"><IMG SRC=\"./images/vdc_LB_webform.gif\" border=0 alt=\"Web Form\"></a>\n";
@@ -5441,6 +5451,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 								{web_form_vars = '?' + web_form_vars}
 
 							TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars;
+
+							var regWFAqavars = new RegExp("\\?&","ig");
+							var regWFAaavars = new RegExp("&&","ig");
+							TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?');
+							TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&');
 							}
 
 						if (VDIC_web_form_address_two.match(regWFAcustom))
@@ -5536,6 +5551,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 								{web_form_vars_two = '?' + web_form_vars_two}
 
 							TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two;
+
+							var regWFAqavars = new RegExp("\\?&","ig");
+							var regWFAaavars = new RegExp("&&","ig");
+							TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?');
+							TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&');
 							}
 
 						document.getElementById("WebFormSpan").innerHTML = "<a href=\"" + TEMP_VDIC_web_form_address + "\" target=\"" + web_form_target + "\" onMouseOver=\"WebFormRefresH();\"><IMG SRC=\"./images/vdc_LB_webform.gif\" border=0 alt=\"Web Form\"></a>\n";
@@ -6774,6 +6794,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 									{web_form_vars = '?' + web_form_vars}
 
 								TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars;
+
+								var regWFAqavars = new RegExp("\\?&","ig");
+								var regWFAaavars = new RegExp("&&","ig");
+								TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?');
+								TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&');
 								}
 
 							if (VDIC_web_form_address_two.match(regWFAcustom))
@@ -6869,6 +6894,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 									{web_form_vars_two = '?' + web_form_vars_two}
 
 								TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two;
+
+								var regWFAqavars = new RegExp("\\?&","ig");
+								var regWFAaavars = new RegExp("&&","ig");
+								TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?');
+								TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&');
 								}
 
 
@@ -7150,6 +7180,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				{web_form_vars = '?' + web_form_vars}
 
 			TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars;
+
+			var regWFAqavars = new RegExp("\\?&","ig");
+			var regWFAaavars = new RegExp("&&","ig");
+			TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?');
+			TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&');
 			}
 
 
@@ -7275,6 +7310,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				{web_form_vars_two = '?' + web_form_vars_two}
 
 			TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two;
+
+			var regWFAqavars = new RegExp("\\?&","ig");
+			var regWFAaavars = new RegExp("&&","ig");
+			TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?');
+			TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&');
 			}
 
 
diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php
index c7c3f62c..18fe82fc 100644
--- a/agc_2-X/trunk/www/agc/vicidial.php
+++ b/agc_2-X/trunk/www/agc/vicidial.php
@@ -5232,6 +5232,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 								{web_form_vars = '?' + web_form_vars}
 
 							TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars;
+
+							var regWFAqavars = new RegExp("\\?&","ig");
+							var regWFAaavars = new RegExp("&&","ig");
+							TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?');
+							TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&');
 							}
 
 						if (VDIC_web_form_address_two.match(regWFAcustom))
@@ -5327,6 +5332,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 								{web_form_vars_two = '?' + web_form_vars_two}
 
 							TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two;
+
+							var regWFAqavars = new RegExp("\\?&","ig");
+							var regWFAaavars = new RegExp("&&","ig");
+							TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?');
+							TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&');
 							}
 
 						document.getElementById("WebFormSpan").innerHTML = "<a href=\"" + TEMP_VDIC_web_form_address + "\" target=\"" + web_form_target + "\" onMouseOver=\"WebFormRefresH();\"><IMG SRC=\"./images/vdc_LB_webform.gif\" border=0 alt=\"Web Form\"></a>\n";
@@ -5648,6 +5658,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 								{web_form_vars = '?' + web_form_vars}
 
 							TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars;
+
+							var regWFAqavars = new RegExp("\\?&","ig");
+							var regWFAaavars = new RegExp("&&","ig");
+							TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?');
+							TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&');
 							}
 
 						if (VDIC_web_form_address_two.match(regWFAcustom))
@@ -5743,6 +5758,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 								{web_form_vars_two = '?' + web_form_vars_two}
 
 							TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two;
+
+							var regWFAqavars = new RegExp("\\?&","ig");
+							var regWFAaavars = new RegExp("&&","ig");
+							TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?');
+							TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&');
 							}
 
 						document.getElementById("WebFormSpan").innerHTML = "<a href=\"" + TEMP_VDIC_web_form_address + "\" target=\"" + web_form_target + "\" onMouseOver=\"WebFormRefresH();\"><IMG SRC=\"./images/vdc_LB_webform.gif\" border=0 alt=\"Web Form\"></a>\n";
@@ -6984,6 +7004,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 									{web_form_vars = '?' + web_form_vars}
 
 								TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars;
+
+								var regWFAqavars = new RegExp("\\?&","ig");
+								var regWFAaavars = new RegExp("&&","ig");
+								TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?');
+								TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&');
 								}
 
 							if (VDIC_web_form_address_two.match(regWFAcustom))
@@ -7079,6 +7104,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 									{web_form_vars_two = '?' + web_form_vars_two}
 
 								TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two;
+
+								var regWFAqavars = new RegExp("\\?&","ig");
+								var regWFAaavars = new RegExp("&&","ig");
+								TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?');
+								TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&');
 								}
 
 
@@ -7360,6 +7390,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				{web_form_vars = '?' + web_form_vars}
 
 			TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars;
+
+			var regWFAqavars = new RegExp("\\?&","ig");
+			var regWFAaavars = new RegExp("&&","ig");
+			TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?');
+			TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&');
 			}
 
 
@@ -7485,6 +7520,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				{web_form_vars_two = '?' + web_form_vars_two}
 
 			TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two;
+
+			var regWFAqavars = new RegExp("\\?&","ig");
+			var regWFAaavars = new RegExp("&&","ig");
+			TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?');
+			TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&');
 			}