added the query at sample level based on fields. we'll have to discuss its scope.