diff --git a/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb b/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb
index 4b33aaf8..05072531 100644
--- a/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb	
+++ b/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.6.1.0")>
-<Assembly: AssemblyFileVersion("1.6.1.0")>
+<Assembly: AssemblyVersion("1.6.2.0")>
+<Assembly: AssemblyFileVersion("1.6.2.0")>
diff --git a/GUIs.ClipboardWatcher/ProfileFilter.vb b/GUIs.ClipboardWatcher/ProfileFilter.vb
index 49047277..386cec44 100644
--- a/GUIs.ClipboardWatcher/ProfileFilter.vb
+++ b/GUIs.ClipboardWatcher/ProfileFilter.vb
@@ -82,7 +82,7 @@ Public Class ProfileFilter
         Dim oFilteredProfiles As New List(Of ProfileData)
 
         Dim oRootNode As TreeNode = New TreeNode() With {
-            .Text = $"Suche nach '{ClipboardContents}'",
+            .Text = $"easyFLOW Search with term [{ClipboardContents}]",
             .Tag = NODE_ROOT,
             .ImageIndex = ImageIndex.Root
         }
@@ -90,6 +90,9 @@ Public Class ProfileFilter
         _TreeView.Nodes.Add(oRootNode)
 
         For Each oProfile In Profiles
+            If oProfile.Name = String.Empty Then
+                oProfile.Name = $"ProfileName for ID {oProfile.Guid} is empty - Check SQL"
+            End If
             Logger.Debug("Current Profile: {0}", oProfile.Name)
 
             Dim oNode = _ProfileMatch.NewProfileNode(oProfile)
diff --git a/GUIs.ClipboardWatcher/ProfileMatch.vb b/GUIs.ClipboardWatcher/ProfileMatch.vb
index 72d6c5cc..b7c1e243 100644
--- a/GUIs.ClipboardWatcher/ProfileMatch.vb
+++ b/GUIs.ClipboardWatcher/ProfileMatch.vb
@@ -28,7 +28,7 @@ Public Class ProfileMatch
         _Logger.Debug("New Profile Node for Profile {0}", Profile.Name)
 
         Dim oNode As New TreeNode() With {
-            .Text = $"Profile: {Profile.Name}",
+            .Text = $"Checking profile: {Profile.Name}",
             .ImageIndex = ProfileFilter.ImageIndex.Profile,
             .Tag = Profile.Name & "-PROFILE"
         }
@@ -39,7 +39,7 @@ Public Class ProfileMatch
     Public Function NewClipboardRegexNode(Profile As ProfileData, IsMatch As Boolean) As TreeNode
         _Logger.Debug("New Clipboard Regex Node for Profile {0}", Profile.Name)
 
-        Dim oText = $"{GetMatchText(IsMatch)} on Global Clipboard Regex {Profile.Regex}"
+        Dim oText = $"{GetMatchText(IsMatch)} on Global Clipboard Regex [{Profile.Regex}]"
         Dim oNode As New TreeNode() With {
             .Text = oText,
             .ImageIndex = ProfileFilter.ImageIndex.Clipboard,
@@ -56,7 +56,7 @@ Public Class ProfileMatch
         If IsCatchAll Then
             oText = $"{GetMatchText(IsMatch)} on Catch-All Process"
         Else
-            oText = $"{GetMatchText(IsMatch)} on ProcessName {Process.ProcessName}"
+            oText = $"{GetMatchText(IsMatch)} on ProcessName [{Process.ProcessName}]"
         End If
 
         Dim oNode As New TreeNode() With {
@@ -73,7 +73,7 @@ Public Class ProfileMatch
         _Logger.Debug("New Window Node for Profile {0} and WindowTitle {1}", Profile.Name, Window.Title)
 
         Dim oMatchText = IIf(IsMatch, "MATCH", "NO MATCH")
-        Dim oText = $"{GetMatchText(IsMatch)} on WindowTitle {Window.Title}"
+        Dim oText = $"{GetMatchText(IsMatch)} on WindowTitle [{Window.Title}]"
         Dim oNode As New TreeNode() With {
             .Text = oText,
             .ImageIndex = ProfileFilter.ImageIndex.Window,
@@ -88,7 +88,7 @@ Public Class ProfileMatch
         _Logger.Debug("New Control Node for Profile {0} and Control {1}", Profile.Name, Control.Description)
 
         Dim oMatchText = IIf(IsMatch, "MATCH", "NO MATCH")
-        Dim oText = $"{GetMatchText(IsMatch)} on Control {Control.Description}"
+        Dim oText = $"{GetMatchText(IsMatch)} on Control [{Control.Description}]"
 
         Dim oNode As New TreeNode() With {
             .Text = oText,