improved search functions

improved search results and function.