Add app.id to queries