do not add empty Label when no label requested
Merge branch '8.30' of ssh://dasc-git.diamond.ac.uk/gda/gda-core into 8.30
fix cut&paste logic bugs