Minor updates to Search