Ended error handling ; Fixed issues with search engine