diff --git a/apps/web/src/fetcher/graphql-types/operations.ts b/apps/web/src/fetcher/graphql-types/operations.ts
index e3fe143242..d8ef9f5c1c 100644
--- a/apps/web/src/fetcher/graphql-types/operations.ts
+++ b/apps/web/src/fetcher/graphql-types/operations.ts
@@ -2110,7 +2110,7 @@ export type MainUuidQueryVariables = Exact<{
 }>;
 
 
-export type MainUuidQuery = { __typename?: 'Query', authorization: any, uuid?: { __typename: 'Applet', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'AppletRevision', metaTitle: string, metaDescription: string, url: string, id: number, alias: string, title: string, content: string, date: string } | null, revisions: { __typename?: 'AppletRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'AppletRevision', id: number, title: string, trashed: boolean }> }, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } | { __typename: 'AppletRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'Article', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'ArticleRevision', metaTitle: string, metaDescription: string, url?: string | null, id: number, alias: string, title: string, content: string, date: string } | null, revisions: { __typename?: 'ArticleRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ArticleRevision', id: number, title: string, trashed: boolean }> }, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } | { __typename: 'ArticleRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'Comment', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'Course', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'CourseRevision', metaTitle?: string | null, metaDescription: string, url?: string | null, id: number, alias: string, title: string, content: string, date: string } | null, revisions: { __typename?: 'CourseRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'CourseRevision', id: number, title: string, trashed: boolean }> }, pages: Array<{ __typename?: 'CoursePage', alias: string, id: number, currentRevision?: { __typename?: 'CoursePageRevision', id: number, title: string, content: string } | null }>, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } | { __typename: 'CoursePage', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'CoursePageRevision', metaTitle?: string | null, metaDescription?: string | null, url?: string | null, id: number, alias: string, title: string, content: string, date: string } | null, revisions: { __typename?: 'CoursePageRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'CoursePageRevision', id: number, title: string, trashed: boolean }> }, course: { __typename?: 'Course', id: number, licenseId: number, currentRevision?: { __typename?: 'CourseRevision', title: string } | null, revisions: { __typename?: 'CourseRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'CourseRevision', id: number, trashed: boolean, title: string }> }, pages: Array<{ __typename?: 'CoursePage', alias: string, id: number, currentRevision?: { __typename?: 'CoursePageRevision', title: string, trashed: boolean } | null }>, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } } | { __typename: 'CoursePageRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'CourseRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'Event', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'EventRevision', metaTitle: string, metaDescription: string, url?: string | null, id: number, alias: string, title: string, content: string, date: string } | null, revisions: { __typename?: 'EventRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'EventRevision', id: number, title: string, trashed: boolean }> }, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } | { __typename: 'EventRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'Exercise', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'ExerciseRevision', id: number, content: string, date: string, metaTitle?: string | null, metaDescription?: string | null, url?: string | null, alias: string, title: string } | null, revisions: { __typename?: 'ExerciseRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ExerciseRevision', id: number, title: string, trashed: boolean }> }, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } | { __typename: 'ExerciseGroup', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'ExerciseGroupRevision', metaTitle?: string | null, metaDescription?: string | null, url?: string | null, id: number, alias: string, title: string, content: string, date: string } | null, revisions: { __typename?: 'ExerciseGroupRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ExerciseGroupRevision', id: number, title: string, trashed: boolean }> }, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } | { __typename: 'ExerciseGroupRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'ExerciseRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'Page', instance: Instance, licenseId: number, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'PageRevision', id: number, alias: string, title: string, content: string, date: string } | null } | { __typename: 'PageRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'TaxonomyTerm', alias: string, title: string, instance: Instance, type: TaxonomyTermType, name: string, description?: string | null, weight: number, taxonomyId: number, trashed: boolean, id: number, parent?: { __typename?: 'TaxonomyTerm', id: number } | null, children: { __typename?: 'AbstractUuidConnection', nodes: Array<{ __typename: 'Applet', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'AppletRevision', title: string } | null, revisions: { __typename?: 'AppletRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'AppletRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'AppletRevision', trashed: boolean } | { __typename: 'Article', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'ArticleRevision', title: string } | null, revisions: { __typename?: 'ArticleRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ArticleRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'ArticleRevision', trashed: boolean } | { __typename: 'Comment', trashed: boolean } | { __typename: 'Course', trashed: boolean, alias: string, title: string, id: number, date: string, pages: Array<{ __typename?: 'CoursePage', id: number, currentRevision?: { __typename?: 'CoursePageRevision', id: number } | null }>, currentRevision?: { __typename?: 'CourseRevision', title: string } | null, revisions: { __typename?: 'CourseRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'CourseRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'CoursePage', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'CoursePageRevision', title: string } | null, revisions: { __typename?: 'CoursePageRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'CoursePageRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'CoursePageRevision', trashed: boolean } | { __typename: 'CourseRevision', trashed: boolean } | { __typename: 'Event', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'EventRevision', title: string } | null, revisions: { __typename?: 'EventRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'EventRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'EventRevision', trashed: boolean } | { __typename: 'Exercise', trashed: boolean, id: number, alias: string, instance: Instance, date: string, licenseId: number, title: string, currentRevision?: { __typename?: 'ExerciseRevision', id: number, content: string, date: string, title: string } | null, revisions: { __typename?: 'ExerciseRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ExerciseRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'ExerciseGroup', id: number, alias: string, instance: Instance, licenseId: number, trashed: boolean, title: string, date: string, currentRevision?: { __typename?: 'ExerciseGroupRevision', content: string, id: number, date: string, title: string } | null, revisions: { __typename?: 'ExerciseGroupRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ExerciseGroupRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'ExerciseGroupRevision', trashed: boolean } | { __typename: 'ExerciseRevision', trashed: boolean } | { __typename: 'Page', trashed: boolean } | { __typename: 'PageRevision', trashed: boolean } | { __typename: 'TaxonomyTerm', type: TaxonomyTermType, name: string, alias: string, id: number, description?: string | null, trashed: boolean, children: { __typename?: 'AbstractUuidConnection', nodes: Array<{ __typename: 'Applet', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'AppletRevision', title: string } | null, revisions: { __typename?: 'AppletRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'AppletRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'AppletRevision', trashed: boolean } | { __typename: 'Article', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'ArticleRevision', title: string } | null, revisions: { __typename?: 'ArticleRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ArticleRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'ArticleRevision', trashed: boolean } | { __typename: 'Comment', trashed: boolean } | { __typename: 'Course', trashed: boolean, alias: string, title: string, id: number, date: string, pages: Array<{ __typename?: 'CoursePage', id: number, currentRevision?: { __typename?: 'CoursePageRevision', id: number } | null }>, currentRevision?: { __typename?: 'CourseRevision', title: string } | null, revisions: { __typename?: 'CourseRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'CourseRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'CoursePage', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'CoursePageRevision', title: string } | null, revisions: { __typename?: 'CoursePageRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'CoursePageRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'CoursePageRevision', trashed: boolean } | { __typename: 'CourseRevision', trashed: boolean } | { __typename: 'Event', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'EventRevision', title: string } | null, revisions: { __typename?: 'EventRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'EventRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'EventRevision', trashed: boolean } | { __typename: 'Exercise', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'ExerciseRevision', title: string } | null, revisions: { __typename?: 'ExerciseRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ExerciseRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'ExerciseGroup', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'ExerciseGroupRevision', title: string } | null, revisions: { __typename?: 'ExerciseGroupRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ExerciseGroupRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'ExerciseGroupRevision', trashed: boolean } | { __typename: 'ExerciseRevision', trashed: boolean } | { __typename: 'Page', trashed: boolean } | { __typename: 'PageRevision', trashed: boolean } | { __typename: 'TaxonomyTerm', id: number, alias: string, type: TaxonomyTermType, name: string, trashed: boolean } | { __typename: 'User', trashed: boolean } | { __typename: 'Video', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'VideoRevision', title: string } | null, revisions: { __typename?: 'VideoRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'VideoRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'VideoRevision', trashed: boolean }> } } | { __typename: 'User', trashed: boolean } | { __typename: 'Video', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'VideoRevision', title: string } | null, revisions: { __typename?: 'VideoRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'VideoRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'VideoRevision', trashed: boolean }> }, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> } | { __typename: 'User', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'Video', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'VideoRevision', metaTitle?: string | null, metaDescription?: string | null, url: string, id: number, alias: string, title: string, content: string, date: string } | null, revisions: { __typename?: 'VideoRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'VideoRevision', id: number, title: string, trashed: boolean }> }, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } | { __typename: 'VideoRevision', id: number, title: string, trashed: boolean, alias: string } | null };
+export type MainUuidQuery = { __typename?: 'Query', authorization: any, uuid?: { __typename: 'Applet', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'AppletRevision', metaTitle: string, metaDescription: string, url: string, id: number, alias: string, title: string, content: string, date: string } | null, revisions: { __typename?: 'AppletRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'AppletRevision', id: number, title: string, trashed: boolean }> }, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } | { __typename: 'AppletRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'Article', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'ArticleRevision', metaTitle: string, metaDescription: string, url?: string | null, id: number, alias: string, title: string, content: string, date: string } | null, revisions: { __typename?: 'ArticleRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ArticleRevision', id: number, title: string, trashed: boolean }> }, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } | { __typename: 'ArticleRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'Comment', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'Course', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'CourseRevision', metaTitle?: string | null, metaDescription: string, url?: string | null, id: number, alias: string, title: string, content: string, date: string } | null, revisions: { __typename?: 'CourseRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'CourseRevision', id: number, title: string, trashed: boolean }> }, pages: Array<{ __typename?: 'CoursePage', alias: string, id: number, currentRevision?: { __typename?: 'CoursePageRevision', id: number, title: string, content: string } | null }>, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } | { __typename: 'CoursePage', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'CoursePageRevision', metaTitle?: string | null, metaDescription?: string | null, url?: string | null, id: number, alias: string, title: string, content: string, date: string } | null, revisions: { __typename?: 'CoursePageRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'CoursePageRevision', id: number, title: string, trashed: boolean }> }, course: { __typename?: 'Course', id: number, licenseId: number, currentRevision?: { __typename?: 'CourseRevision', title: string } | null, revisions: { __typename?: 'CourseRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'CourseRevision', id: number, trashed: boolean, title: string }> }, pages: Array<{ __typename?: 'CoursePage', alias: string, id: number, currentRevision?: { __typename?: 'CoursePageRevision', title: string, trashed: boolean } | null }>, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } } | { __typename: 'CoursePageRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'CourseRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'Event', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'EventRevision', metaTitle: string, metaDescription: string, url?: string | null, id: number, alias: string, title: string, content: string, date: string } | null, revisions: { __typename?: 'EventRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'EventRevision', id: number, title: string, trashed: boolean }> }, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } | { __typename: 'EventRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'Exercise', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'ExerciseRevision', id: number, content: string, date: string, metaTitle?: string | null, metaDescription?: string | null, url?: string | null, alias: string, title: string } | null, revisions: { __typename?: 'ExerciseRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ExerciseRevision', id: number, title: string, trashed: boolean }> }, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } | { __typename: 'ExerciseGroup', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'ExerciseGroupRevision', metaTitle?: string | null, metaDescription?: string | null, url?: string | null, id: number, alias: string, title: string, content: string, date: string } | null, revisions: { __typename?: 'ExerciseGroupRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ExerciseGroupRevision', id: number, title: string, trashed: boolean }> }, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } | { __typename: 'ExerciseGroupRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'ExerciseRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'Page', instance: Instance, licenseId: number, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'PageRevision', id: number, alias: string, title: string, content: string, date: string } | null } | { __typename: 'PageRevision', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'TaxonomyTerm', alias: string, title: string, instance: Instance, type: TaxonomyTermType, name: string, description?: string | null, weight: number, trashed: boolean, id: number, parent?: { __typename?: 'TaxonomyTerm', id: number } | null, children: { __typename?: 'AbstractUuidConnection', nodes: Array<{ __typename: 'Applet', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'AppletRevision', title: string } | null, revisions: { __typename?: 'AppletRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'AppletRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'AppletRevision', trashed: boolean } | { __typename: 'Article', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'ArticleRevision', title: string } | null, revisions: { __typename?: 'ArticleRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ArticleRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'ArticleRevision', trashed: boolean } | { __typename: 'Comment', trashed: boolean } | { __typename: 'Course', trashed: boolean, alias: string, title: string, id: number, date: string, pages: Array<{ __typename?: 'CoursePage', id: number, currentRevision?: { __typename?: 'CoursePageRevision', id: number } | null }>, currentRevision?: { __typename?: 'CourseRevision', title: string } | null, revisions: { __typename?: 'CourseRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'CourseRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'CoursePage', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'CoursePageRevision', title: string } | null, revisions: { __typename?: 'CoursePageRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'CoursePageRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'CoursePageRevision', trashed: boolean } | { __typename: 'CourseRevision', trashed: boolean } | { __typename: 'Event', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'EventRevision', title: string } | null, revisions: { __typename?: 'EventRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'EventRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'EventRevision', trashed: boolean } | { __typename: 'Exercise', trashed: boolean, id: number, alias: string, instance: Instance, date: string, licenseId: number, title: string, currentRevision?: { __typename?: 'ExerciseRevision', id: number, content: string, date: string, title: string } | null, revisions: { __typename?: 'ExerciseRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ExerciseRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'ExerciseGroup', id: number, alias: string, instance: Instance, licenseId: number, trashed: boolean, title: string, date: string, currentRevision?: { __typename?: 'ExerciseGroupRevision', content: string, id: number, date: string, title: string } | null, revisions: { __typename?: 'ExerciseGroupRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ExerciseGroupRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'ExerciseGroupRevision', trashed: boolean } | { __typename: 'ExerciseRevision', trashed: boolean } | { __typename: 'Page', trashed: boolean } | { __typename: 'PageRevision', trashed: boolean } | { __typename: 'TaxonomyTerm', type: TaxonomyTermType, name: string, alias: string, id: number, description?: string | null, trashed: boolean, children: { __typename?: 'AbstractUuidConnection', nodes: Array<{ __typename: 'Applet', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'AppletRevision', title: string } | null, revisions: { __typename?: 'AppletRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'AppletRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'AppletRevision', trashed: boolean } | { __typename: 'Article', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'ArticleRevision', title: string } | null, revisions: { __typename?: 'ArticleRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ArticleRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'ArticleRevision', trashed: boolean } | { __typename: 'Comment', trashed: boolean } | { __typename: 'Course', trashed: boolean, alias: string, title: string, id: number, date: string, pages: Array<{ __typename?: 'CoursePage', id: number, currentRevision?: { __typename?: 'CoursePageRevision', id: number } | null }>, currentRevision?: { __typename?: 'CourseRevision', title: string } | null, revisions: { __typename?: 'CourseRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'CourseRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'CoursePage', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'CoursePageRevision', title: string } | null, revisions: { __typename?: 'CoursePageRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'CoursePageRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'CoursePageRevision', trashed: boolean } | { __typename: 'CourseRevision', trashed: boolean } | { __typename: 'Event', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'EventRevision', title: string } | null, revisions: { __typename?: 'EventRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'EventRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'EventRevision', trashed: boolean } | { __typename: 'Exercise', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'ExerciseRevision', title: string } | null, revisions: { __typename?: 'ExerciseRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ExerciseRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'ExerciseGroup', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'ExerciseGroupRevision', title: string } | null, revisions: { __typename?: 'ExerciseGroupRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'ExerciseGroupRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'ExerciseGroupRevision', trashed: boolean } | { __typename: 'ExerciseRevision', trashed: boolean } | { __typename: 'Page', trashed: boolean } | { __typename: 'PageRevision', trashed: boolean } | { __typename: 'TaxonomyTerm', id: number, alias: string, type: TaxonomyTermType, name: string, trashed: boolean } | { __typename: 'User', trashed: boolean } | { __typename: 'Video', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'VideoRevision', title: string } | null, revisions: { __typename?: 'VideoRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'VideoRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'VideoRevision', trashed: boolean }> } } | { __typename: 'User', trashed: boolean } | { __typename: 'Video', trashed: boolean, alias: string, title: string, id: number, date: string, currentRevision?: { __typename?: 'VideoRevision', title: string } | null, revisions: { __typename?: 'VideoRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'VideoRevision', title: string, trashed: boolean, id: number }> } } | { __typename: 'VideoRevision', trashed: boolean }> }, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> } | { __typename: 'User', id: number, title: string, trashed: boolean, alias: string } | { __typename: 'Video', instance: Instance, licenseId: number, date: string, id: number, title: string, trashed: boolean, alias: string, currentRevision?: { __typename?: 'VideoRevision', metaTitle?: string | null, metaDescription?: string | null, url: string, id: number, alias: string, title: string, content: string, date: string } | null, revisions: { __typename?: 'VideoRevisionConnection', totalCount: number, nodes: Array<{ __typename?: 'VideoRevision', id: number, title: string, trashed: boolean }> }, taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } } | { __typename: 'VideoRevision', id: number, title: string, trashed: boolean, alias: string } | null };
 
 type TaxonomyTermsV2_Applet_Fragment = { __typename?: 'Applet', taxonomyTerms: { __typename?: 'TaxonomyTermConnection', nodes: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number, path: Array<{ __typename?: 'TaxonomyTerm', title: string, alias: string, id: number } | null> }> } };
 
diff --git a/apps/web/src/fetcher/query.ts b/apps/web/src/fetcher/query.ts
index 12d69a8ec1..e22f0d4002 100644
--- a/apps/web/src/fetcher/query.ts
+++ b/apps/web/src/fetcher/query.ts
@@ -98,7 +98,6 @@ export const dataQuery = gql`
         name
         description
         weight
-        taxonomyId
         trashed
         parent {
           id
diff --git a/apps/web/src/serlo-editor-integration/convert-editor-response-to-state.ts b/apps/web/src/serlo-editor-integration/convert-editor-response-to-state.ts
index 871d262c25..95b812b801 100644
--- a/apps/web/src/serlo-editor-integration/convert-editor-response-to-state.ts
+++ b/apps/web/src/serlo-editor-integration/convert-editor-response-to-state.ts
@@ -243,7 +243,6 @@ export function convertEditorResponseToState(
         id: uuid.id,
         parent: uuid.parent?.id ?? 0,
         position: uuid.weight,
-        taxonomy: uuid.taxonomyId,
         term: {
           name: uuid.name,
         },
diff --git a/packages/editor/src/plugins/serlo-template-plugins/taxonomy.tsx b/packages/editor/src/plugins/serlo-template-plugins/taxonomy.tsx
index 1ef3e4bbc4..0ff06c5e6f 100644
--- a/packages/editor/src/plugins/serlo-template-plugins/taxonomy.tsx
+++ b/packages/editor/src/plugins/serlo-template-plugins/taxonomy.tsx
@@ -15,7 +15,6 @@ export const taxonomyTypeState = object({
   term: object({
     name: string(),
   }),
-  taxonomy: number(),
   parent: number(),
   position: number(),
   description: editorContent(),