Improve fish-style highlighted reverse search