Complete the fix to bring back case insensitive highligting