Fix highlight status while searching
Merge branch 'fix-hlsearch-handling' into dev