Fix to pick-up concept labels for components