diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs
index 04205f6196..3ba8928b1c 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs
+++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs
@@ -30,6 +30,8 @@ namespace HtmlHelp2
 
 
 	// TODO: if there are no DH results, implement Keyword search (index)
+	// I'm a little stupid at this point, I guess, :o(
+	// How to get the word UNDER the cursor for an ordinary simple keyword search?
 
 
 	public class ShowDynamicHelpMenuCommand : AbstractMenuCommand
@@ -85,26 +87,29 @@ namespace HtmlHelp2
 			this.RemoveAllChildren();
 			this.debugPreElement = String.Empty;
 
+			bool helpResults     = false;
 			string tempLanguage  = String.Empty;
-			if(languages.ContainsKey(expectedLanguage))
+			if(!languages.ContainsKey(expectedLanguage) ||
+			   !languages.TryGetValue(expectedLanguage, out tempLanguage))
 			{
-				if(!languages.TryGetValue(expectedLanguage, out tempLanguage))
-				{
-					tempLanguage = String.Empty;
-				}
+				tempLanguage     = expectedLanguage;
 			}
 
 			Cursor.Current           = Cursors.WaitCursor;
 			foreach(string currentHelpTerm in dynamicHelpTerms)
 			{
-				this.CallDynamicHelp(currentHelpTerm, tempLanguage, false);
+				if(!currentHelpTerm.StartsWith("!"))
+				{
+					helpResults = (helpResults || this.CallDynamicHelp(currentHelpTerm, tempLanguage, false));
+				}
 			}
+
+			// TODO: implement keyword search, if "helpResults" is FALSE
+
 			dynamicHelpBrowser.BuildDefaultHelpEntries();
 			Cursor.Current           = Cursors.Default;
 
-			this.debugPreElement    += String.Format("<br>Current project language: {0}",
-			                                         (tempLanguage==String.Empty)?expectedLanguage:tempLanguage);
-
+			this.debugPreElement    += String.Format("<br>Current project language: {0}", tempLanguage);
 			if(this.enableDebugInfo) dynamicHelpBrowser.CreateDebugPre(this.debugPreElement);
 		}
 
@@ -381,6 +386,10 @@ namespace HtmlHelp2
 			}
 		}
 
+		private void DynamicHelpBrowserCreated(object sender, EventArgs e)
+		{
+		}
+
 		private void LoadDynamicHelpPage()
 		{
 			if(!HtmlHelp2Environment.IsReady) return;
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/MsHelpProvider.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/MsHelpProvider.cs
index c5c10b4858..7e8ed48932 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/src/MsHelpProvider.cs
+++ b/src/AddIns/Misc/HtmlHelp2/Project/src/MsHelpProvider.cs
@@ -18,11 +18,13 @@ namespace HtmlHelp2
 		{
 			LoggingService.Info("Help 2.0: MsHelpProvider.TryShowHelp");
 
-			try {
+			try
+			{
 				PadDescriptor search = WorkbenchSingleton.Workbench.GetPad(typeof(HtmlHelp2SearchPad));
 				return ((HtmlHelp2SearchPad)search.PadContent).PerformF1FTS(fullTypeName, true);
 			}
-			catch {
+			catch
+			{
 				return false;
 			}
 		}
@@ -31,11 +33,13 @@ namespace HtmlHelp2
 		{
 			LoggingService.Info("Help 2.0: MsHelpProvider.TryShowHelpByKeyword");
 
-			try {
+			try
+			{
 				PadDescriptor search = WorkbenchSingleton.Workbench.GetPad(typeof(HtmlHelp2SearchPad));
 				return ((HtmlHelp2SearchPad)search.PadContent).PerformF1FTS(keyword);
 			}
-			catch {
+			catch
+			{
 				return false;
 			}
 		}