diff --git a/firewall/index.cgi b/firewall/index.cgi
index d18f950e7..31e03f387 100755
--- a/firewall/index.cgi
+++ b/firewall/index.cgi
@@ -298,7 +298,7 @@ else {
                                     }
 				# chain to jump to is filtered, switch of edit
                                 if ($edit && !$chain_filtered) {
-					push(@cols, &ui_link("edit_rule${ipvx}.cgi?version=${ipvx_arg}table=".&urlize($in{'table'})."&idx=$r->{'index'}",$act));
+					push(@cols, &ui_link("edit_rule${ipvx}.cgi?version=${ipvx_arg}&table=".&urlize($in{'table'})."&idx=$r->{'index'}",$act));
 					}
 				else {
                                         # add col for not visible checkmark
@@ -320,7 +320,7 @@ else {
 					$mover .= "<img src=images/gap.gif>";
 					}
 				else {
-					$mover .= "<a href='move.cgi?version=${ipvx_arg}table=".
+					$mover .= "<a href='move.cgi?version=${ipvx_arg}&table=".
 					      &urlize($in{'table'}).
 					      "&idx=$r->{'index'}&".
 					      "down=1'><img src=".
@@ -330,7 +330,7 @@ else {
 					$mover .= "<img src=images/gap.gif>";
 					}
 				else {
-					$mover .= "<a href='move.cgi?version=${ipvx_arg}table=".
+					$mover .= "<a href='move.cgi?version=${ipvx_arg}&table=".
 					      &urlize($in{'table'}).
 					      "&idx=$r->{'index'}&".
 					      "up=1'><img src=images/up.gif ".
@@ -340,12 +340,12 @@ else {
 
 				# Before / after adder
 				local $adder;
-				$adder .= "<a href='edit_rule${ipvx}.cgi?version=${ipvx_arg}table=".
+				$adder .= "<a href='edit_rule${ipvx}.cgi?version=${ipvx_arg}&table=".
 				      &urlize($in{'table'}).
 				      "&chain=".&urlize($c)."&new=1&".
 				      "after=$r->{'index'}'><img src=".
 				      "images/after.gif border=0></a>";
-				$adder .= "<a href='edit_rule${ipvx}.cgi?version=${ipvx_arg}table=".
+				$adder .= "<a href='edit_rule${ipvx}.cgi?version=${ipvx_arg}&table=".
 				      &urlize($in{'table'}).
 				      "&chain=".&urlize($c)."&new=1&".
 				      "before=$r->{'index'}'><img src=".