Updates to query-api in review