Update and rename US11589: UI: Minor Fixes to Ref highlighting bug