Remove extra user context items, rename 'query' to 'private message'