Relates to issue #12 tidied up the handling of auto-generated labels