Fix field handling for summary queries, fix ${ } display.