diff --git a/Example01_SimpleMessageFlow_EventCoordination.mp b/Example01_SimpleMessageFlow_EventCoordination.mp
index 759eb51519b5c292d7ee5cda0abb85e80d19415e..6120cf7827d00a1db3d489f03ad4c4df376500f9 100644
--- a/Example01_SimpleMessageFlow_EventCoordination.mp
+++ b/Example01_SimpleMessageFlow_EventCoordination.mp
@@ -19,10 +19,10 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms: 
+Search terms: simple message flow, simple interaction pattern, event coordination
 
 Instructions: Run for Scopes 1 and up. Traces are generated
-in a sequence diagram-like formatby default.  Try rotating 
+in a sequence diagram-like format by default.  Try rotating 
 a selected trace 90 degrees counterclockwise, or (from the 
 Options menu above the diagram) selecting the "Swim Lanes"
 checkbox to view the trace in an activity diagram format.
diff --git a/Example01a_UnreliableMessageFlow_VirtualEvents.mp b/Example01a_UnreliableMessageFlow_VirtualEvents.mp
index 47d307e2401853a7611310518a9f388e5186ca16..62db1d7d919b137c6edd0aa8c4ce13fcb906b2db 100644
--- a/Example01a_UnreliableMessageFlow_VirtualEvents.mp
+++ b/Example01a_UnreliableMessageFlow_VirtualEvents.mp
@@ -11,13 +11,12 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation
 
-Search terms:
+Search terms: unreliable message flow, unreliable communication, event coordination, virtual event
 
 We may want to specify behaviors when some messages get lost in the transition. 
 It can be done using ‘virtual’ events.
 
-Instructions: Run for Scopes 1 and up. Viewing of traces also includes a "Swim 
-Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example02_DataFlow_EventSharing.mp b/Example02_DataFlow_EventSharing.mp
index 4aa0ab243b9dcd7a86aadf56fbf1504031e67a55..9b7862f6ffad5906a186e4bfbcd0e38a1acbd182 100644
--- a/Example02_DataFlow_EventSharing.mp
+++ b/Example02_DataFlow_EventSharing.mp
@@ -11,7 +11,7 @@ Architecture and Workflow Modeling Language Manual"
 (Version 4). 2020. Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: data flow, event sharing
 
 data items as behaviors
 
@@ -33,8 +33,7 @@ Event traces specified by the schema represent system’s emergent behavior,
 where behaviors of subsystems are influenced by the coordination.
 This is a toy example of System of Systems emerging behavior modeling.
 
-Instructions: Run for Scopes 1 and up. Viewing of traces also includes a 
-"Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example03_ATMWithdrawal_BehaviorOfEnvironment.mp b/Example03_ATMWithdrawal_BehaviorOfEnvironment.mp
index 9ea250cfdbe62236db971c0bd37fa3f4b8f1a917..e19a9b8e2ca8da5d95612ab6557469ee71d3edcf 100644
--- a/Example03_ATMWithdrawal_BehaviorOfEnvironment.mp
+++ b/Example03_ATMWithdrawal_BehaviorOfEnvironment.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation
 
-Search terms:
+Search terms: ATM withdrawal, behavior of environment, ATM system, data base
 
 Integrated system and environment behaviors
 	
@@ -35,7 +35,7 @@ like traces 2 or 3 for scope 1), and then collapsing root event, it becomes poss
 to view a traditional "box-and-arrow" architecture diagram, i.e. to visualize an architecture view.
 
 Instructions: Run for Scopes 1 and up. "Sequence" mode yields views very similar to the UML or SysML 
-Sequence Diagrams. Viewing of traces also includes a "Swim Lanes" option.
+Sequence Diagrams.
 
 ==========================================================*/
 
diff --git a/Example04_StackBehavior_EnsureCondition.mp b/Example04_StackBehavior_EnsureCondition.mp
index def63cd170d666cb99858ffc1a1a1f974326a23e..6b8002566e52186a86b5b9b2b21011da871c8012 100644
--- a/Example04_StackBehavior_EnsureCondition.mp
+++ b/Example04_StackBehavior_EnsureCondition.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: stack behavior, ensure condition
 
 	The event trace is a set of events and the Boolean expressions
 in MP can embrace the traditional predicate calculus notation. A set
@@ -40,8 +40,7 @@ and demonstrates an example of combining imperative (event grammar)
 and declarative (Boolean expressions) constructs for behavior
 specification.
 
-Instructions: Run for Scopes 1 and up. Viewing of traces also 
-includes a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example04a_StackBehavior_UserDefinedRelations.mp b/Example04a_StackBehavior_UserDefinedRelations.mp
index 359ec79a15be1aea50009a39477d34aba528551c..bc4f203bd1d58553692e5f7dd02742439e725e80 100644
--- a/Example04a_StackBehavior_UserDefinedRelations.mp
+++ b/Example04a_StackBehavior_UserDefinedRelations.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: stack behavior, pop/push relationship, user defined relation, isomorphic behavior
 
 The event trace is a set of events and the Boolean expression constructs in MP 
 can support the traditional first order predicate calculus notation. 
@@ -38,8 +38,7 @@ as yet another kind of behavior composition, and demonstrates an
 example of combining imperative (event grammar) and declarative 
 (Boolean expressions) constructs for behavior specification.
 
-Instructions: Run for Scopes 1 and up. Viewing of traces also includes a 
-"Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example04b_QueueBehavior_UserDefinedRelations.mp b/Example04b_QueueBehavior_UserDefinedRelations.mp
index f9ff1af3cbb37698f032b6504b29790a1d0e77b1..f6f4e4cb9df6f49a4b8c00ce6b7b8f869adcffe8 100644
--- a/Example04b_QueueBehavior_UserDefinedRelations.mp
+++ b/Example04b_QueueBehavior_UserDefinedRelations.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: queue behavior, user defined relation, isomorphic behavior
 
 This rule specifies the behavior of a queue in terms of queue operations 
 enqueue and dequeue. It is assumed that initially Queue is empty. 
@@ -30,8 +30,7 @@ as yet another kind of behavior composition, and demonstrates an
 example of combining imperative (event grammar) and declarative 
 (Boolean expressions) constructs for behavior specification.
 
-Instructions: Run for Scopes 1 and up. Viewing of traces also includes a "Swim 
-Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example05_CarRace_NestedComposition.mp b/Example05_CarRace_NestedComposition.mp
index 1f23fe263680f0772fb27c45c7895624dc295ddc..16ba248170d8ee06b7c661cc544da9e874a85203 100644
--- a/Example05_CarRace_NestedComposition.mp
+++ b/Example05_CarRace_NestedComposition.mp
@@ -11,7 +11,7 @@ Modeling Language Manual" (Version 4). 2020. Available
 online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: car race, event sharing, nested composition
 
 more coordination patterns:
 -	ordering of selected events in concurrent threads
@@ -19,8 +19,7 @@ more coordination patterns:
 	
 -	one-many coordination.
 
-Instructions: Run for Scopes 1 and up. Viewing of traces also 
-includes a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example06_UnreliableChannel_AssertionChecking.mp b/Example06_UnreliableChannel_AssertionChecking.mp
index 15e1b9bb1fd16b16323b58dcdb40b04f450a792d..1c0e312ce22c2a08ad4c56a819e3cfec6ace3b3c 100644
--- a/Example06_UnreliableChannel_AssertionChecking.mp
+++ b/Example06_UnreliableChannel_AssertionChecking.mp
@@ -11,7 +11,7 @@ Architecture and Workflow Modeling Language Manual"
 (Version 4). 2020. Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: unreliable channel, communicating, assertion checking
 
 	Assertion checking, Communicating via unreliable channel.
 
@@ -33,8 +33,7 @@ Search terms:
     if the property should always hold, it makes sense to convert it 
     into the ENSURE condition.
 
-	Instructions: Run for Scopes 1 and up. Viewing of traces also 
-	includes a "Swim Lanes" option.
+	Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example07_UnconstrainedStack_TraceAnnotation.mp b/Example07_UnconstrainedStack_TraceAnnotation.mp
index 058f5b7ad2b88bfb0b86ed6b533f5a44859deda5..f66c9e5b090cc7295a001243939131d660273479 100644
--- a/Example07_UnconstrainedStack_TraceAnnotation.mp
+++ b/Example07_UnconstrainedStack_TraceAnnotation.mp
@@ -11,7 +11,7 @@ Architecture and Workflow Modeling Language Manual"
 (Version 4). 2020. Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: unconstrained stack, testing/debugging, trace annotation, empty stack
 
 Trace annotation techniques 
 
@@ -30,8 +30,7 @@ might  violate certain property, and how to annotate these particular
 events in the trace with additional messages. Programmers will recognize 
 the use of debugging print statements for traditional program testing/debugging.
 
-Instructions: Run for Scopes 1 and up. Viewing of traces also includes a 
-"Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example08_EmployeeEmployer_CoordinationAcrossHierarchyLevels.mp b/Example08_EmployeeEmployer_CoordinationAcrossHierarchyLevels.mp
index fd7fe72e4e615091f21a252ca821214487ff7a75..1c53216fe6a235ee9738ca9e38eb4e2287bf1909 100644
--- a/Example08_EmployeeEmployer_CoordinationAcrossHierarchyLevels.mp
+++ b/Example08_EmployeeEmployer_CoordinationAcrossHierarchyLevels.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: employee, employer, business process, coordination across hierarchy levels
 
 The web site http://www.infoq.com/articles/bpelbpm 
 “Why BPEL is not the holy grail for BPM “ 
diff --git a/Example09_PipeFilter_TraceAnnotationQueries.mp b/Example09_PipeFilter_TraceAnnotationQueries.mp
index 3afd23e584ca3b8f94aa9e94588b83bfe906291f..e44ddcaf7c1e96f27bbe911440590032af4a94d6 100644
--- a/Example09_PipeFilter_TraceAnnotationQueries.mp
+++ b/Example09_PipeFilter_TraceAnnotationQueries.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation
 
-Search terms:
+Search terms: pipe filter, architecture model, trace annotation queries
 
     pipe/filter architecture model with 2 filters
 
@@ -21,9 +21,8 @@ Search terms:
         3) received message can stay in the Filter for while, 
         	before being sent (if at all).
 
-Instructions: Run for Scopes 1, 2, 3, and 4. Viewing of traces 
-also includes a "Swim Lanes" option.
-	                                Scope     4: 959 traces in approx. 6.1 sec.
+Instructions: Run for Scopes 1, 2, 3, and 4.
+    Scope 4: 959 traces in approx. 6.1 sec.
 
 ==========================================================*/
 
diff --git a/Example10_PublishSubscribe_EventReshuffling.mp b/Example10_PublishSubscribe_EventReshuffling.mp
index 720a84caadad340651372cbefd28becaacb47c33..2689d9a7c42e357ada424745eb51f30b25c21ccd 100644
--- a/Example10_PublishSubscribe_EventReshuffling.mp
+++ b/Example10_PublishSubscribe_EventReshuffling.mp
@@ -11,15 +11,13 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: publish, subscribe, architecture model, event reshuffling
 
 	Publisher sends a notification to all active Subscribers 
     when new information is available.
 
-Instructions: Run for Scopes 1, 2, and 3. Viewing of traces 
-also includes a "Swim Lanes" option.
-
-Scope  3: 3813 traces in approx. 7.4 min.
+Instructions: Run for Scopes 1, 2, and 3.
+	Scope 3: 3813 traces in approx. 7.4 min.
 
 ==========================================================*/
 
diff --git a/Example11_RingTopology_UserDefinedRelations.mp b/Example11_RingTopology_UserDefinedRelations.mp
index ed29e131c9af4f192218524116671d787c88a4e1..889291733a88940c3b82f8f4a52bb2907b9967be 100644
--- a/Example11_RingTopology_UserDefinedRelations.mp
+++ b/Example11_RingTopology_UserDefinedRelations.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: ring topology, event reshuffling, user defined relation
 
     ring topology
     an example of user-defined relation use
@@ -19,10 +19,8 @@ Search terms:
     The following is a model of network ring, 
     where each node interacts with its left and right neighbors only.
 
-Instructions: Run for Scopes 1, 2, and 3. Viewing of traces also includes 
-a "Swim Lanes" option.
-									
-Scope  3: 1570 traces in approx. 31 sec.
+Instructions: Run for Scopes 1, 2, and 3.								
+    Scope 3: 1570 traces in approx. 31 sec.
     
 ==========================================================*/
 
diff --git a/Example12_CardiacArrestWorkflow_VirtualEvents.mp b/Example12_CardiacArrestWorkflow_VirtualEvents.mp
index 54ca657c4e4cbaa7245e87205517d7238f3d662f..c0f33e9a784f338321d7607a052b077acb8ac8ef 100644
--- a/Example12_CardiacArrestWorkflow_VirtualEvents.mp
+++ b/Example12_CardiacArrestWorkflow_VirtualEvents.mp
@@ -11,7 +11,7 @@ Software Architecture and Workflow Modeling Language
 Manual" (Version 4). 2020. Available online: 
 https://wiki.nps.edu/display/MP/Documentation
 
-Search terms:
+Search terms: cardiac arrest, workflow patterns, virtual event, triage task
 
 the web site
 http://workflowpatterns.com/patterns/control/index.php
@@ -25,8 +25,7 @@ run in parallel. Once the first of these has completed, the triage task
 is commenced. Completion of the other task is ignored and does not result 
 in a second instance of the triage task.
 
-Instructions: Run for Scope 1. Viewing of traces also includes a "Swim 
-Lanes" option.
+Instructions: Run for Scope 1.
 
 ==========================================================*/
 
diff --git a/Example13_ConsumersSuppliers_DependencyTracking.mp b/Example13_ConsumersSuppliers_DependencyTracking.mp
index f7ddb2528fa453115601ad165a32ee66d5804d1b..50aaed7280783dbc84765469bf667f2b20f87b9a 100644
--- a/Example13_ConsumersSuppliers_DependencyTracking.mp
+++ b/Example13_ConsumersSuppliers_DependencyTracking.mp
@@ -12,17 +12,15 @@ Modeling Language Manual" (Version 4). 2020. Available
 online: 
 https://wiki.nps.edu/display/MP/Documentation
 
-Search terms:
+Search terms: consumer, supplier, dependency tracking, asynchronous coordination
 
 Asynchronous coordination and dependency definition example.
 
 user-defined relation related_to connects events within each 
 single Request_delivery -> Consume chain
 
-Instructions: Run for Scopes 1 and 2. Viewing of traces also 
-includes a "Swim Lanes" option.
-
-Scope 2: 110 traces in approx. 38 sec.
+Instructions: Run for Scopes 1 and 2.
+	Scope 2: 110 traces in approx. 38 sec.
 
 ==========================================================*/
 
diff --git a/Example14_ShoppingSpree_NumberAttributes.mp b/Example14_ShoppingSpree_NumberAttributes.mp
index 95076b82a379a4e0d98d991c6e85e45bcb723f59..99f84dee380a5adbdb9a5c40b1483bfabc4f7998 100644
--- a/Example14_ShoppingSpree_NumberAttributes.mp
+++ b/Example14_ShoppingSpree_NumberAttributes.mp
@@ -11,10 +11,9 @@ Modeling Language Manual" (Version 4). 2020. Available
 online: 
 https://wiki.nps.edu/display/MP/Documentation
 
-Search terms:
+Search terms: shopping spree, number attribute
 
-Instructions: Run for Scopes 1 and up. Viewing of traces 
-also includes a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example15_BackpackWeight_IntervalAttributes.mp b/Example15_BackpackWeight_IntervalAttributes.mp
index b3e1f0379a62cc9dacd74a02218053504e51812d..06a696a5561afe612827e3d7c553d180a94222e6 100644
--- a/Example15_BackpackWeight_IntervalAttributes.mp
+++ b/Example15_BackpackWeight_IntervalAttributes.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation
 
-Search terms:
+Search terms: backpack weight, interval attribute
 
     Use of interval attributes.
     
@@ -19,8 +19,7 @@ Search terms:
     the total weight of 30 units. 
     There may be several instances of the same item.
 
-Instructions: Run for Scopes 1 and up. Viewing of traces 
-also includes a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example16_StackBehavior_ProbabilityCalculationsType1.mp b/Example16_StackBehavior_ProbabilityCalculationsType1.mp
index fc5ae080d7861267b9859d5806e5d5a077459425..08204c7edbb952cb4986e61a720b10ddf469538c 100644
--- a/Example16_StackBehavior_ProbabilityCalculationsType1.mp
+++ b/Example16_StackBehavior_ProbabilityCalculationsType1.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: stack behavior, type 1 probability
 
 	Here is a simple stack behavior model. Valid behaviors don’t permit
 a scenario when Pop operation is applied to the empty stack. For the
@@ -26,8 +26,7 @@ impossible in a real stack, so they are cut from the model.
 
 By removing some scenarios, the remaining probabilities change.
 
-Instructions: Run for Scopes 1 and up. Viewing of traces also includes 
-a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example17_SharedEvents_ProbabilityCalculationsType1.mp b/Example17_SharedEvents_ProbabilityCalculationsType1.mp
index 2e568fb97524e03957bc9b33a8a2269065684bb8..4c58da1c25156ef670fe962e030f49641529fdcd 100644
--- a/Example17_SharedEvents_ProbabilityCalculationsType1.mp
+++ b/Example17_SharedEvents_ProbabilityCalculationsType1.mp
@@ -11,15 +11,14 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: shared events, type 1 probability
 
 	A simple example of shared events. If one root has a, the other root
 also has a. If neither root has a, then root 1 must have b, and root 2
 must have c. Additionally, probabilities show how "SHARE ALL" increases
 the chances of the shared event.
 
-Instructions: Run for Scope 1. Viewing of traces also 
-includes a "Swim Lanes" option.
+Instructions: Run for Scope 1.
 
 ==========================================================*/
 
diff --git a/Example18_RedGreen_BayesianProbabilityCalculationsType2.mp b/Example18_RedGreen_BayesianProbabilityCalculationsType2.mp
index 4a225e332636a22a4449b398996ab917573ac818..3ed1d30a31cff7d5148f2e5917ac97ceef7ce844 100644
--- a/Example18_RedGreen_BayesianProbabilityCalculationsType2.mp
+++ b/Example18_RedGreen_BayesianProbabilityCalculationsType2.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation
 
-Search terms:
+Search terms: red, green, number attribute, type 2 probability, bayesian probability
 
     Bayesian attribute example
 
@@ -26,8 +26,7 @@ Search terms:
     since Type 1 assumes that probability of selecting an alternative is 
     constant for the whole derivation process.
 
-Instructions: Run for Scope 1. Viewing of traces also 
-includes a "Swim Lanes" option.
+Instructions: Run for Scope 1.
 
 ==========================================================*/
 
diff --git a/Example19_StackBehavior_BayesianProbabilityCalculationsType2.mp b/Example19_StackBehavior_BayesianProbabilityCalculationsType2.mp
index 1d22603689a767147014f89505399a0179640c3f..66817d77b0edd91c60fc6491257e7344073ba243 100644
--- a/Example19_StackBehavior_BayesianProbabilityCalculationsType2.mp
+++ b/Example19_StackBehavior_BayesianProbabilityCalculationsType2.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: stack behavior, number attribute, type 2 probability, bayesian probability
 
 	An example of  Bayesian probability calculation.
 
@@ -35,8 +35,7 @@ Search terms:
     this will require to update the first step in p2 assignment (line 57)
     it will become p2 := 1/(M + 1);
 
-Instructions: Run for Scopes 1 and up. Viewing of traces 
-also includes a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example20_Activity_Diagram.mp b/Example20_Activity_Diagram.mp
index 846c0066d505a9d3e650e28d08362123bc4c5b38..55adc6a202b1d568cc999a940cb2c9123a150e19 100644
--- a/Example20_Activity_Diagram.mp
+++ b/Example20_Activity_Diagram.mp
@@ -11,14 +11,13 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation
 
-Search terms:
+Search terms: activity diagram, flowchart
 
 	This model demonstrates how to use "SHOW ACTIVITY DIAGRAM" to
 display the possible traces in flowchart form. Root A has 4 different
 possible traces at scope 1, and the flowchart displays those possiblities.
 
-Instructions: Run for Scope 1. Viewing of traces also 
-includes a "Swim Lanes" option.
+Instructions: Run for Scope 1.
 
 ==========================================================*/
 
diff --git a/Example21_DataFlow_LocalReport.mp b/Example21_DataFlow_LocalReport.mp
index 697e3814e55cbf2bf18b82a59d98daa9beff3e51..476ab6291914ceabb71cacb623d09fd223ce4c7a 100644
--- a/Example21_DataFlow_LocalReport.mp
+++ b/Example21_DataFlow_LocalReport.mp
@@ -11,12 +11,11 @@ Architecture and Workflow Modeling Language Manual"
 (Version 4). 2020. Available online: 
 https://wiki.nps.edu/display/MP/Documentation
 
-Search terms:
+Search terms: data flow, local report, basic statistics
 
 Local Report within a trace.
 
-Instructions: Run for Scopes 1 and up. Viewing of traces 
-also includes a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example22_SimpleMessageFlow_GlobalReport.mp b/Example22_SimpleMessageFlow_GlobalReport.mp
index 84cbd8d369bba1c9cb3ea43fc799cd0a635dbf51..0144f8c607deb946a37325a4065210ae5299743c 100644
--- a/Example22_SimpleMessageFlow_GlobalReport.mp
+++ b/Example22_SimpleMessageFlow_GlobalReport.mp
@@ -12,10 +12,9 @@ Modeling Language Manual" (Version 4). 2020. Available
 online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: simple message flow, global report, statistics
 
-Instructions: Run for Scopes 1 and up. Viewing of traces 
-also includes a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example23_CarRace_LocalGraph.mp b/Example23_CarRace_LocalGraph.mp
index b23fd74ffc22830c04e972fb808fc7fe5af864b0..10219950e95b64a05433b1b3f4983eedd6e02c19 100644
--- a/Example23_CarRace_LocalGraph.mp
+++ b/Example23_CarRace_LocalGraph.mp
@@ -11,12 +11,11 @@ System and Software Architecture and Workflow Modeling
 Language Manual" (Version 4). 2020. Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: car race, local graph, local trace view
 
 	Local graph within the event trace.
 
-Instructions: Run for Scopes 1 and up. Viewing of traces 
-also includes a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example24_Compiler_ComponentDiagram.mp b/Example24_Compiler_ComponentDiagram.mp
index 632105aa1482807f7f9fa7d2fdcc4e4f683b244c..266e8a1bad13daade6f91feef96ee450a7398778 100644
--- a/Example24_Compiler_ComponentDiagram.mp
+++ b/Example24_Compiler_ComponentDiagram.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: compiler, component diagram, global report, lexer, parser, stack
 
     Compiler front end, bottom-up parser
 	Lexer and parser in interactive mode.
@@ -21,10 +21,8 @@ Search terms:
 	The MP code for constructing UML-like Component Diagram 
     is reusable and can be copied/pasted into any MP model.
 
-Instructions: Run for Scope 1. Viewing of traces also 
-includes a "Swim Lanes" option.
-
-Scope 1: 20 traces in approx. 3.1 sec.
+Instructions: Run for Scope 1.
+	Scope 1: 20 traces in approx. 3.1 sec.
 
 ==========================================================*/
 
diff --git a/Example25_Graph_as_Data_Structure.mp b/Example25_Graph_as_Data_Structure.mp
index 3d87349d6c7d7486e147eacc345cf6c6b274ff49..770e90cba70bf9cee4fe6f4159812a2403c63bc7 100644
--- a/Example25_Graph_as_Data_Structure.mp
+++ b/Example25_Graph_as_Data_Structure.mp
@@ -11,13 +11,12 @@ and Software Architecture and Workflow Modeling Language
 Manual" (Version 4). 2020. Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: graph as data structure, number attribute, global report, total event statistics
  	
 	Accumulating and rendering statistics from event traces.
  	Graphs as container data structures
 
-Instructions: Run for Scopes 1 and up. Viewing of traces 
-also includes a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example26_UnreliableMessageFlow_GlobalQuery.mp b/Example26_UnreliableMessageFlow_GlobalQuery.mp
index f875d8c7bb650aaad0d98e974be999a08a26bace..662d4fd9908cdfad6bffbc19ed56687ec5ebfed1 100644
--- a/Example26_UnreliableMessageFlow_GlobalQuery.mp
+++ b/Example26_UnreliableMessageFlow_GlobalQuery.mp
@@ -11,7 +11,7 @@ System and Software Architecture and Workflow Modeling
 Language Manual" (Version 4). 2020. Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: unreliable message flow, global query, number attribute, probability summary
 
 GLOBAL query	
 
@@ -29,8 +29,7 @@ for scope 1), like:
 ROOT 	Sender: 	(+<1..7> send +);
 ROOT 	Receiver: 	(+<1..7> (receive |<<0.2>> does_not_receive) +);
 
-Instructions: Run for Scopes 1 and up. Viewing of traces 
-also includes a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example27_AssemblingStatistics_Table_and_Bar_Chart.mp b/Example27_AssemblingStatistics_Table_and_Bar_Chart.mp
index f60f5dc9e2fcec68bca5ec41cb40017d067dabf8..1d5238c7c7a0b89aa898418cd67d247d0426044b 100644
--- a/Example27_AssemblingStatistics_Table_and_Bar_Chart.mp
+++ b/Example27_AssemblingStatistics_Table_and_Bar_Chart.mp
@@ -12,13 +12,12 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: table, bar chart, assembling statistics, number attribute
 
  Assembling statistics about a current trace in a TABLE and rendering it.
  Table and bar chart example.
 
-Instructions: Run for Scope 1. Viewing of traces also 
-includes a "Swim Lanes" option.
+Instructions: Run for Scope 1.
 
 ==========================================================*/
 
diff --git a/Example28_AssemblingStatistics_Histogram.mp b/Example28_AssemblingStatistics_Histogram.mp
index 2c8a9a9a42ca3c184920f79c323d23c03b3e5aaa..f86f7bd628f0928817f681363ada9473aca1965f 100644
--- a/Example28_AssemblingStatistics_Histogram.mp
+++ b/Example28_AssemblingStatistics_Histogram.mp
@@ -12,12 +12,11 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: histogram, assembling statistics, number attribute, global report, probability interval
 
  Histogram example
 
-Instructions: Run for Scopes 1 and up. Viewing of traces 
-also includes a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example29_AssemblingStatistics_Gantt_Chart.mp b/Example29_AssemblingStatistics_Gantt_Chart.mp
index 81d28d5b5ab4544d8f76675285ecca02e5321f67..f6ed9732bd49a6a88d5a1ca9abd477afea59a806 100644
--- a/Example29_AssemblingStatistics_Gantt_Chart.mp
+++ b/Example29_AssemblingStatistics_Gantt_Chart.mp
@@ -11,12 +11,11 @@ Modeling Language Manual" (Version 4). 2020. Available
 online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: gantt chart, assembling statistics, table, bar chart
 
  Gantt chart example
 
-Instructions: Run for Scope 1. Viewing of traces also 
-includes a "Swim Lanes" option.
+Instructions: Run for Scope 1.
 
 ==========================================================*/
 
diff --git a/Example30_MicrowaveOven_ModelingModelChecking.mp b/Example30_MicrowaveOven_ModelingModelChecking.mp
index db238ae7266c22b69ef2d73a10808db586e55b00..781992ea6b602055d269da2f238965282ca653bb 100644
--- a/Example30_MicrowaveOven_ModelingModelChecking.mp
+++ b/Example30_MicrowaveOven_ModelingModelChecking.mp
@@ -11,7 +11,7 @@ Architecture and Workflow Modeling Language Manual"
 (Version 4). 2020. Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: microwave oven, model checking, finite state diagram, state visit, state transition, atomic proposition, inner event
 
     example of finite state diagram behavior model, 
 	CTL formula representation in MP, and model checking for a small scope.
@@ -40,11 +40,8 @@ Search terms:
 	and commands triggering state transitions, 
     following well known algorithm  NFA -> RE.
 
-Instructions: Run for Scope 1. Viewing of traces also 
-includes a "Swim Lanes" option.
-
-Scope 1: 28 traces (including 2 counterexamples) in approx. 
-1.4 sec.
+Instructions: Run for Scope 1.
+    Scope 1: 28 traces (including 2 counterexamples) in approx. 1.4 sec.
 
 ==========================================================*/
 
diff --git a/Example31_Aspect_Oriented_Paradigm.mp b/Example31_Aspect_Oriented_Paradigm.mp
index 945e7303a4caf753dda94edae744193a89e246e9..3e367e01aa6c2c375d5f2b3425ca7aec286cc40f 100644
--- a/Example31_Aspect_Oriented_Paradigm.mp
+++ b/Example31_Aspect_Oriented_Paradigm.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: aspect-oriented paradigm, join point, aspect behavior, advice coordination
 
 	The COORDINATE operation supports a “cause-effect” refinement for
 the behavior of two components and it bears a certain similarity
@@ -26,8 +26,7 @@ methods M1 and M2 as join points, and the aspect behavior requires
 a call to Prolog before, and to Epilog after each method call as an
 advice. The corresponding MP model may look like the following.
 
-Instructions: Run for Scopes 1 and up. Viewing of traces 
-also includes a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example32_Petri_Net.mp b/Example32_Petri_Net.mp
index 624115a4d4fb768ef352d47212af414485fa971a..081794ff5bbdf5a730bc39dd6099f452e76c9b76 100644
--- a/Example32_Petri_Net.mp
+++ b/Example32_Petri_Net.mp
@@ -11,7 +11,7 @@ Modeling Language Manual" (Version 4). 2020. Available
 online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: petri net, number attribute, global report
 	
 	modeling Petri net behavior
     see the Petri net diagram in Sec. 2.16.2 in the MP v.4 Language Manual
@@ -19,10 +19,8 @@ Search terms:
     to obtain in the Global view Petri net diagram 
         extracted from the event traces, run scope 2
 
-Instructions: Run for Scopes 1 and 2. Viewing of traces 
-also includes a "Swim Lanes" option.
-
-Scope  2: 4 traces in approx. 6.6 sec.
+Instructions: Run for Scopes 1 and 2.
+	Scope 2: 4 traces in approx. 6.6 sec.
 
 ==========================================================*/
 
diff --git a/Example33_ATMWithdrawal_StatechartView.mp b/Example33_ATMWithdrawal_StatechartView.mp
index 11f3df43b06f4b3dde5df55aa12af9c2d0f92298..b58e8f033dec977ed216820da35c4d2734d4834d 100644
--- a/Example33_ATMWithdrawal_StatechartView.mp
+++ b/Example33_ATMWithdrawal_StatechartView.mp
@@ -11,12 +11,11 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: ATM withdrawal, statechart view, ATM system, data base, global report
 
 	Extracting Statechart view from MP model.
 
-Instructions: Run for Scopes 1 and up. Viewing of traces 
-also includes a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/
 
diff --git a/Example34_FiniteStateDiagram_PathAnnotation.mp b/Example34_FiniteStateDiagram_PathAnnotation.mp
index cd794e2ebdea3a1a3643da6d579451334ae83dfb..d07e19c50f3134d966e10bab7397d23f2af5a9b1 100644
--- a/Example34_FiniteStateDiagram_PathAnnotation.mp
+++ b/Example34_FiniteStateDiagram_PathAnnotation.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: finite state diagram, path annotation, state visit, state transition, finite state machine
 
     example of finite state diagram behavior model,
     contains non-deterministic transitions (from S1 with symbol a), 
@@ -42,10 +42,8 @@ Search terms:
     1) Event Si_to_Sj contains the symbol triggering the transition. 
     2) Si_to_Sj is shared by corresponding state behavior roots.
 
-Instructions: Run for Scopes 1 and 2. Viewing of traces 
-also includes a "Swim Lanes" option.
-  							    
-Scope  2: 30 traces in approx. 9.4 sec.
+Instructions: Run for Scopes 1 and 2.					    
+    Scope 2: 30 traces in approx. 9.4 sec.
 
 ==========================================================*/
 
diff --git a/Example35_FiniteStateDiagram_PathDiagram.mp b/Example35_FiniteStateDiagram_PathDiagram.mp
index a47ed763acb4eab6f9390fdc85de2826662af3aa..834e71c0a2265f57eb2d12041ff18cbfb6d37d4a 100644
--- a/Example35_FiniteStateDiagram_PathDiagram.mp
+++ b/Example35_FiniteStateDiagram_PathDiagram.mp
@@ -12,15 +12,13 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: finite state diagram, path diagram, state transition, global report, finite automaton behavior
 
     Adding path and state transition diagrams to 
 	the Finite Automaton behavior model.
 
-Instructions: Run for Scope 2. Viewing of traces also 
-includes a "Swim Lanes" option.
-
-Scope 2: 30 traces in approx. 11 sec.
+Instructions: Run for Scope 2.
+	Scope 2: 30 traces in approx. 11 sec.
 
 ==========================================================*/
 
diff --git a/Example36_Authentication_SystemReuse.mp b/Example36_Authentication_SystemReuse.mp
index eb142240dbca9ec0a8dd5e000f7ecee16eaa8b94..5f6b1438cde421b358895f5188dcdea841a80245 100644
--- a/Example36_Authentication_SystemReuse.mp
+++ b/Example36_Authentication_SystemReuse.mp
@@ -12,7 +12,7 @@ Architecture and Workflow Modeling Language Manual"
 (Version 4). 2020. Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: authentication system, system reuse, subsystem, MAP operation, data base
 
 Instructions: Run for Scopes 1 and up. Viewing of traces 
 also includes a "Swim Lanes" option. At Scope 3 and above, 
diff --git a/Example37_Compiler1_ComponentReuse.mp b/Example37_Compiler1_ComponentReuse.mp
index 2fe077d4e061b7b329290a80b01495b53fc699e6..085be255be168704f098075ef467da41f01b9279 100644
--- a/Example37_Compiler1_ComponentReuse.mp
+++ b/Example37_Compiler1_ComponentReuse.mp
@@ -11,16 +11,14 @@ Architecture and Workflow Modeling Language Manual" (Version 4).
 2020. Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: compiler, component reuse, front end, batch mode, bottom-up, parser, isomorphic behavior
     
 	Compiler front end,
 	bottom-up parser
 	Lexer and parser in batch mode
 
-Instructions: Run for Scopes 1 and 2. Viewing of traces 
-also includes a "Swim Lanes" option.
-
-Scope 2: 147 traces in approx. 1.8 sec.
+Instructions: Run for Scopes 1 and 2.
+	Scope 2: 147 traces in approx. 1.8 sec.
 
 ==========================================================*/
 
diff --git a/Example38_Compiler2_ComponentReuse.mp b/Example38_Compiler2_ComponentReuse.mp
index c47eddb86050b7f077a3d653cb902b90f8a55cc3..440cf55a3f8f3c295acd2afc978970880ec0c2e9 100644
--- a/Example38_Compiler2_ComponentReuse.mp
+++ b/Example38_Compiler2_ComponentReuse.mp
@@ -11,16 +11,14 @@ Architecture and Workflow Modeling Language Manual"
 (Version 4). 2020. Available online: 
 https://wiki.nps.edu/display/MP/Documentation 
 
-Search terms:
+Search terms: compiler, component reuse, front end, incremental mode, interaction mode, bottom-up, parser, isomorphic behavior
     
 	Compiler front end,
 	bottom-up parser
 	Lexer and parser in interaction mode
 
-Instructions: Run for Scopes 1, 2, and 3. Viewing of traces 
-also includes a "Swim Lanes" option.
-
-Scope  3: 4860 traces in approx. 1.6 min.
+Instructions: Run for Scopes 1, 2, and 3.
+	Scope 3: 4860 traces in approx. 1.6 min.
 
 ==========================================================*/
 
diff --git a/Example39_Merging_Root_Events_to_Reduce_Run_Time.mp b/Example39_Merging_Root_Events_to_Reduce_Run_Time.mp
index 591ccf79e6bc3611f4c6d7186864fbe03b3be889..9aac4fddc111188e228f8966722343115c20a4ff 100644
--- a/Example39_Merging_Root_Events_to_Reduce_Run_Time.mp
+++ b/Example39_Merging_Root_Events_to_Reduce_Run_Time.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation
 
-Search terms:
+Search terms: merging root events, reduce run time, layered derivation, trace segment derivation
 
 	Complex MP models may have large number of root events with several
 coordination operations performed on clusters of roots. This may be
@@ -39,8 +39,7 @@ derivation task we introduce a separate root event B_and_C to
 encapsulate the trace segment derivation (including the coordination)
 for B and C.
 
-Instructions: Run for Scopes 1 and 2. Viewing of traces 
-also includes a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and 2.
 
 ==========================================================*/
 
diff --git a/Example40_ApplicationProcess_partitioningLargeSchemaIntoSeparateSchemas.mp b/Example40_ApplicationProcess_partitioningLargeSchemaIntoSeparateSchemas.mp
index 55ca471cbe78961cb5482eece496a06e9302151b..94dc27d6fc80f823ab5031e0179521efc79c4f3e 100644
--- a/Example40_ApplicationProcess_partitioningLargeSchemaIntoSeparateSchemas.mp
+++ b/Example40_ApplicationProcess_partitioningLargeSchemaIntoSeparateSchemas.mp
@@ -11,7 +11,7 @@ Workflow Modeling Language Manual" (Version 4). 2020.
 Available online: 
 https://wiki.nps.edu/display/MP/Documentation
 
-Search terms:
+Search terms: application process, partitioning large schema, separate schemas
 
 	An applicant submits application and needs to get it approved by
 the bureaucratic chain of two officials. If the first official approves,
@@ -21,8 +21,7 @@ approve/reject the application or request it reworked and resubmitted.
 Rework and resubmit events may be repeated several times.  Each rejection
 is final and cannot be followed by rework and resubmit events.
 
-Instructions: Run for Scopes 1 and up. Viewing of traces 
-also includes a "Swim Lanes" option.
+Instructions: Run for Scopes 1 and up.
 
 ==========================================================*/