More bugfixes to find() and find_all()