Refactor query table so that it runs off pure query results, without queryState metadata.
Tiny clean-up.