diff --git a/src/datafmt.cpp b/src/datafmt.cpp
index 63f27da..e21dff1 100644
--- a/src/datafmt.cpp
+++ b/src/datafmt.cpp
@@ -16,7 +16,7 @@ struct FmtDelta {
 
     void field(const std::string& prefix, const Value& val, bool verytop)
     {
-        if(verytop && !val.isMarked())
+        if(verytop && !val.isMarked(false))
             return;
 
         strm<<indent{}<<prefix;
@@ -110,7 +110,7 @@ struct FmtDelta {
         field(prefix, val, verytop);
 
         if(val.type()==TypeCode::Struct) {
-            for(auto fld : val.iall()) {
+            for(auto fld : val.imarked()) {
                 std::string cprefix(prefix);
                 if(!verytop)
                     cprefix += '.';
diff --git a/test/testtype.cpp b/test/testtype.cpp
index 77491b7..83955e2 100644
--- a/test/testtype.cpp
+++ b/test/testtype.cpp
@@ -558,7 +558,6 @@ void testFormat()
 
     testStrEq(std::string(SB()<<top.format().delta()),
         "struct \"top_t\"\n"
-        "scalar struct\n"
         "scalar.i32 int32_t = -42\n"
         "scalar.u32 uint32_t = 42\n"
         "scalar.b bool = true\n"
@@ -568,7 +567,6 @@ void testFormat()
         "scalar.wildcard-> string = \"simple\"\n"
         "scalar.choice union\n"
         "scalar.choice->one int32_t = 1024\n"
-        "array struct\n"
         "array.i32 int32_t[] = {4}[1, -1, 2, -3]\n"
         "array.s string[] = {3}[\"one\", \"two\", \"three\"]\n"
         "array.wildcard any[]\n"
@@ -581,7 +579,6 @@ void testFormat()
         "array.choice[2] union\n"
         "array.choice[2]->two struct\n"
         "array.choice[2]->two.ahalf int32_t = 2468\n"
-        "array.more struct[] = {\?}[]\n"
     );
 }
 
diff --git a/tools/monitor.cpp b/tools/monitor.cpp
index e602ba0..b2a0b6b 100644
--- a/tools/monitor.cpp
+++ b/tools/monitor.cpp
@@ -141,7 +141,9 @@ int main(int argc, char *argv[])
                 }
                 log_info_printf(app, "%s POP empty\n", name.c_str());
 
-                std::cout<<name<<"\n"<<update.format()
+                std::cout<<name<<"\n";
+                Indented I(std::cout);
+                std::cout<<update.format()
                            .format(format)
                            .arrayLimit(arrLimit);