Additional changes to queries.