Can you pull in the withQuery from the user-api-client library, please?