adding ability to specify needed fileds for queries