Use newer query functions.