diff --git a/src/AzureExtension/Providers/RepositoryProvider.cs b/src/AzureExtension/Providers/RepositoryProvider.cs
index 6be975f0..fecc5308 100644
--- a/src/AzureExtension/Providers/RepositoryProvider.cs
+++ b/src/AzureExtension/Providers/RepositoryProvider.cs
@@ -78,10 +78,10 @@ public IAsyncOperation<RepositoryUriSupportResult> IsUriSupportedAsync(Uri uri,
     /// <returns>A list of projects the organization has.</returns>
     private List<TeamProjectReference> GetProjects(Microsoft.VisualStudio.Services.Account.Account organization, DeveloperId.DeveloperId azureDeveloperId)
     {
-        var connection = AzureClientProvider.GetConnectionForLoggedInDeveloper(organization.AccountUri, azureDeveloperId);
-
         try
         {
+            var connection = AzureClientProvider.GetConnectionForLoggedInDeveloper(organization.AccountUri, azureDeveloperId);
+
             // connection can be null if the organization is disabled.
             if (connection != null)
             {
diff --git a/src/AzureExtension/Widgets/Templates/AzurePullRequestsTemplate.json b/src/AzureExtension/Widgets/Templates/AzurePullRequestsTemplate.json
index 7e7d7541..1eb739e1 100644
--- a/src/AzureExtension/Widgets/Templates/AzurePullRequestsTemplate.json
+++ b/src/AzureExtension/Widgets/Templates/AzurePullRequestsTemplate.json
@@ -16,7 +16,7 @@
           "items": [
             {
               "type": "TextBlock",
-              "text": "${if(is_loading_data, '%Widget_Template/ContentLoading%', '%Widget_Template/EmptyWorkItems%')}",
+              "text": "%Widget_Template/EmptyWorkItems%",
               "wrap": true,
               "weight": "bolder",
               "horizontalAlignment": "center"
@@ -85,7 +85,7 @@
         },
         {
           "type": "Container",
-          "$when": "${(count(items) >= maxItemsDisplayed)}",
+          "$when": "${(count(items) >= 25)}",
           "items": [
             {
               "type": "TextBlock",
diff --git a/src/AzureExtension/Widgets/Templates/AzureQueryListTemplate.json b/src/AzureExtension/Widgets/Templates/AzureQueryListTemplate.json
index c022b4be..dfc9c1f1 100644
--- a/src/AzureExtension/Widgets/Templates/AzureQueryListTemplate.json
+++ b/src/AzureExtension/Widgets/Templates/AzureQueryListTemplate.json
@@ -16,7 +16,7 @@
           "items": [
             {
               "type": "TextBlock",
-              "text": "${if(is_loading_data, '%Widget_Template/ContentLoading%', '%Widget_Template/EmptyWorkItems%')}",
+              "text": "%Widget_Template/EmptyWorkItems%",
               "wrap": true,
               "weight": "bolder",
               "horizontalAlignment": "center"
@@ -151,7 +151,7 @@
         },
         {
           "type": "Container",
-          "$when": "${workItemCount > maxItemsDisplayed}",
+          "$when": "${workItemCount > 25}",
           "items": [
             {
               "type": "TextBlock",