Merge "Pass content to SearchUpdate rather than raw text"