Search more fields; fix condition