added query, tags, and subscriptions