has() and find() refactor