Add support for custom escaping of labels, and more