diff --git a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj
index de6986839c..4b9bb083fc 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj
+++ b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj
@@ -89,7 +89,9 @@
     <EmbeddedResource Include="Resources\HtmlHelp2.16x16.Toc.png" />
     <EmbeddedResource Include="Resources\HtmlHelp2.16x16.Index.png" />
     <Compile Include="src\Service\SharpDevLanguageClass.cs" />
-    <None Include="HtmlHelp2.DynamicHelp.addin" />
+    <None Include="HtmlHelp2.DynamicHelp.addin">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/Resources/dynamichelp.rc b/src/AddIns/Misc/HtmlHelp2/Project/Resources/dynamichelp.rc
index 58bf86737d..a700ca66a4 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/Resources/dynamichelp.rc
+++ b/src/AddIns/Misc/HtmlHelp2/Project/Resources/dynamichelp.rc
@@ -1,3 +1,8 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// HTML RESOURCES
+//
+
 #define	RT_HTML	23
 
 context		RT_HTML		"context.html"
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs
index 229aaa7bc7..cb6d6f4905 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs
+++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs
@@ -260,6 +260,7 @@ namespace HtmlHelp2
 
 			HtmlHelp2SearchResultsView searchResults = HtmlHelp2SearchResultsView.Instance;
 
+			HtmlHelp2Dialog searchDialog     = new HtmlHelp2Dialog();
 			try
 			{
 				searchIsBusy                 = true;
@@ -270,7 +271,6 @@ namespace HtmlHelp2
 				searchFlags                 |= (enableStemming.Checked)?HxQuery_Options.HxQuery_FullTextSearch_Enable_Stemming:HxQuery_Options.HxQuery_No_Option;
 				searchFlags                 |= (reuseMatches.Checked)?HxQuery_Options.HxQuery_FullTextSearch_SearchPrevious:HxQuery_Options.HxQuery_No_Option;
 
-				HtmlHelp2Dialog searchDialog = new HtmlHelp2Dialog();
 				searchDialog.Text            = StringParser.Parse("${res:AddIns.HtmlHelp2.HelpSearchCaption}");
 				searchDialog.ActionLabel     = StringParser.Parse("${res:AddIns.HtmlHelp2.HelpSearchInProgress}",
 				                                                  new string[,]
@@ -284,7 +284,6 @@ namespace HtmlHelp2
 					matchingTopics = HtmlHelp2Environment.FTS.Query(searchWord, searchFlags);
 
 				Cursor.Current     = Cursors.Default;
-				searchDialog.Dispose();
 
 				try
 				{
@@ -320,6 +319,10 @@ namespace HtmlHelp2
 			{
 				LoggingService.Error("Help 2.0: cannot get matching search word; " + ex.ToString());
 			}
+			finally
+			{
+				searchDialog.Dispose();
+			}
 		}
 
 		public bool PerformF1FTS(string keyword)
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs
index 027e6d02f3..bc500de215 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs
+++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs
@@ -96,6 +96,10 @@ namespace HtmlHelp2
 
 	public class MsHelp2TocControl : UserControl
 	{
+		HxTocCtrlClass tocv2 = new HxTocCtrlClass();
+		
+		
+		
 		AxHxTocCtrl tocControl             = null;
 		ComboBox filterCombobox            = new ComboBox();
 		Label label1                       = new Label();
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs
index 78894ff4e4..1f2021fd5e 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs
+++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs
@@ -116,17 +116,17 @@ namespace HtmlHelp2.Environment
 
 			if(session != null) session = null;
 
+			HtmlHelp2Dialog initDialog = new HtmlHelp2Dialog();
 			try
 			{
-				currentSelectedFilterQuery = "";
-				currentSelectedFilterName  = "";
-
-				HtmlHelp2Dialog initDialog = new HtmlHelp2Dialog();
 				initDialog.Text            = StringParser.Parse("${res:AddIns.HtmlHelp2.HelpUpdateCaption}");
 				initDialog.ActionLabel     = StringParser.Parse("${res:AddIns.HtmlHelp2.HelpUpdateInProgress}");
 				initDialog.Show();
 				Application.DoEvents();
-				
+
+				currentSelectedFilterQuery = "";
+				currentSelectedFilterName  = "";
+
 				session                    = new HxSession();
 				session.Initialize(String.Format("ms-help://{0}", namespaceName), 0);
 				namespaceFilters           = session.GetFilterList();
@@ -135,8 +135,6 @@ namespace HtmlHelp2.Environment
 				ReloadFTSSystem();
 				ReloadDynamicHelpSystem();
 
-				initDialog.Dispose();
-
 				LoggingService.Info("Help 2.0: service sucessfully loaded");
 			}
 			catch(Exception ex)
@@ -144,6 +142,10 @@ namespace HtmlHelp2.Environment
 				LoggingService.Error("Help 2.0: not initialize service; " + ex.ToString());
 				session = null;
 			}
+			finally
+			{
+				initDialog.Dispose();
+			}
 		}
 
 		private static void ReloadFTSSystem()