Further work on QueriedData.