diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.db.ts
index f247038526..b29a80e227 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.db.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.db.ts
@@ -54,6 +54,7 @@ const createMockMapper = (request: CreateDictionaryItemRequestModel): UmbMockDic
 		parent: request.parent,
 		translations: request.translations,
 		hasChildren: false,
+		translatedIsoCodes: [],
 	};
 };
 
diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/import-export.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/import-export.handlers.ts
index d16060568a..5290cb1278 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/import-export.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/import-export.handlers.ts
@@ -14,14 +14,15 @@ const importResponse: UmbMockDictionaryModel = {
 	name: 'Uploaded dictionary',
 	id: 'b7e7d0ab-53ba-485d-dddd-12537f9925cb',
 	hasChildren: false,
+	translatedIsoCodes: ['en', 'da'],
 	translations: [
 		{
 			isoCode: 'en',
 			translation: 'I am an imported US value',
 		},
 		{
-			isoCode: 'fr',
-			translation: 'I am an imported French value',
+			isoCode: 'da',
+			translation: 'I am an imported Danish value',
 		},
 	],
 };
@@ -49,14 +50,12 @@ export const importExportHandlers = [
 			statusCode: 200,
 		};
     */
-		debugger;
 
 		return res(ctx.status(200), ctx.json(contentResult));
 	}),
 
 	// TODO => handle properly, querystring breaks handler
 	rest.get(umbracoPath(`${UMB_SLUG}/:id/export`), (req, res, ctx) => {
-		debugger;
 		const id = req.params.id as string;
 		if (!id) return;
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts
index f6689adb85..1d591f92ea 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts
@@ -81,6 +81,9 @@ export class UmbVariantSelectorElement extends UmbLitElement {
 				workspaceContext.variants,
 				(variants) => {
 					if (variants) {
+						// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+						// @ts-ignore
+						// TODO: figure out what we do with the different variant models. Document has a state, but the variant model does not.
 						this._variants = variants;
 					}
 				},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/import/import.action.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/import/import.action.ts
index f3d9230248..a3f342be7a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/import/import.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/import/import.action.ts
@@ -4,14 +4,11 @@ import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal';
 import { UMB_MODAL_MANAGER_CONTEXT, UMB_IMPORT_DICTIONARY_MODAL } from '@umbraco-cms/backoffice/modal';
-import type { UmbDictionaryTreeStore } from 'src/packages/dictionary/index.js';
-import { UMB_DICTIONARY_TREE_STORE_CONTEXT } from 'src/packages/dictionary/index.js';
 
 export default class UmbImportDictionaryEntityAction extends UmbEntityActionBase<UmbDictionaryImportRepository> {
 	static styles = [UmbTextStyles];
 
 	#modalContext?: UmbModalManagerContext;
-	#treeStore?: UmbDictionaryTreeStore;
 
 	constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string, entityType: string) {
 		super(host, repositoryAlias, unique, entityType);
@@ -19,22 +16,14 @@ export default class UmbImportDictionaryEntityAction extends UmbEntityActionBase
 		this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
 			this.#modalContext = instance;
 		});
-		this.consumeContext(UMB_DICTIONARY_TREE_STORE_CONTEXT, (instance) => {
-			this.#treeStore = instance;
-		});
 	}
 
 	async execute() {
 		if (!this.#modalContext) return;
 
 		const modalContext = this.#modalContext?.open(UMB_IMPORT_DICTIONARY_MODAL, { data: { unique: this.unique } });
-
 		const { entityItems, parentId } = await modalContext.onSubmit();
 
 		if (!entityItems?.length) return;
-
-		this.#treeStore?.appendItems(entityItems);
-
-		if (parentId) this.#treeStore?.updateItem(parentId, { hasChildren: true });
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts
index 6d4c691313..1faaddad12 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts
@@ -80,7 +80,14 @@ export class UmbDocumentServerDataSource implements UmbDetailDataSource<UmbDocum
 			entityType: UMB_DOCUMENT_ENTITY_TYPE,
 			unique: data.id,
 			parentUnique: null, // TODO: this is not correct. It will be solved when we know where to get the parent from
-			values: data.values,
+			values: data.values.map((value) => {
+				return {
+					alias: value.alias,
+					culture: value.culture || null,
+					segment: value.segment || null,
+					value: value.value,
+				};
+			}),
 			variants: data.variants.map((variant) => {
 				return {
 					state: variant.state,
@@ -92,7 +99,12 @@ export class UmbDocumentServerDataSource implements UmbDetailDataSource<UmbDocum
 					updateDate: variant.updateDate,
 				};
 			}),
-			urls: data.urls,
+			urls: data.urls.map((url) => {
+				return {
+					culture: url.culture || null,
+					url: url.url,
+				};
+			}),
 			template: data.template ? { unique: data.template.id } : null,
 			documentType: { unique: data.documentType.id },
 			isTrashed: data.isTrashed,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts
index feeb5fb90e..71527ce5ac 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts
@@ -86,13 +86,11 @@ export default class UmbTemplateQueryBuilderModalElement extends UmbModalBaseEle
 	}
 
 	async #getTemplateQuerySettings() {
-		debugger;
 		const { data, error } = await this.#templateQueryRepository.getTemplateQuerySettings();
 		if (data) this._queryBuilderSettings = data;
 	}
 
 	#executeTemplateQuery = async () => {
-		debugger;
 		const { data, error } = await this.#templateQueryRepository.executeTemplateQuery();
 		if (data) {
 			this._templateQuery = { ...data };
@@ -206,11 +204,11 @@ export default class UmbTemplateQueryBuilderModalElement extends UmbModalBaseEle
 							<umb-localize key="template_iWant">I want</umb-localize>
 							<umb-dropdown look="outline" id="content-type-dropdown" label="Choose content type">
 								<span slot="label">
-									${this._queryRequest?.contentTypeAlias ?? this.localize.term('template_allContent')}
+									${this._queryRequest?.documentTypeAlias ?? this.localize.term('template_allContent')}
 								</span>
 								<uui-combobox-list @change=${this.#setContentType} class="options-list">
 									<uui-combobox-list-option value="">all content</uui-combobox-list-option>
-									${this._queryBuilderSettings?.contentTypeAliases?.map(
+									${this._queryBuilderSettings?.documentTypeAliases?.map(
 										(alias) =>
 											html`<uui-combobox-list-option .value=${alias}>
 												<umb-localize key="template_contentOfType" .args=${[alias]}>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts
index 0c23ca5d9c..51b45d69c1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts
@@ -47,8 +47,8 @@ export class UmbTemplateQueryServerDataSource {
 	 */
 	async executeTemplateQuery(args: any) {
 		const requestBody: TemplateQueryExecuteModel = {
-			rootContentId: args.rootContentUnique,
-			contentTypeAlias: args.contentTypeAlias,
+			rootDocument: { id: args.rootContentUnique },
+			documentTypeAlias: args.contentTypeAlias,
 			filters: args.filters,
 			sort: args.sort,
 			take: args.take,