Search updates (6/26)

Search updates