Move queries into DiscussionsQuery.