Rationalise and bug fix the way HQs are highlighted