--- a/mercurial/templates/map-cmdline.default	Sat Mar 25 10:34:11 2017 +0100
+++ b/mercurial/templates/map-cmdline.default	Tue Mar 28 22:36:22 2017 +0200
@@ -29,7 +29,7 @@
 
 # General templates
 _trouble_label = 'trouble.{trouble}'
-_cset_labels = 'log.changeset changeset.{phase}{if(troubles, " changeset.troubled {troubles%_trouble_label}")}'
+_cset_labels = '{separate(" ", "log.changeset", "changeset.{phase}", "{if(troubles, "changeset.troubled {troubles%_trouble_label}")}")}'
 cset = '{label("{_cset_labels}",
                "changeset:   {rev}:{node|short}")}\n'