Fixing component-by-concept lookup.