Updates to highlight selection for some components