diff --git a/README.md b/README.md
index 42fab92..4062ce6 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ Grap the latest build archive from the [Releases](https://github.com/akarzazi/SS
 ## Install
 Extract the archive content to the SSMS install location :
 
-C:\Program Files (x86)\Microsoft SQL Server Management Studio 18\Extensions
+`C:\Program Files (x86)\Microsoft SQL Server Management Studio 18\Common7\IDE\Extensions\SSMSPlus`
 
 It should look like the following.
 ![SSMS Plus Extension dlls](docs/illustrations/install-folder-screen.png?raw=true "SSMS Plus Extension dlls")
diff --git a/src/SSMSPlus/Properties/AssemblyInfo.cs b/src/SSMSPlus/Properties/AssemblyInfo.cs
index bafdb49..2964350 100644
--- a/src/SSMSPlus/Properties/AssemblyInfo.cs
+++ b/src/SSMSPlus/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.3.1")]
+[assembly: AssemblyVersion("0.0.3.2")]
 [assembly: AssemblyFileVersion("0.0.0.1")]
diff --git a/src/SSMSPlus/SSMSPlus.csproj b/src/SSMSPlus/SSMSPlus.csproj
index 2fb0208..2698cd5 100644
--- a/src/SSMSPlus/SSMSPlus.csproj
+++ b/src/SSMSPlus/SSMSPlus.csproj
@@ -61,7 +61,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CopyVsixExtensionFiles>True</CopyVsixExtensionFiles>
-    <CopyVsixExtensionLocation>C:\Program Files %28x86%29\Microsoft SQL Server Management Studio 18\Extensions\SSMSPlus</CopyVsixExtensionLocation>
+    <CopyVsixExtensionLocation>C:\Program Files %28x86%29\Microsoft SQL Server Management Studio 18\Common7\IDE\Extensions\SSMSPlus</CopyVsixExtensionLocation>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Command1.cs" />
diff --git a/src/SSMSPlusSearch/UI/SchemaSearchControlVM.cs b/src/SSMSPlusSearch/UI/SchemaSearchControlVM.cs
index 824de87..f7c2755 100644
--- a/src/SSMSPlusSearch/UI/SchemaSearchControlVM.cs
+++ b/src/SSMSPlusSearch/UI/SchemaSearchControlVM.cs
@@ -97,7 +97,7 @@ private void CreateMatchOnCombo()
             ComboMatchVM.SelectionChanged += ComboVM_SelectionChanged;
         }
 
-        private void CreateSchemaCombo(IEnumerable<string> schemas)
+        private void ReCreateSchemaCombo(IEnumerable<string> schemas)
         {
             SchemaObjectsVM.Items.Clear();
             
@@ -105,7 +105,8 @@ private void CreateSchemaCombo(IEnumerable<string> schemas)
             {
                 SchemaObjectsVM.Items.Add(new ComboCheckBoxItem<string>() { Text = schema, IsChecked = true, Value = schema });
             }
-            
+
+            SchemaObjectsVM.SelectionChanged -= ComboVM_SelectionChanged;
             SchemaObjectsVM.SelectionChanged += ComboVM_SelectionChanged;
         }
 
@@ -155,7 +156,7 @@ private async Task InitializeDbResults(int dbId)
         {
             _dbid = dbId;
             _allDdResults = (await _schemaSearchRepository.GetObjectsByDb(_dbid)).ToArray();
-            CreateSchemaCombo(_allDdResults.Select(p => p.SchemaName).Distinct().OrderBy(p => p));
+            ReCreateSchemaCombo(_allDdResults.Select(p => p.SchemaName).Distinct().OrderBy(p => p));
         }
 
         private async Task ExecuteSearchAsync()