Updated handling of lowercase user highlighting