Added option to specify specific fields to query for