r9185: first effort at support field names in QUERY calls, still needs testing