fixed regression in _find after multiple-fields merge
Merge branch '3.0'