Search updates (24/26)

Search updates