diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 3dad699bb2..04edfc54c0 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -174,36 +174,42 @@ function typesel_change() {
 			document.iform.address_subnet.disabled = 1;
 			document.iform.address_subnet.value = "";
 			document.iform.address_subnet.selected = 0;
-			newrows = totalrows+1;
+			newrows = totalrows+100;
 			for(i=2; i<newrows; i++) {
-				comd = 'document.iform.address_subnet' + i + '.disabled = 1;';
-				eval(comd);
-				comd = 'document.iform.address_subnet' + i + '.value = "";';
-				eval(comd);
+				var item = document.getElementById('document.iform.address_subnet' + i);
+				if(item) {
+					comd = 'document.iform.address_subnet' + i + '.disabled = 1;';
+					eval(comd);
+					comd = 'document.iform.address_subnet' + i + '.value = "";';
+					eval(comd);
+				}
 			}
 			break;
 		case 1:	/* network */
 			var cmd;
 			document.iform.address_subnet.disabled = 0;
-//			document.iform.address_subnet.value = "";
-			newrows = totalrows+1;
+			newrows = totalrows+100;
 			for(i=2; i<newrows; i++) {
-				comd = 'document.iform.address_subnet' + i + '.disabled = 0;';
-				eval(comd);
-//				comd = 'document.iform.address_subnet' + i + '.value = "32";';
-//				eval(comd);
+				var item = document.getElementById('document.iform.address_subnet' + i);
+				if(item) {
+					comd = 'document.iform.address_subnet' + i + '.disabled = 0;';
+					eval(comd);
+				}
 			}
 			break;
 		case 2:	/* port */
 			var cmd;
 			document.iform.address_subnet.disabled = 1;
 			document.iform.address_subnet.value = "";
-			newrows = totalrows+1;
+			newrows = totalrows+100;
 			for(i=2; i<newrows; i++) {
-				comd = 'document.iform.address_subnet' + i + '.disabled = 1;';
-				eval(comd);
-				comd = 'document.iform.address_subnet' + i + '.value = "32";';
-				eval(comd);
+				var item = document.getElementById('document.iform.address_subnet' + i);
+				if(item) {
+					comd = 'document.iform.address_subnet' + i + '.disabled = 1;';
+					eval(comd);
+					comd = 'document.iform.address_subnet' + i + '.value = "32";';
+					eval(comd);
+				}
 			}
 			break;
 	}
diff --git a/usr/local/www/row_helper.js b/usr/local/www/row_helper.js
index 9461067a74..b38e82bab5 100755
--- a/usr/local/www/row_helper.js
+++ b/usr/local/www/row_helper.js
@@ -24,11 +24,11 @@ var addRowTo = (function() {
 	for (i = 0; i < field_counter_js; i++) {
 		td = d.createElement("td");
 		if(rowtype[i] == 'textbox') {
-			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input name='" + rowname[i] + totalrows + "'></input> ";
+			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input id='" + rowname[i] + totalrows + "' name='" + rowname[i] + totalrows + "'></input> ";
 		} else if(rowtype[i] == 'select') {
-			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select name='" + rowname[i] + totalrows + "'><option value=\"32\" selected>32</option><option value=\"31\" >31</option><option value=\"30\" >30</option><option value=\"29\" >29</option><option value=\"28\" >28</option><option value=\"27\" >27</option><option value=\"26\" >26</option><option value=\"25\" >25</option><option value=\"24\" >24</option><option value=\"23\" >23</option><option value=\"22\" >22</option><option value=\"21\" >21</option><option value=\"20\" >20</option><option value=\"19\" >19</option><option value=\"18\" >18</option><option value=\"17\" >17</option><option value=\"16\" >16</option><option value=\"15\" >15</option><option value=\"14\" >14</option><option value=\"13\" >13</option><option value=\"12\" >12</option><option value=\"11\" >11</option><option value=\"10\" >10</option><option value=\"9\" >9</option><option value=\"8\" >8</option><option value=\"7\" >7</option><option value=\"6\" >6</option><option value=\"5\" >5</option><option value=\"4\" >4</option><option value=\"3\" >3</option><option value=\"2\" >2</option><option value=\"1\" >1</option></select> ";
+			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select id='" + rowname[i] + totalrows + "' name='" + rowname[i] + totalrows + "'><option value=\"32\" selected>32</option><option value=\"31\" >31</option><option value=\"30\" >30</option><option value=\"29\" >29</option><option value=\"28\" >28</option><option value=\"27\" >27</option><option value=\"26\" >26</option><option value=\"25\" >25</option><option value=\"24\" >24</option><option value=\"23\" >23</option><option value=\"22\" >22</option><option value=\"21\" >21</option><option value=\"20\" >20</option><option value=\"19\" >19</option><option value=\"18\" >18</option><option value=\"17\" >17</option><option value=\"16\" >16</option><option value=\"15\" >15</option><option value=\"14\" >14</option><option value=\"13\" >13</option><option value=\"12\" >12</option><option value=\"11\" >11</option><option value=\"10\" >10</option><option value=\"9\" >9</option><option value=\"8\" >8</option><option value=\"7\" >7</option><option value=\"6\" >6</option><option value=\"5\" >5</option><option value=\"4\" >4</option><option value=\"3\" >3</option><option value=\"2\" >2</option><option value=\"1\" >1</option></select> ";
 		} else {
-			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input type='checkbox' name='" + rowname[i] + totalrows + "'></input> ";
+			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input id='" + rowname[i] + totalrows + "' type='checkbox' name='" + rowname[i] + totalrows + "'></input> ";
 		}
 		tr.appendChild(td);
 	}
@@ -50,6 +50,7 @@ function removeRow(el) {
 	cel = el.getElementsByTagName("td").item(0);
 	el.parentNode.removeChild(el);
     }
+    totalrows--;
 }
 
 function find_unique_field_name(field_name) {