Fix: Make case insensitive highlight preserve case