Fix for backspace and search highlighting