diff --git a/src/etc/inc/shaper.inc b/src/etc/inc/shaper.inc
index 3c977d5f2..8fb7a6a44 100644
--- a/src/etc/inc/shaper.inc
+++ b/src/etc/inc/shaper.inc
@@ -42,7 +42,6 @@ function &get_reference_to_me_in_config(&$mypath)
 	foreach ($mypath as $indeks) {
 		$ptr =& $ptr['queue'][$indeks];
 	}
-
 	return $ptr;
 }
 
@@ -4307,9 +4306,6 @@ function read_altq_config() {
 
 	$altq_list_queues = array();
 
-	if (!is_array($config['shaper']['queue']))
-		return;
-
 	foreach ($a_int as $key => $conf) {
 		$int = $conf['interface'];
 		$root =& new altq_root_queue();
diff --git a/src/etc/inc/xmlparse.inc b/src/etc/inc/xmlparse.inc
index 1b235c7f0..a8bcadc92 100644
--- a/src/etc/inc/xmlparse.inc
+++ b/src/etc/inc/xmlparse.inc
@@ -45,7 +45,7 @@ function listtags()
 		'npt', 'ntpserver',
 		'onetoone', 'openvpn-server', 'openvpn-client', 'openvpn-csc', 'option',
 		'package', 'passthrumac', 'phase1', 'phase2', 'ppp', 'pppoe', 'priv', 'proxyarpnet', 'pool', 'pages', 'pipe',
-		'qinqentry', 'queue',
+		'qinqentry', 
 		'radnsserver', 'roll', 'route', 'row', 'rrddatafile', 'rule',
 		'schedule', 'service', 'servernat', 'servers', 'serversdisabled', 'staticmap', 'subqueue',
 		'tab', 'timerange', 'tunnel',
diff --git a/src/www/firewall_shaper.php b/src/www/firewall_shaper.php
index c3f992a90..3966cbb52 100644
--- a/src/www/firewall_shaper.php
+++ b/src/www/firewall_shaper.php
@@ -58,8 +58,11 @@ if ($_GET) {
                 $action = htmlspecialchars($_GET['action']);
 }
 if ($_POST) {
-	if ($_POST['name'])
+	if (isset($_POST['name']) && trim($_POST['name']) != '') {
 		$qname = htmlspecialchars(trim($_POST['name']));
+        } else {
+                $qname = htmlspecialchars(trim($_POST['newname']));
+        }
         if ($_POST['interface'])
                 $interface = htmlspecialchars(trim($_POST['interface']));
 	if ($_POST['parentqueue'])