Adding the missing bits of the search highlight fix.