Added more to Search