diff --git a/Maverick.PCF.Builder/Helper/CDSHelper.cs b/Maverick.PCF.Builder/Helper/DataverseHelper.cs
similarity index 96%
rename from Maverick.PCF.Builder/Helper/CDSHelper.cs
rename to Maverick.PCF.Builder/Helper/DataverseHelper.cs
index 13aa015..8598f85 100644
--- a/Maverick.PCF.Builder/Helper/CDSHelper.cs
+++ b/Maverick.PCF.Builder/Helper/DataverseHelper.cs
@@ -13,7 +13,7 @@
 
 namespace Maverick.PCF.Builder.Helper
 {
-    public class CDSHelper
+    public class DataverseHelper
     {
         /// <summary>
         /// Retrieve list of unmanaged and visible solutions
@@ -32,7 +32,7 @@ public static EntityCollection RetrieveSolutions(IOrganizationService orgService
             querySolution.Criteria.AddCondition("ismanaged", ConditionOperator.Equal, false);
             querySolution.Criteria.AddCondition("isvisible", ConditionOperator.Equal, true);
             LinkEntity linkPublisher = querySolution.AddLink("publisher", "publisherid", "publisherid");
-            linkPublisher.Columns = new ColumnSet("customizationprefix");
+            linkPublisher.Columns = new ColumnSet("customizationprefix", "uniquename", "friendlyname");
             linkPublisher.EntityAlias = "pub";
 
             return orgService.RetrieveMultiple(querySolution);
diff --git a/Maverick.PCF.Builder/MainPluginControl.cs b/Maverick.PCF.Builder/MainPluginControl.cs
index 6d6a213..b585b71 100644
--- a/Maverick.PCF.Builder/MainPluginControl.cs
+++ b/Maverick.PCF.Builder/MainPluginControl.cs
@@ -378,7 +378,9 @@ private void Routine_ExistingSolution()
         {
             if (chkUseExistingSolution.Checked)
             {
-                txtSolutionName.Visible = false;
+                txtSolutionFriendlyName.Visible = false;
+                //txtSolutionName.Visible = false;
+                txtPublisherFriendlyName.Enabled = false;
                 txtPublisherUniqueName.Enabled = false;
                 txtPublisherPrefix.Enabled = false;
                 cboxSolutions.Visible = true;
@@ -387,7 +389,9 @@ private void Routine_ExistingSolution()
             }
             else
             {
-                txtSolutionName.Visible = true;
+                txtSolutionFriendlyName.Visible = true;
+                //txtSolutionName.Visible = true;
+                txtPublisherFriendlyName.Enabled = true;
                 txtPublisherUniqueName.Enabled = true;
                 txtPublisherPrefix.Enabled = true;
                 cboxSolutions.Visible = false;
@@ -1422,7 +1426,7 @@ private void LoadSolutions()
                 {
                     var start = DateTime.Now;
 
-                    args.Result = CDSHelper.RetrieveSolutions(Service);
+                    args.Result = DataverseHelper.RetrieveSolutions(Service);
 
                     var end = DateTime.Now;
                     var duration = end - start;
@@ -1472,7 +1476,7 @@ private void ExportAndUnpackSolutions(string solutionName, string exportToPath)
                 {
                     var start = DateTime.Now;
 
-                    args.Result = CDSHelper.ExportSolution(Service, solutionName);
+                    args.Result = DataverseHelper.ExportSolution(Service, solutionName);
 
                     var end = DateTime.Now;
                     var duration = end - start;
@@ -2313,10 +2317,12 @@ private void cboxSolutions_SelectedIndexChanged(object sender, EventArgs e)
         {
             SealedClasses.SolutionDetails selectedSolution = (SealedClasses.SolutionDetails)cboxSolutions.SelectedItem;
 
+            txtSolutionName.Text = selectedSolution.MetaData.GetAttributeValue<string>("uniquename");
+            txtSolutionFriendlyName.Text = selectedSolution.MetaData.GetAttributeValue<string>("friendlyname");
+            txtPublisherUniqueName.Text = (selectedSolution.MetaData.GetAttributeValue<AliasedValue>("pub.uniquename")).Value.ToString();
+            txtPublisherFriendlyName.Text = (selectedSolution.MetaData.GetAttributeValue<AliasedValue>("pub.friendlyname")).Value.ToString();
             txtPublisherPrefix.Text = (selectedSolution.MetaData.GetAttributeValue<AliasedValue>("pub.customizationprefix")).Value.ToString();
-            txtPublisherUniqueName.Text = selectedSolution.MetaData.GetAttributeValue<EntityReference>("publisherid").Name;
             txtSolutionVersion.Text = selectedSolution.MetaData.GetAttributeValue<string>("version");
-            txtSolutionName.Text = selectedSolution.MetaData.GetAttributeValue<string>("uniquename");
         }
 
         private void MainPluginControl_OnCloseTool(object sender, EventArgs e)
diff --git a/Maverick.PCF.Builder/MainPluginControl.designer.cs b/Maverick.PCF.Builder/MainPluginControl.designer.cs
index 47ea544..7b40757 100644
--- a/Maverick.PCF.Builder/MainPluginControl.designer.cs
+++ b/Maverick.PCF.Builder/MainPluginControl.designer.cs
@@ -677,7 +677,6 @@ private void InitializeComponent()
             // 
             // grpBoxSolutionDetails
             // 
-            this.grpBoxSolutionDetails.Controls.Add(this.txtSolutionFriendlyName);
             this.grpBoxSolutionDetails.Controls.Add(this.txtPublisherFriendlyName);
             this.grpBoxSolutionDetails.Controls.Add(this.label16);
             this.grpBoxSolutionDetails.Controls.Add(this.label15);
@@ -697,6 +696,7 @@ private void InitializeComponent()
             this.grpBoxSolutionDetails.Controls.Add(this.label9);
             this.grpBoxSolutionDetails.Controls.Add(this.txtSolutionName);
             this.grpBoxSolutionDetails.Controls.Add(this.cboxSolutions);
+            this.grpBoxSolutionDetails.Controls.Add(this.txtSolutionFriendlyName);
             this.grpBoxSolutionDetails.Location = new System.Drawing.Point(19, 379);
             this.grpBoxSolutionDetails.Name = "grpBoxSolutionDetails";
             this.grpBoxSolutionDetails.Size = new System.Drawing.Size(494, 213);
diff --git a/Maverick.PCF.Builder/Maverick.PCF.Builder.csproj b/Maverick.PCF.Builder/Maverick.PCF.Builder.csproj
index 29e1906..7ae3395 100644
--- a/Maverick.PCF.Builder/Maverick.PCF.Builder.csproj
+++ b/Maverick.PCF.Builder/Maverick.PCF.Builder.csproj
@@ -239,7 +239,7 @@
     <Compile Include="Helper\Commands.cs" />
     <Compile Include="Helper\Enum.cs" />
     <Compile Include="Helper\JsonHelper.cs" />
-    <Compile Include="Helper\CDSHelper.cs" />
+    <Compile Include="Helper\DataverseHelper.cs" />
     <Compile Include="Helper\Telemetry.cs" />
     <Compile Include="Helper\XmlHelper.cs" />
     <Compile Include="MainPlugin.cs" />
diff --git a/Maverick.PCF.Builder/ReleaseNotes.txt b/Maverick.PCF.Builder/ReleaseNotes.txt
index ac4352f..6899b59 100644
--- a/Maverick.PCF.Builder/ReleaseNotes.txt
+++ b/Maverick.PCF.Builder/ReleaseNotes.txt
@@ -6,4 +6,4 @@
 1. Publisher prefix only accepts lowercase to align it with Dataverse (#35)
 
 ---- BUG FIXES ----
-No bug fixes in this release
\ No newline at end of file
+1. Bug fixed with use of "Existing Solution"
\ No newline at end of file
diff --git a/PCF-CustomControlBuilder.nuspec b/PCF-CustomControlBuilder.nuspec
index b80a8ea..7a81589 100644
--- a/PCF-CustomControlBuilder.nuspec
+++ b/PCF-CustomControlBuilder.nuspec
@@ -23,7 +23,7 @@
 1. Publisher prefix only accepts lowercase to align it with Dataverse (#35)
 
 ---- BUG FIXES ----
-No bug fixes in this release
+1. Bug fixed with use of "Existing Solution"
     </releaseNotes>
     <copyright>Copyright © Danish Naglekar</copyright>
     <tags>XrmToolBox, PCF, Power Apps, Power Apps Component Framework, PCF Builder</tags>