fix: search highlight
#2410

Paul-Bob wants to merge fix/search_highlight into main

We do not currently have an analysis of these two commits