Re-fixed highlighting and selection for areas and companies.