Improved ChoiceDiffGenerator for elements with ref. Bug fix in LabelsBundles. Tests extended.