Highlighting fix for default option