Increased use of inline callbacks, fixed query URI generation