Fixing incremental search highlighting (issue #2)