Switched query requests to new api