diff --git a/driver-mongodb/src/main/resources/activities/mongodb-basic.yaml b/driver-mongodb/src/main/resources/activities/mongodb-basic.yaml
index 1c7743f05..3f7771a6e 100644
--- a/driver-mongodb/src/main/resources/activities/mongodb-basic.yaml
+++ b/driver-mongodb/src/main/resources/activities/mongodb-basic.yaml
@@ -40,8 +40,6 @@ blocks:
           }
         params:
           readPreference: primary
-        tags:
-          name: main-find
   - name: main-write
     tags:
       phase: main
@@ -57,5 +55,3 @@ blocks:
           }
         params:
           readPreference: primary
-        tags:
-          name: main-insert
diff --git a/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java b/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java
index cbb19807a..da03045b4 100644
--- a/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java
+++ b/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java
@@ -61,7 +61,7 @@ public class ReadyMongoStatementTest {
 
     @Test
     public void testResolvePhaseMainRead() {
-        String tagfilter = activityDef.getParams().getOptionalString("tags").orElse("phase:main,name:main-find");
+        String tagfilter = activityDef.getParams().getOptionalString("tags").orElse("phase:main,name:.*main-find");
 
         List<OpTemplate> stmts = stmtsDocList.getStmts(tagfilter);
         assertThat(stmts).hasSize(1);
@@ -83,7 +83,7 @@ public class ReadyMongoStatementTest {
 
     @Test
     public void testResolvePhaseMainWrite() {
-        String tagfilter = activityDef.getParams().getOptionalString("tags").orElse("phase:main,name:main-insert");
+        String tagfilter = activityDef.getParams().getOptionalString("tags").orElse("phase:main,name:.*main-insert");
 
         List<OpTemplate> stmts = stmtsDocList.getStmts(tagfilter);
         assertThat(stmts).hasSize(1);
diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java
index aa38f7ec0..b2b87a986 100644
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java
@@ -47,7 +47,7 @@ public class StmtDetailOverrideTest {
         assertThat(s.getStmt()).contains("globalstatement1");
         assertThat(s.getBindings()).hasSize(1);
         assertThat(s.getParams()).hasSize(1);
-        assertThat(s.getTags()).hasSize(1);
+        assertThat(s.getTags()).hasSize(2);
 
         StmtsBlock doc1block1 = doc1.getBlocks().get(1);
         List<OpTemplate> stmts = doc1block1.getOps();
@@ -56,14 +56,14 @@ public class StmtDetailOverrideTest {
         s = stmts.get(0);
         assertThat(s.getName()).isEqualTo("testblock1--stmt1");
         assertThat(s.getStmt()).contains("astatement1");
-        assertThat(s.getTags()).hasSize(1);
+        assertThat(s.getTags()).hasSize(2);
         assertThat(s.getBindings()).hasSize(1);
         assertThat(s.getParams()).hasSize(1);
 
         s = stmts.get(1);
         assertThat(s.getName()).isEqualTo("testblock1--s2name");
         assertThat(s.getStmt()).contains("s2statement data");
-        assertThat(s.getTags()).hasSize(1);
+        assertThat(s.getTags()).hasSize(2);
         assertThat(s.getBindings()).hasSize(1);
         assertThat(s.getParams()).hasSize(1);
 
@@ -78,7 +78,7 @@ public class StmtDetailOverrideTest {
         s = stmts.get(3);
         assertThat(s.getName()).isEqualTo("testblock1--s4");
         assertThat(s.getStmt()).contains("statement 4");
-        assertThat(s.getTags()).hasSize(1);
+        assertThat(s.getTags()).hasSize(2);
         assertThat(s.getBindings()).hasSize(1);
         assertThat(s.getParams()).hasSize(1);
 
diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java
index ee4b8d366..47b9addb8 100644
--- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java
+++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java
@@ -87,11 +87,11 @@ public class StmtsDocListTest {
 
         assertThat(stmts1.get(0).getBindings()).containsExactly(MapEntry.entry("b2","b2d"),MapEntry.entry("b1","b1d"));
         assertThat(stmts1.get(0).getParams()).containsExactly(MapEntry.entry("param1","value1"));
-        assertThat(stmts1.get(0).getTags()).containsExactly(MapEntry.entry("atagname","atagvalue"));
+        assertThat(stmts1.get(0).getTags()).containsExactly(MapEntry.entry("atagname","atagvalue"),MapEntry.entry("name","doc1--block0--stmt1"));
 
         assertThat(stmts1.get(1).getBindings()).containsExactly(MapEntry.entry("b2","b2d"),MapEntry.entry("b1","b1d"));
         assertThat(stmts1.get(1).getParams()).containsExactly(MapEntry.entry("param1","value1"));
-        assertThat(stmts1.get(1).getTags()).containsExactly(MapEntry.entry("atagname","atagvalue"));
+        assertThat(stmts1.get(1).getTags()).containsExactly(MapEntry.entry("atagname","atagvalue"),MapEntry.entry("name","doc1--block0--stmt2"));
 
     }