Changes of search functions
First commit after modify conflicts