minor updates to the query