diff --git a/src/EventHub/EventHub.Test/ScenarioTests/ClusterTest.ps1 b/src/EventHub/EventHub.Test/ScenarioTests/ClusterTest.ps1
index 45b9a02c9a22..5b21c740589b 100644
--- a/src/EventHub/EventHub.Test/ScenarioTests/ClusterTest.ps1
+++ b/src/EventHub/EventHub.Test/ScenarioTests/ClusterTest.ps1
@@ -19,12 +19,12 @@ Tests Eventhub Cluster operations.
 
 function ClusterTest
 {
-    # Setup    
+    # Setup
     $location = "southcentralus"
 	$clusterName = getAssetName "Eventhub-Cluster-"
     $resourceGroupName = getAssetName "RSG-Cluster"
-
-    Write-Debug "  Create resource group"
+	
+	Write-Debug "  Create resource group"
     Write-Debug " Resource Group Name : $resourceGroupName"
     $ResultResourceGroup = New-AzResourceGroup -Name $resourceGroupName -Location $location -Force   
 
diff --git a/src/EventHub/EventHub/ChangeLog.md b/src/EventHub/EventHub/ChangeLog.md
index a6aab10aaafc..2cfd57e27e28 100644
--- a/src/EventHub/EventHub/ChangeLog.md
+++ b/src/EventHub/EventHub/ChangeLog.md
@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fixed Cluster commands for EventHub cluster without tags
+* updated help text for PartnerNamespace of AzEventHubGeoDRConfiguration commands 
 
 ## Version 1.7.0
 * Added optional switch parameter `TrustedServiceAccessEnabled` to `Set-AzEventHubNetworkRuleSet` cmdlet
diff --git a/src/EventHub/EventHub/Cmdlets/DRConfig/NewAzureEventHubGeoDRConfiguration.cs b/src/EventHub/EventHub/Cmdlets/DRConfig/NewAzureEventHubGeoDRConfiguration.cs
index 987ac454d66a..3ef60eefa96a 100644
--- a/src/EventHub/EventHub/Cmdlets/DRConfig/NewAzureEventHubGeoDRConfiguration.cs
+++ b/src/EventHub/EventHub/Cmdlets/DRConfig/NewAzureEventHubGeoDRConfiguration.cs
@@ -46,7 +46,7 @@ public class NewAzureRmEventHubGeoDRConfiguration : AzureEventHubsCmdletBase
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
-        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, Position = 3, HelpMessage = "DR Configuration PartnerNamespace")]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, Position = 3, HelpMessage = "DR Configuration PartnerNamespace ARM ID")]
         [ValidateNotNullOrEmpty]
         public string PartnerNamespace { get; set; }
 
diff --git a/src/EventHub/EventHub/Models/PSEventHubDRConfigurationAttributes.cs b/src/EventHub/EventHub/Models/PSEventHubDRConfigurationAttributes.cs
index 01269ca68f4f..445f8ba46c69 100644
--- a/src/EventHub/EventHub/Models/PSEventHubDRConfigurationAttributes.cs
+++ b/src/EventHub/EventHub/Models/PSEventHubDRConfigurationAttributes.cs
@@ -51,7 +51,7 @@ public PSEventHubDRConfigurationAttributes(ArmDisasterRecovery drResource)
         public ProvisioningStateDR? ProvisioningState { get; set; }
 
         /// <summary>
-        /// Gets or sets a value that indicates partner namespace
+        /// Gets or sets a value that indicates partner namespace ARM ID
         /// </summary>
         public string PartnerNamespace { get; set; }
 
diff --git a/src/EventHub/EventHub/Models/PSEventHubsClusterAttributes.cs b/src/EventHub/EventHub/Models/PSEventHubsClusterAttributes.cs
index e25d71ceb315..a736cc468948 100644
--- a/src/EventHub/EventHub/Models/PSEventHubsClusterAttributes.cs
+++ b/src/EventHub/EventHub/Models/PSEventHubsClusterAttributes.cs
@@ -36,7 +36,7 @@ public PSEventHubClusterAttributes(Cluster cluster)
                 UpdatedAt = cluster.UpdatedAt;
                 Status = cluster.Status;
                 Sku = new PSEventHubsClusterSkuAttributes(cluster.Sku);
-                if (cluster.Tags.Count > 0)
+                if (cluster.Tags != null)
                 {
                     Tags = new Dictionary<string, string>(cluster.Tags);
                 }
diff --git a/src/EventHub/EventHub/help/New-AzEventHubGeoDRConfiguration.md b/src/EventHub/EventHub/help/New-AzEventHubGeoDRConfiguration.md
index 46758328a43c..864761dc5513 100644
--- a/src/EventHub/EventHub/help/New-AzEventHubGeoDRConfiguration.md
+++ b/src/EventHub/EventHub/help/New-AzEventHubGeoDRConfiguration.md
@@ -145,7 +145,7 @@ Accept wildcard characters: False
 ```
 
 ### -PartnerNamespace
-DR Configuration PartnerNamespace
+DR Configuration PartnerNamespace ARM ID
 
 ```yaml
 Type: System.String