added support for the new label_format option