adding in all available query fields for query and fetch calls