Search updates (25/26)

Search updates