Small changes from review of search doc

I left one TODO for someone else to confirm if necessary. Otherwise, I can remove the commented-out section.