More changes for search highlighting