diff --git a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html
index 4e8ee4c2d..41fa8a661 100644
--- a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html
+++ b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html
@@ -46,14 +46,14 @@
           <td>Allocated</td>
           <td>{{ $ctrl.volume.Allocated }}</td>
         </tr>
-        <tr>
-          <td>IOPS Max</td>
-          <td>{{ $ctrl.volume.IOPSMax }}</td>
-        </tr>
         <tr>
           <td>IOPS Min</td>
           <td>{{ $ctrl.volume.IOPSMin }}</td>
         </tr>
+        <tr>
+          <td>IOPS Max</td>
+          <td>{{ $ctrl.volume.IOPSMax }}</td>
+        </tr>
         <tr>
           <td>Local Drive Only</td>
           <td>{{ $ctrl.volume.LocalDriveOnly }}</td>
diff --git a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfoController.js b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfoController.js
index 01daf39a8..d63e3a4d9 100644
--- a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfoController.js
+++ b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfoController.js
@@ -18,9 +18,11 @@ function ($state, StoridgeVolumeService, Notifications) {
 
   this.initLabels = function() {
     var labels = this.volume.Labels;
-    this.formValues.Labels = Object.keys(labels).map(function(key) {
-      return { name:key, value:labels[key] };
-    });
+    if (labels) {
+      this.formValues.Labels = Object.keys(labels).map(function(key) {
+        return { name:key, value:labels[key] };
+      });
+    }
   };
 
   this.updateVolume = function() {
@@ -68,9 +70,13 @@ function ($state, StoridgeVolumeService, Notifications) {
     }
     if (volume.IOPSMin === data.IOPSMin || !volume.IOPSMin) {
       delete volume.IOPSMin;
+    } else {
+      volume.IOPSMin = volume.IOPSMin.toString();
     }
     if (volume.IOPSMax === data.IOPSMax || !volume.IOPSMax) {
       delete volume.IOPSMax;
+    } else {
+      volume.IOPSMax = volume.IOPSMax.toString();
     }
     if (volume.BandwidthMin === data.BandwidthMin || !volume.BandwidthMin) {
       delete volume.BandwidthMin;
@@ -78,6 +84,7 @@ function ($state, StoridgeVolumeService, Notifications) {
     if (volume.BandwidthMax === data.BandwidthMax || !volume.BandwidthMax) {
       delete volume.BandwidthMax;
     }
+    this.prepareLabels(volume);
     return volume;
   };
 
@@ -85,7 +92,6 @@ function ($state, StoridgeVolumeService, Notifications) {
     this.state.isUpdating = true;
 
     var volume = this.prepareVolume();
-    this.prepareLabels(volume);
     volume.Name = this.volume.Name;
     StoridgeVolumeService.update(volume)
     .then(function success() {