Removed url as a parameter to query functions