adding ability to find by specific fields only