Added check for search