ENH: Updated queries