Minor changes to Search