Issue #2446915: make label a little better with quotes;