// add fields to main query