diff --git a/reporting/md-toc b/reporting/md-toc
index 92f225a..d056987 100755
--- a/reporting/md-toc
+++ b/reporting/md-toc
@@ -43,7 +43,7 @@ def main():
     postspace = "  " if opts.f else ""
     counters = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
     lastlev = 0
-    re_anchor = re.compile("[^0-9a-z-]")
+    re_anchor = re.compile("[^0-9a-z_-]")
 
     entries = []
     marker_found = False
@@ -73,7 +73,7 @@ def main():
                 bullet = "{:d}. ".format(counters[pad])
             if opts.f:
                 pad = 0
-            entries.append("{}{}{}{}".format(pad * "    ", bullet, title, postspace))
+            entries.append("{}{}{}{}".format(pad * "  ", bullet, title, postspace))
         if row == MARKERSTART:
             marker_found = True
         if marker_found and not marker_end_found: