Fix HAL-455
Fix highlight in domain runtime navigation