fixes to broad search and match highlighting