diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureBackupContainer.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureBackupContainer.cs
index 8607be5ce212..0e3edf307f2d 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureBackupContainer.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureBackupContainer.cs
@@ -57,6 +57,8 @@ public override void ExecuteCmdlet()
                 ListContainerResponse listContainerResponse = AzureBackupClient.Container.ListAsync(queryFilterString,
                     GetCustomRequestHeaders(), CmdletCancellationToken).Result;
 
+                WriteVerbose(string.Format("# of fetched containers = {0}", listContainerResponse.Objects.Count));
+
                 List<ContainerInfo> containerInfos = listContainerResponse.Objects.ToList();
 
                 // When resource group name is specified, remove all containers whose resource group name
@@ -69,10 +71,24 @@ public override void ExecuteCmdlet()
                     });
                 }
 
-                WriteObject(containerInfos.ConvertAll(containerInfo =>
+                WriteVerbose(string.Format("# of containers after resource group filter = {0}", listContainerResponse.Objects.Count));
+
+                List<AzureBackupContainer> containers = containerInfos.ConvertAll(containerInfo =>
+                {
+                    return new AzureBackupContainer(containerInfo, ResourceGroupName, ResourceName, Location);
+                });
+
+                if (!string.IsNullOrEmpty(ResourceName) & !string.IsNullOrEmpty(ResourceGroupName))
                 {
-                    return new AzureBackupContainer(containerInfo, ResourceGroupName, ResourceName,  Location);
-                }));
+                    if (containers.Any())
+                    {
+                        WriteObject(containers.First());
+                    }
+                }
+                else
+                {
+                    WriteObject(containers);
+                }
             });
         }
 
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupContainerStatus.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupContainerStatus.cs
index ed3d37517fa6..5888ecf2be98 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupContainerStatus.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupContainerStatus.cs
@@ -22,8 +22,9 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
 {
     public enum AzureBackupContainerStatus
     {
+        All,
         Registered,
         Registering,
-        NotRegistered
+        NotRegistered,
     }
 }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupContainerType.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupContainerType.cs
index 6875a8cbd60f..01ff635bdb93 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupContainerType.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupContainerType.cs
@@ -22,6 +22,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
 {
     public enum AzureBackupContainerType
     {
-        AzureVirtualMachine
+        All,
+        AzureVirtualMachine,
     }
 }