Added search over specific fields, closes #3