Bug fix with search all