diff --git a/src/StructuredLogViewer/Search.cs b/src/StructuredLogViewer/Search.cs
index a410fa71b..6002764fa 100644
--- a/src/StructuredLogViewer/Search.cs
+++ b/src/StructuredLogViewer/Search.cs
@@ -95,7 +95,8 @@ public static void PopulateSearchFields(object node, Action<string> addSearchFie
             var nameValueNode = node as NameValueNode;
             if (nameValueNode != null)
             {
-                addSearchField(nameValueNode.Name + " = " + nameValueNode.Value);
+                addSearchField(nameValueNode.Name);
+                addSearchField(nameValueNode.Value);
             }
 
             var diagnostic = node as AbstractDiagnostic;