Search highlight tweaks