Starting to split the query source properties property into properties and subqueries.