Update displayLabel handling & change slugify a bit.