diff --git a/releasenotes/notes/queens-ae86cb21aebaadfd.yaml b/releasenotes/notes/queens-ae86cb21aebaadfd.yaml
new file mode 100644
index 0000000..60f8ed5
--- /dev/null
+++ b/releasenotes/notes/queens-ae86cb21aebaadfd.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - >
+    [`bug/1647995 <https://bugs.launchpad.net/zaqar-ui/+bug/1647995>`_]
+    Fixed queue create/update without metadata modification.
+    When metadata is not modified in queue create/update,
+    the operation had been failed.
+
diff --git a/zaqar_ui/static/dashboard/project/queues/actions/list-message.controller.js b/zaqar_ui/static/dashboard/project/queues/actions/list-message.controller.js
index 2361794..ce674ae 100644
--- a/zaqar_ui/static/dashboard/project/queues/actions/list-message.controller.js
+++ b/zaqar_ui/static/dashboard/project/queues/actions/list-message.controller.js
@@ -46,7 +46,7 @@
     */
 
     zaqar.getMessages(ctrl.queue).then(function (response) {
-      ctrl.messages = response;
+      ctrl.messages = response.data;
     });
 
     //////////
diff --git a/zaqar_ui/static/dashboard/project/queues/actions/list-message.controller.spec.js b/zaqar_ui/static/dashboard/project/queues/actions/list-message.controller.spec.js
index c5b2698..6ed5f74 100644
--- a/zaqar_ui/static/dashboard/project/queues/actions/list-message.controller.spec.js
+++ b/zaqar_ui/static/dashboard/project/queues/actions/list-message.controller.spec.js
@@ -29,7 +29,7 @@
       };
       zaqar = $injector.get('horizon.app.core.openstack-service-api.zaqar');
       deferred = $q.defer();
-      deferred.resolve([{id: '1'}]);
+      deferred.resolve({data: [{id: '1'}]});
       spyOn(zaqar, 'getMessages').and.returnValue(deferred.promise);
 
       ctrl = $controller(
diff --git a/zaqar_ui/static/dashboard/project/queues/actions/signed-url.service.js b/zaqar_ui/static/dashboard/project/queues/actions/signed-url.service.js
index 5e5faa5..82a42ff 100644
--- a/zaqar_ui/static/dashboard/project/queues/actions/signed-url.service.js
+++ b/zaqar_ui/static/dashboard/project/queues/actions/signed-url.service.js
@@ -65,42 +65,48 @@
     // form
     var form = [
       {
-        type: "section",
-        htmlClass: "col-sm-12",
+        type: 'section',
+        htmlClass: 'row',
         items: [
-          { // for result message
-            type: "help",
-            helpvalue: "",
-            condition: true
-          },
           {
-            key: "paths",
-            type: "checkboxes",
-            title: gettext("Paths"),
-            titleMap: [
-              {value: "messages", name: gettext("Messages")},
-              {value: "subscriptions", name: gettext("Subscriptions")},
-              {value: "claims", name: gettext("Claims")}
-            ],
-            htmlClass: "horizontal-checkboxes"
-          },
-          {
-            key: "ttl_seconds",
-            title: gettext("TTL Seconds")
-          },
-          {
-            key: "methods",
-            title: gettext("Methods"),
-            type: "checkboxes",
-            titleMap: [
-              {value: "GET", name: gettext("GET")},
-              {value: "HEAD", name: gettext("HEAD")},
-              {value: "OPTIONS", name: gettext("OPTIONS")},
-              {value: "POST", name: gettext("POST")},
-              {value: "PUT", name: gettext("PUT")},
-              {value: "DELETE", name: gettext("DELETE")}
-            ],
-            htmlClass: "horizontal-checkboxes"
+            type: "section",
+            htmlClass: "col-sm-12",
+            items: [
+              { // for result message
+                type: "help",
+                helpvalue: "",
+                condition: true
+              },
+              {
+                key: "paths",
+                type: "checkboxes",
+                title: gettext("Paths"),
+                titleMap: [
+                  {value: "messages", name: gettext("Messages")},
+                  {value: "subscriptions", name: gettext("Subscriptions")},
+                  {value: "claims", name: gettext("Claims")}
+                ],
+                htmlClass: "horizontal-checkboxes"
+              },
+              {
+                key: "ttl_seconds",
+                title: gettext("TTL Seconds")
+              },
+              {
+                key: "methods",
+                title: gettext("Methods"),
+                type: "checkboxes",
+                titleMap: [
+                  {value: "GET", name: gettext("GET")},
+                  {value: "HEAD", name: gettext("HEAD")},
+                  {value: "OPTIONS", name: gettext("OPTIONS")},
+                  {value: "POST", name: gettext("POST")},
+                  {value: "PUT", name: gettext("PUT")},
+                  {value: "DELETE", name: gettext("DELETE")}
+                ],
+                htmlClass: "horizontal-checkboxes"
+              }
+            ]
           }
         ]
       }
@@ -172,11 +178,11 @@
         config.form = angular.copy(form);
 
         // for result message
-        config.form[0].items[0].helpvalue = "<div class='alert alert-success'>" +
+        config.form[0].items[0].items[0].helpvalue = "<div class='alert alert-success'>" +
           interpolate(message.success,
                       [name, response.data.expires, response.data.signature]
           ) + "</div>";
-        config.form[0].items[0].condition = false;
+        config.form[0].items[0].items[0].condition = false;
 
         // display new dialog
         waitSpinner.hideModalSpinner();