diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
index f2d7bbeb189..6f522fe1e8c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
@@ -153,6 +153,8 @@ public class UpdateStoragePoolCmd extends BaseCmd {
         if (ObjectUtils.anyNotNull(name, capacityIops, capacityBytes, url, isTagARule, tags) ||
                 MapUtils.isNotEmpty(details)) {
             result = _storageService.updateStoragePool(this);
+        } else {
+            result = _storageService.getStoragePool(getId());
         }
 
         if (enabled != null) {
diff --git a/test/integration/smoke/test_direct_download.py b/test/integration/smoke/test_direct_download.py
index 6570bb9f0b3..e6960163bc2 100644
--- a/test/integration/smoke/test_direct_download.py
+++ b/test/integration/smoke/test_direct_download.py
@@ -251,7 +251,10 @@ class TestDirectDownloadTemplates(cloudstackTestCase):
             self.apiclient,
             id=poolId
         )
-        return local_pool[0].tags
+        if local_pool[0].tags:
+            return local_pool[0].tags
+        else:
+            return ""
 
     def updateStoragePoolTags(self, poolId, tags):
         StoragePool.update(
diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue
index 423338c9264..a47fce6aa81 100644
--- a/ui/src/views/compute/DeployVM.vue
+++ b/ui/src/views/compute/DeployVM.vue
@@ -1232,6 +1232,7 @@ export default {
       return _.map(this.affinityGroups, 'id')
     },
     params () {
+      const listAll = isAdmin()
       return {
         serviceOfferings: {
           list: 'listServiceOfferings',
@@ -1279,7 +1280,7 @@ export default {
             domainid: this.owner.domainid,
             projectid: this.owner.projectid,
             keyword: undefined,
-            listall: false
+            listall: listAll
           }
         },
         sshKeyPairs: {
@@ -1287,8 +1288,11 @@ export default {
           options: {
             page: 1,
             pageSize: 10,
+            account: this.owner.account,
+            domainid: this.owner.domainid,
+            projectid: this.owner.projectid,
             keyword: undefined,
-            listall: false
+            listall: listAll
           }
         },
         userDatas: {
@@ -1296,8 +1300,11 @@ export default {
           options: {
             page: 1,
             pageSize: 10,
+            account: this.owner.account,
+            domainid: this.owner.domainid,
+            projectid: this.owner.projectid,
             keyword: undefined,
-            listall: false
+            listall: listAll
           }
         },
         networks: {