added -or conditional in find() and find_all()