ochre-sdk 0.21.8 → 0.22.1

package/dist/index.mjs

@@ -2157,7 +2157,7 @@ async function fetchItem(uuid, category, itemCategories, options) {
 	}
 }
 //#endregion
-//#region src/utils/fetchers/set/query-helpers.ts
+//#region src/utils/query.ts
 const CTS_INCLUDES_STOP_WORDS = [
 	"and",
 	"at",
@@ -3779,7 +3779,63 @@ async function fetchSetPropertyValues(params, options) {
 }
 //#endregion
 //#region src/utils/getters.ts
-const DEFAULT_OPTIONS = { includeNestedProperties: false };
+const DEFAULT_OPTIONS = {
+	includeNestedProperties: false,
+	limitToLeafPropertyValues: true
+};
+/**
+* Searches for a property in an array of properties
+* @param properties - The array of properties to search through
+* @param options - The options for the search
+* @param findDirectResult - A function to find the direct result
+* @param transformNestedResult - A function to transform the nested result
+* @returns The result of the search, or null if not found
+*/
+function searchPropertyResult(properties, options, findDirectResult, transformNestedResult) {
+	const directResult = findDirectResult(properties);
+	if (directResult !== null) return directResult;
+	if (options.includeNestedProperties) for (const property of properties) {
+		const nestedResult = searchPropertyResult(property.properties, options, findDirectResult, transformNestedResult);
+		if (nestedResult !== null) {
+			const transformedResult = transformNestedResult != null ? transformNestedResult(nestedResult) : nestedResult;
+			if (transformedResult !== null) return transformedResult;
+		}
+	}
+	return null;
+}
+function getPropertyValuesResult(values, limitToLeafPropertyValues, copyValuesWhenUnfiltered) {
+	if (limitToLeafPropertyValues) return getLeafPropertyValues(values);
+	if (copyValuesWhenUnfiltered) return values.map((value) => value);
+	return values;
+}
+function clonePropertyValues(values) {
+	return values.map((value) => ({
+		...value,
+		content: value.content
+	}));
+}
+function getNormalizedProperty(property, limitToLeafPropertyValues, transformValues) {
+	if (!limitToLeafPropertyValues) return property;
+	const values = getLeafPropertyValues(property.values);
+	return {
+		...property,
+		values: transformValues != null ? transformValues(values) : values
+	};
+}
+function getFirstPropertyValueResult(values, limitToLeafPropertyValues) {
+	if (limitToLeafPropertyValues) return getLeafPropertyValues(values)[0] ?? null;
+	return values[0] ?? null;
+}
+function getFirstPropertyValueContentResult(values, limitToLeafPropertyValues) {
+	if (limitToLeafPropertyValues) return getLeafPropertyValues(values)[0]?.content ?? null;
+	return values[0]?.content ?? null;
+}
+function visitProperties(properties, includeNestedProperties, visit) {
+	for (const property of properties) {
+		visit(property);
+		if (includeNestedProperties) visitProperties(property.properties, includeNestedProperties, visit);
+	}
+}
 /**
 * Finds a property by its UUID in an array of properties
 *
@@ -3790,15 +3846,7 @@ const DEFAULT_OPTIONS = { includeNestedProperties: false };
 */
 function getPropertyByUuid(properties, uuid, options = DEFAULT_OPTIONS) {
 	const { includeNestedProperties } = options;
-	const property = properties.find((property) => property.uuid === uuid);
-	if (property) return property;
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyByUuid(property.properties, uuid, { includeNestedProperties });
-			if (nestedResult) return nestedResult;
-		}
-	}
-	return null;
+	return searchPropertyResult(properties, { includeNestedProperties }, (currentProperties) => currentProperties.find((property) => property.uuid === uuid) ?? null);
 }
 /**
 * Retrieves all values for a property with the given UUID
@@ -3809,16 +3857,28 @@ function getPropertyByUuid(properties, uuid, options = DEFAULT_OPTIONS) {
 * @returns Array of property values as strings, or null if property not found
 */
 function getPropertyValuesByUuid(properties, uuid, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const property = properties.find((property) => property.uuid === uuid);
-	if (property) return property.values.map((value) => value.content);
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyValuesByUuid(property.properties, uuid, { includeNestedProperties });
-			if (nestedResult) return nestedResult;
-		}
-	}
-	return null;
+	const { includeNestedProperties, limitToLeafPropertyValues } = options;
+	return searchPropertyResult(properties, { includeNestedProperties }, (currentProperties) => {
+		const property = currentProperties.find((currentProperty) => currentProperty.uuid === uuid) ?? null;
+		if (property == null) return null;
+		return getPropertyValuesResult(property.values, limitToLeafPropertyValues, true);
+	}, (nestedResult) => getPropertyValuesResult(nestedResult, limitToLeafPropertyValues, true));
+}
+/**
+* Retrieves all value contents for a property with the given UUID
+*
+* @param properties - Array of properties to search through
+* @param uuid - The UUID to search for
+* @param options - Search options, including whether to include nested properties
+* @returns Array of property value contents as strings, or null if property not found
+*/
+function getPropertyValueContentsByUuid(properties, uuid, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties, limitToLeafPropertyValues } = options;
+	return searchPropertyResult(properties, { includeNestedProperties }, (currentProperties) => {
+		const property = currentProperties.find((currentProperty) => currentProperty.uuid === uuid) ?? null;
+		if (property == null) return null;
+		return getPropertyValuesResult(property.values, limitToLeafPropertyValues, false).map((value) => value.content);
+	});
 }
 /**
 * Gets the first value of a property with the given UUID
@@ -3829,16 +3889,34 @@ function getPropertyValuesByUuid(properties, uuid, options = DEFAULT_OPTIONS) {
 * @returns The first property value as string, or null if property not found
 */
 function getPropertyValueByUuid(properties, uuid, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const values = getPropertyValuesByUuid(properties, uuid, { includeNestedProperties });
-	if (values !== null && values.length > 0) return values[0];
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyValueByUuid(property.properties, uuid, { includeNestedProperties });
-			if (nestedResult !== null) return nestedResult;
-		}
-	}
-	return null;
+	const { includeNestedProperties, limitToLeafPropertyValues } = options;
+	return searchPropertyResult(properties, { includeNestedProperties }, (currentProperties) => {
+		const values = getPropertyValuesByUuid(currentProperties, uuid, {
+			includeNestedProperties: false,
+			limitToLeafPropertyValues
+		});
+		if (values === null || values.length === 0) return null;
+		return getFirstPropertyValueResult(values, limitToLeafPropertyValues);
+	}, (nestedResult) => getFirstPropertyValueResult([nestedResult], limitToLeafPropertyValues));
+}
+/**
+* Gets the first value content of a property with the given UUID
+*
+* @param properties - Array of properties to search through
+* @param uuid - The UUID to search for
+* @param options - Search options, including whether to include nested properties
+* @returns The first property value content as string, or null if property not found
+*/
+function getPropertyValueContentByUuid(properties, uuid, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties, limitToLeafPropertyValues } = options;
+	return searchPropertyResult(properties, { includeNestedProperties }, (currentProperties) => {
+		const values = getPropertyValuesByUuid(currentProperties, uuid, {
+			includeNestedProperties: false,
+			limitToLeafPropertyValues
+		});
+		if (values === null || values.length === 0) return null;
+		return getFirstPropertyValueContentResult(values, limitToLeafPropertyValues);
+	});
 }
 /**
 * Finds a property by its label in an array of properties
@@ -3850,15 +3928,7 @@ function getPropertyValueByUuid(properties, uuid, options = DEFAULT_OPTIONS) {
 */
 function getPropertyByLabel(properties, label, options = DEFAULT_OPTIONS) {
 	const { includeNestedProperties } = options;
-	const property = properties.find((property) => property.label === label);
-	if (property) return property;
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyByLabel(property.properties, label, { includeNestedProperties });
-			if (nestedResult) return nestedResult;
-		}
-	}
-	return null;
+	return searchPropertyResult(properties, { includeNestedProperties }, (currentProperties) => currentProperties.find((property) => property.label === label) ?? null);
 }
 /**
 * Finds a property by its label and all values in an array of properties
@@ -3870,16 +3940,29 @@ function getPropertyByLabel(properties, label, options = DEFAULT_OPTIONS) {
 * @returns The matching Property object, or null if not found or all values do not match
 */
 function getPropertyByLabelAndValues(properties, label, values, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const property = properties.find((property) => property.label === label && deepEqual(property.values, values));
-	if (property) return property;
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyByLabelAndValues(property.properties, label, values, { includeNestedProperties });
-			if (nestedResult) return nestedResult;
-		}
-	}
-	return null;
+	const { includeNestedProperties, limitToLeafPropertyValues } = options;
+	return searchPropertyResult(properties, { includeNestedProperties }, (currentProperties) => {
+		const property = currentProperties.find((currentProperty) => currentProperty.label === label && deepEqual(currentProperty.values, values)) ?? null;
+		if (property == null) return null;
+		return getNormalizedProperty(property, limitToLeafPropertyValues);
+	}, (nestedResult) => getNormalizedProperty(nestedResult, limitToLeafPropertyValues));
+}
+/**
+* Finds a property by its label and all values in an array of properties
+*
+* @param properties - Array of properties to search through
+* @param label - The label to search for
+* @param valueContents - The value contents to search for
+* @param options - Search options, including whether to include nested properties
+* @returns The matching Property object, or null if not found or all values do not match
+*/
+function getPropertyByLabelAndValueContents(properties, label, valueContents, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties, limitToLeafPropertyValues } = options;
+	return searchPropertyResult(properties, { includeNestedProperties }, (currentProperties) => {
+		const property = currentProperties.find((currentProperty) => currentProperty.label === label && deepEqual(currentProperty.values.map((value) => value.content), valueContents)) ?? null;
+		if (property == null) return null;
+		return getNormalizedProperty(property, limitToLeafPropertyValues, clonePropertyValues);
+	}, (nestedResult) => getNormalizedProperty(nestedResult, limitToLeafPropertyValues));
 }
 /**
 * Finds a property by its label and value in an array of properties
@@ -3891,16 +3974,29 @@ function getPropertyByLabelAndValues(properties, label, values, options = DEFAUL
 * @returns The matching Property object, or null if not found or value does not match
 */
 function getPropertyByLabelAndValue(properties, label, value, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const property = properties.find((property) => property.label === label && property.values.some((v) => v.content === value));
-	if (property) return property;
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyByLabelAndValue(property.properties, label, value, { includeNestedProperties });
-			if (nestedResult) return nestedResult;
-		}
-	}
-	return null;
+	const { includeNestedProperties, limitToLeafPropertyValues } = options;
+	return searchPropertyResult(properties, { includeNestedProperties }, (currentProperties) => {
+		const property = currentProperties.find((currentProperty) => currentProperty.label === label && currentProperty.values.some((candidateValue) => deepEqual(candidateValue, value))) ?? null;
+		if (property == null) return null;
+		return getNormalizedProperty(property, limitToLeafPropertyValues);
+	}, (nestedResult) => getNormalizedProperty(nestedResult, limitToLeafPropertyValues));
+}
+/**
+* Finds a property by its label and value content in an array of properties
+*
+* @param properties - Array of properties to search through
+* @param label - The label to search for
+* @param valueContent - The value content to search for
+* @param options - Search options, including whether to include nested properties
+* @returns The matching Property object, or null if not found or value content does not match
+*/
+function getPropertyByLabelAndValueContent(properties, label, valueContent, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties, limitToLeafPropertyValues } = options;
+	return searchPropertyResult(properties, { includeNestedProperties }, (currentProperties) => {
+		const property = currentProperties.find((currentProperty) => currentProperty.label === label && currentProperty.values.some((value) => deepEqual(value.content, valueContent))) ?? null;
+		if (property == null) return null;
+		return getNormalizedProperty(property, limitToLeafPropertyValues);
+	}, (nestedResult) => getNormalizedProperty(nestedResult, limitToLeafPropertyValues));
 }
 /**
 * Retrieves all values for a property with the given label
@@ -3911,16 +4007,12 @@ function getPropertyByLabelAndValue(properties, label, value, options = DEFAULT_
 * @returns Array of property values as strings, or null if property not found
 */
 function getPropertyValuesByLabel(properties, label, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const property = properties.find((property) => property.label === label);
-	if (property) return property.values.map((value) => value.content);
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyValuesByLabel(property.properties, label, { includeNestedProperties });
-			if (nestedResult) return nestedResult;
-		}
-	}
-	return null;
+	const { includeNestedProperties, limitToLeafPropertyValues } = options;
+	return searchPropertyResult(properties, { includeNestedProperties }, (currentProperties) => {
+		const property = currentProperties.find((currentProperty) => currentProperty.label === label) ?? null;
+		if (property == null) return null;
+		return getPropertyValuesResult(property.values, limitToLeafPropertyValues, false);
+	}, (nestedResult) => getPropertyValuesResult(nestedResult, limitToLeafPropertyValues, false));
 }
 /**
 * Gets the first value of a property with the given label
@@ -3931,16 +4023,34 @@ function getPropertyValuesByLabel(properties, label, options = DEFAULT_OPTIONS)
 * @returns The first property value as string, or null if property not found
 */
 function getPropertyValueByLabel(properties, label, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const values = getPropertyValuesByLabel(properties, label, { includeNestedProperties });
-	if (values !== null && values.length > 0) return values[0];
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyValueByLabel(property.properties, label, { includeNestedProperties });
-			if (nestedResult !== null) return nestedResult;
-		}
-	}
-	return null;
+	const { includeNestedProperties, limitToLeafPropertyValues } = options;
+	return searchPropertyResult(properties, { includeNestedProperties }, (currentProperties) => {
+		const values = getPropertyValuesByLabel(currentProperties, label, {
+			includeNestedProperties: false,
+			limitToLeafPropertyValues
+		});
+		if (values === null || values.length === 0) return null;
+		return getFirstPropertyValueResult(values, limitToLeafPropertyValues);
+	}, (nestedResult) => getFirstPropertyValueResult([nestedResult], limitToLeafPropertyValues));
+}
+/**
+* Gets the first value content of a property with the given label
+*
+* @param properties - Array of properties to search through
+* @param label - The label to search for
+* @param options - Search options, including whether to include nested properties
+* @returns The first property value content as string, or null if property not found
+*/
+function getPropertyValueContentByLabel(properties, label, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties, limitToLeafPropertyValues } = options;
+	return searchPropertyResult(properties, { includeNestedProperties }, (currentProperties) => {
+		const values = getPropertyValuesByLabel(currentProperties, label, {
+			includeNestedProperties: false,
+			limitToLeafPropertyValues
+		});
+		if (values === null || values.length === 0) return null;
+		return getFirstPropertyValueContentResult(values, limitToLeafPropertyValues);
+	});
 }
 /**
 * Gets all unique properties from an array of properties
@@ -3950,19 +4060,13 @@ function getPropertyValueByLabel(properties, label, options = DEFAULT_OPTIONS) {
 * @returns Array of unique properties
 */
 function getUniqueProperties(properties, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
+	const { includeNestedProperties, limitToLeafPropertyValues } = options;
 	const uniqueProperties = new Array();
-	for (const property of properties) {
-		if (uniqueProperties.some((p) => p.uuid === property.uuid)) continue;
+	visitProperties(properties, includeNestedProperties, (property) => {
+		if (uniqueProperties.some((p) => p.uuid === property.uuid)) return;
 		uniqueProperties.push(property);
-		if (property.properties.length > 0 && includeNestedProperties) {
-			const nestedProperties = getUniqueProperties(property.properties, { includeNestedProperties: true });
-			for (const property of nestedProperties) {
-				if (uniqueProperties.some((p) => p.uuid === property.uuid)) continue;
-				uniqueProperties.push(property);
-			}
-		}
-	}
+	});
+	if (limitToLeafPropertyValues) return uniqueProperties.map((property) => getNormalizedProperty(property, limitToLeafPropertyValues));
 	return uniqueProperties;
 }
 /**
@@ -3975,17 +4079,10 @@ function getUniqueProperties(properties, options = DEFAULT_OPTIONS) {
 function getUniquePropertyLabels(properties, options = DEFAULT_OPTIONS) {
 	const { includeNestedProperties } = options;
 	const uniquePropertyLabels = new Array();
-	for (const property of properties) {
-		if (uniquePropertyLabels.includes(property.label)) continue;
+	visitProperties(properties, includeNestedProperties, (property) => {
+		if (uniquePropertyLabels.includes(property.label)) return;
 		uniquePropertyLabels.push(property.label);
-		if (property.properties.length > 0 && includeNestedProperties) {
-			const nestedProperties = getUniquePropertyLabels(property.properties, { includeNestedProperties: true });
-			for (const property of nestedProperties) {
-				if (uniquePropertyLabels.includes(property)) continue;
-				uniquePropertyLabels.push(property);
-			}
-		}
-	}
+	});
 	return uniquePropertyLabels;
 }
 /**
@@ -4007,25 +4104,28 @@ function getLeafPropertyValues(propertyValues) {
 * @returns True if the property matches the filter criteria, false otherwise
 */
 function filterProperties(property, filter, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
+	const { includeNestedProperties, limitToLeafPropertyValues } = options;
 	if (filter.label.toLocaleLowerCase("en-US") === "all fields" || property.label.toLocaleLowerCase("en-US") === filter.label.toLocaleLowerCase("en-US")) {
 		let isFound = property.values.some((value) => {
 			if (value.content === null) return false;
 			if (typeof value.content === "string") {
-				if (typeof filter.value !== "string") return false;
-				return value.content.toLocaleLowerCase("en-US").includes(filter.value.toLocaleLowerCase("en-US"));
+				if (typeof filter.value.content !== "string") return false;
+				return value.content.toLocaleLowerCase("en-US").includes(filter.value.content.toLocaleLowerCase("en-US"));
 			}
 			if (typeof value.content === "number") {
-				if (typeof filter.value !== "number") return false;
-				return value.content === filter.value;
+				if (typeof filter.value.content !== "number") return false;
+				return value.content === filter.value.content;
 			}
 			if (typeof value.content === "boolean") {
-				if (typeof filter.value !== "boolean") return false;
-				return value.content === filter.value;
+				if (typeof filter.value.content !== "boolean") return false;
+				return value.content === filter.value.content;
 			}
 			return false;
 		});
-		if (!isFound && includeNestedProperties) isFound = property.properties.some((property) => filterProperties(property, filter, { includeNestedProperties: true }));
+		if (!isFound && includeNestedProperties) isFound = property.properties.some((nestedProperty) => filterProperties(nestedProperty, filter, {
+			includeNestedProperties: true,
+			limitToLeafPropertyValues
+		}));
 		return isFound;
 	}
 	return false;
@@ -4042,7 +4142,7 @@ const TRAILING_SLASH_REGEX = /\/$/;
 * @returns Array of CSS styles
 */
 function parseCssStylesFromProperties(properties, cssVariant) {
-	const cssProperties = getPropertyByLabelAndValue(properties, "presentation", cssVariant != null ? `css-${cssVariant}` : "css")?.properties ?? [];
+	const cssProperties = getPropertyByLabelAndValueContent(properties, "presentation", cssVariant != null ? `css-${cssVariant}` : "css")?.properties ?? [];
 	const styles = [];
 	for (const property of cssProperties) {
 		const value = property.values[0]?.content?.toString();
@@ -4153,9 +4253,9 @@ function parseWebElementProperties(componentProperty, elementResource) {
 		case "3d-viewer": {
 			const resourceLink = links.find((link) => link.category === "resource" && link.fileFormat === "model/obj");
 			if (resourceLink?.uuid == null) throw new Error(`Resource link not found for the following component: “${componentName}”`);
-			let isInteractive = getPropertyValueByLabel(componentProperty.properties, "is-interactive");
+			let isInteractive = getPropertyValueContentByLabel(componentProperty.properties, "is-interactive");
 			isInteractive ??= true;
-			let isControlsDisplayed = getPropertyValueByLabel(componentProperty.properties, "controls-displayed");
+			let isControlsDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "controls-displayed");
 			isControlsDisplayed ??= true;
 			properties = {
 				component: "3d-viewer",
@@ -4190,13 +4290,13 @@ function parseWebElementProperties(componentProperty, elementResource) {
 		case "annotated-image": {
 			const imageLinks = links.filter((link) => link.type === "image" || link.type === "IIIF");
 			if (imageLinks.length === 0 || imageLinks[0].uuid == null) throw new Error(`Image link not found for the following component: “${componentName}”`);
-			let isFilterInputDisplayed = getPropertyValueByLabel(componentProperty.properties, "filter-input-displayed");
+			let isFilterInputDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "filter-input-displayed");
 			isFilterInputDisplayed ??= true;
-			let isOptionsDisplayed = getPropertyValueByLabel(componentProperty.properties, "options-displayed");
+			let isOptionsDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "options-displayed");
 			isOptionsDisplayed ??= true;
-			let isAnnotationHighlightsDisplayed = getPropertyValueByLabel(componentProperty.properties, "annotation-highlights-displayed");
+			let isAnnotationHighlightsDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "annotation-highlights-displayed");
 			isAnnotationHighlightsDisplayed ??= true;
-			let isAnnotationTooltipsDisplayed = getPropertyValueByLabel(componentProperty.properties, "annotation-tooltips-displayed");
+			let isAnnotationTooltipsDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "annotation-tooltips-displayed");
 			isAnnotationTooltipsDisplayed ??= true;
 			properties = {
 				component: "annotated-image",
@@ -4211,11 +4311,11 @@ function parseWebElementProperties(componentProperty, elementResource) {
 		case "audio-player": {
 			const audioLink = links.find((link) => link.type === "audio");
 			if (audioLink?.uuid == null) throw new Error(`Audio link not found for the following component: “${componentName}”`);
-			let isSpeedControlsDisplayed = getPropertyValueByLabel(componentProperty.properties, "speed-controls-displayed");
+			let isSpeedControlsDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "speed-controls-displayed");
 			isSpeedControlsDisplayed ??= true;
-			let isVolumeControlsDisplayed = getPropertyValueByLabel(componentProperty.properties, "volume-controls-displayed");
+			let isVolumeControlsDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "volume-controls-displayed");
 			isVolumeControlsDisplayed ??= true;
-			let isSeekBarDisplayed = getPropertyValueByLabel(componentProperty.properties, "seek-bar-displayed");
+			let isSeekBarDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "seek-bar-displayed");
 			isSeekBarDisplayed ??= true;
 			properties = {
 				component: "audio-player",
@@ -4230,9 +4330,9 @@ function parseWebElementProperties(componentProperty, elementResource) {
 			const itemLinks = links.filter((link) => link.category !== "bibliography");
 			const bibliographyLink = links.find((link) => link.category === "bibliography");
 			if (itemLinks.length === 0 && bibliographyLink?.bibliographies == null) throw new Error(`No links found for the following component: “${componentName}”`);
-			let layout = getPropertyValueByLabel(componentProperty.properties, "layout");
+			let layout = getPropertyValueContentByLabel(componentProperty.properties, "layout");
 			layout ??= "long";
-			let isSourceDocumentDisplayed = getPropertyValueByLabel(componentProperty.properties, "source-document-displayed");
+			let isSourceDocumentDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "source-document-displayed");
 			isSourceDocumentDisplayed ??= true;
 			properties = {
 				component: "bibliography",
@@ -4244,7 +4344,7 @@ function parseWebElementProperties(componentProperty, elementResource) {
 			break;
 		}
 		case "button": {
-			let variant = getPropertyValueByLabel(componentProperty.properties, "variant");
+			let variant = getPropertyValueContentByLabel(componentProperty.properties, "variant");
 			variant ??= "default";
 			let isExternal = false;
 			const navigateToProperty = getPropertyByLabel(componentProperty.properties, "navigate-to");
@@ -4255,9 +4355,9 @@ function parseWebElementProperties(componentProperty, elementResource) {
 				if (href === null) throw new Error(`Properties “navigate-to” or “link-to” not found for the following component: “${componentName}”`);
 				else isExternal = true;
 			}
-			let startIcon = getPropertyValueByLabel(componentProperty.properties, "start-icon");
+			let startIcon = getPropertyValueContentByLabel(componentProperty.properties, "start-icon");
 			startIcon ??= null;
-			let endIcon = getPropertyValueByLabel(componentProperty.properties, "end-icon");
+			let endIcon = getPropertyValueContentByLabel(componentProperty.properties, "end-icon");
 			endIcon ??= null;
 			let image = null;
 			const imageLink = links.find((link) => link.type === "image" || link.type === "IIIF");
@@ -4285,33 +4385,33 @@ function parseWebElementProperties(componentProperty, elementResource) {
 			const setLinks = links.filter((link) => link.category === "set");
 			if (setLinks.every((link) => link.uuid === null)) throw new Error(`Set links not found for the following component: “${componentName}”`);
 			const displayedProperties = getPropertyByLabel(componentProperty.properties, "use-property");
-			let variant = getPropertyValueByLabel(componentProperty.properties, "variant");
-			variant ??= "full";
-			let itemVariant = getPropertyValueByLabel(componentProperty.properties, "item-variant");
-			itemVariant ??= "detailed";
-			let paginationVariant = getPropertyValueByLabel(componentProperty.properties, "pagination-variant");
+			let variant = getPropertyValueContentByLabel(componentProperty.properties, "variant");
+			variant ??= "detailed";
+			let paginationVariant = getPropertyValueContentByLabel(componentProperty.properties, "pagination-variant");
 			paginationVariant ??= "default";
-			let imageQuality = getPropertyValueByLabel(componentProperty.properties, "image-quality");
+			let loadingVariant = getPropertyValueContentByLabel(componentProperty.properties, "loading-variant");
+			loadingVariant ??= "spinner";
+			let imageQuality = getPropertyValueContentByLabel(componentProperty.properties, "image-quality");
 			imageQuality ??= "low";
-			let isUsingQueryParams = getPropertyValueByLabel(componentProperty.properties, "is-using-query-params");
+			let isUsingQueryParams = getPropertyValueContentByLabel(componentProperty.properties, "is-using-query-params");
 			isUsingQueryParams ??= false;
-			let isFilterResultsBarDisplayed = getPropertyValueByLabel(componentProperty.properties, "filter-results-bar-displayed");
+			let isFilterResultsBarDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "filter-results-bar-displayed");
 			isFilterResultsBarDisplayed ??= false;
-			let isFilterMapDisplayed = getPropertyValueByLabel(componentProperty.properties, "filter-map-displayed");
+			let isFilterMapDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "filter-map-displayed");
 			isFilterMapDisplayed ??= false;
-			let isFilterInputDisplayed = getPropertyValueByLabel(componentProperty.properties, "filter-input-displayed");
+			let isFilterInputDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "filter-input-displayed");
 			isFilterInputDisplayed ??= false;
-			let isFilterLimitedToInputFilter = getPropertyValueByLabel(componentProperty.properties, "filter-limit-to-input-filter");
+			let isFilterLimitedToInputFilter = getPropertyValueContentByLabel(componentProperty.properties, "filter-limit-to-input-filter");
 			isFilterLimitedToInputFilter ??= false;
-			let isFilterLimitedToLeafPropertyValues = getPropertyValueByLabel(componentProperty.properties, "filter-limit-to-leaf-property-values");
+			let isFilterLimitedToLeafPropertyValues = getPropertyValueContentByLabel(componentProperty.properties, "filter-limit-to-leaf-property-values");
 			isFilterLimitedToLeafPropertyValues ??= false;
-			let isSortDisplayed = getPropertyValueByLabel(componentProperty.properties, "sort-displayed");
+			let isSortDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "sort-displayed");
 			isSortDisplayed ??= false;
-			let isFilterSidebarDisplayed = getPropertyValueByLabel(componentProperty.properties, "filter-sidebar-displayed");
+			let isFilterSidebarDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "filter-sidebar-displayed");
 			isFilterSidebarDisplayed ??= false;
-			let filterSidebarSort = getPropertyValueByLabel(componentProperty.properties, "filter-sidebar-sort");
+			let filterSidebarSort = getPropertyValueContentByLabel(componentProperty.properties, "filter-sidebar-sort");
 			filterSidebarSort ??= "default";
-			let layout = getPropertyValueByLabel(componentProperty.properties, "layout");
+			let layout = getPropertyValueContentByLabel(componentProperty.properties, "layout");
 			layout ??= "image-start";
 			const options = {
 				attributeFilters: {
@@ -4341,8 +4441,8 @@ function parseWebElementProperties(componentProperty, elementResource) {
 					label: value.content?.toString() ?? ""
 				})) ?? null,
 				variant,
-				itemVariant,
 				paginationVariant,
+				loadingVariant,
 				layout,
 				imageQuality,
 				isUsingQueryParams,
@@ -4361,8 +4461,8 @@ function parseWebElementProperties(componentProperty, elementResource) {
 			break;
 		}
 		case "empty-space": {
-			const height = getPropertyValueByLabel(componentProperty.properties, "height");
-			const width = getPropertyValueByLabel(componentProperty.properties, "width");
+			const height = getPropertyValueContentByLabel(componentProperty.properties, "height");
+			const width = getPropertyValueContentByLabel(componentProperty.properties, "width");
 			properties = {
 				component: "empty-space",
 				height: height?.toString() ?? null,
@@ -4373,9 +4473,9 @@ function parseWebElementProperties(componentProperty, elementResource) {
 		case "entries": {
 			const entriesLink = links.find((link) => link.category === "tree" || link.category === "set");
 			if (entriesLink?.uuid == null) throw new Error(`Entries link not found for the following component: “${componentName}”`);
-			let variant = getPropertyValueByLabel(componentProperty.properties, "variant");
+			let variant = getPropertyValueContentByLabel(componentProperty.properties, "variant");
 			variant ??= "entry";
-			let isFilterInputDisplayed = getPropertyValueByLabel(componentProperty.properties, "filter-input-displayed");
+			let isFilterInputDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "filter-input-displayed");
 			isFilterInputDisplayed ??= false;
 			properties = {
 				component: "entries",
@@ -4388,8 +4488,8 @@ function parseWebElementProperties(componentProperty, elementResource) {
 		case "iframe": {
 			const href = links.find((link) => link.type === "webpage")?.href;
 			if (!href) throw new Error(`URL not found for the following component: “${componentName}”`);
-			const height = getPropertyValueByLabel(componentProperty.properties, "height");
-			const width = getPropertyValueByLabel(componentProperty.properties, "width");
+			const height = getPropertyValueContentByLabel(componentProperty.properties, "height");
+			const width = getPropertyValueContentByLabel(componentProperty.properties, "width");
 			properties = {
 				component: "iframe",
 				href: transformPermanentIdentificationUrl(href),
@@ -4401,7 +4501,7 @@ function parseWebElementProperties(componentProperty, elementResource) {
 		case "iiif-viewer": {
 			const manifestLink = links.find((link) => link.type === "IIIF");
 			if (manifestLink?.uuid == null) throw new Error(`Manifest link not found for the following component: “${componentName}”`);
-			let variant = getPropertyValueByLabel(componentProperty.properties, "variant");
+			let variant = getPropertyValueContentByLabel(componentProperty.properties, "variant");
 			variant ??= "universal-viewer";
 			properties = {
 				component: "iiif-viewer",
@@ -4412,7 +4512,7 @@ function parseWebElementProperties(componentProperty, elementResource) {
 		}
 		case "image": {
 			if (links.length === 0) throw new Error(`No links found for the following component: “${componentName}”`);
-			let imageQuality = getPropertyValueByLabel(componentProperty.properties, "image-quality");
+			let imageQuality = getPropertyValueContentByLabel(componentProperty.properties, "image-quality");
 			imageQuality ??= "high";
 			const images = [];
 			for (const link of links) {
@@ -4426,40 +4526,40 @@ function parseWebElementProperties(componentProperty, elementResource) {
 					quality: imageQuality
 				});
 			}
-			let variant = getPropertyValueByLabel(componentProperty.properties, "variant");
+			let variant = getPropertyValueContentByLabel(componentProperty.properties, "variant");
 			variant ??= "default";
-			let captionLayout = getPropertyValueByLabel(componentProperty.properties, "layout-caption");
+			let captionLayout = getPropertyValueContentByLabel(componentProperty.properties, "layout-caption");
 			captionLayout ??= "bottom";
 			let width = null;
-			const widthProperty = getPropertyValueByLabel(componentProperty.properties, "width");
+			const widthProperty = getPropertyValueContentByLabel(componentProperty.properties, "width");
 			if (widthProperty !== null) {
 				if (typeof widthProperty === "number") width = widthProperty;
 				else if (typeof widthProperty === "string") width = Number.parseFloat(widthProperty);
 			}
 			let height = null;
-			const heightProperty = getPropertyValueByLabel(componentProperty.properties, "height");
+			const heightProperty = getPropertyValueContentByLabel(componentProperty.properties, "height");
 			if (heightProperty !== null) {
 				if (typeof heightProperty === "number") height = heightProperty;
 				else if (typeof heightProperty === "string") height = Number.parseFloat(heightProperty);
 			}
-			let isFullWidth = getPropertyValueByLabel(componentProperty.properties, "is-full-width");
+			let isFullWidth = getPropertyValueContentByLabel(componentProperty.properties, "is-full-width");
 			isFullWidth ??= true;
-			let isFullHeight = getPropertyValueByLabel(componentProperty.properties, "is-full-height");
+			let isFullHeight = getPropertyValueContentByLabel(componentProperty.properties, "is-full-height");
 			isFullHeight ??= true;
-			let captionSource = getPropertyValueByLabel(componentProperty.properties, "source-caption");
+			let captionSource = getPropertyValueContentByLabel(componentProperty.properties, "source-caption");
 			captionSource ??= "name";
-			let altTextSource = getPropertyValueByLabel(componentProperty.properties, "alt-text-source");
+			let altTextSource = getPropertyValueContentByLabel(componentProperty.properties, "alt-text-source");
 			altTextSource ??= "name";
-			let isTransparentBackground = getPropertyValueByLabel(componentProperty.properties, "is-transparent");
+			let isTransparentBackground = getPropertyValueContentByLabel(componentProperty.properties, "is-transparent");
 			isTransparentBackground ??= false;
-			let isCover = getPropertyValueByLabel(componentProperty.properties, "is-cover");
+			let isCover = getPropertyValueContentByLabel(componentProperty.properties, "is-cover");
 			isCover ??= false;
 			const variantProperty = getPropertyByLabel(componentProperty.properties, "variant");
 			let carouselOptions = null;
 			if (images.length > 1) {
 				let secondsPerImage = 5;
 				if (variantProperty?.values[0].content === "carousel") {
-					const secondsPerImageProperty = getPropertyValueByLabel(variantProperty.properties, "seconds-per-image");
+					const secondsPerImageProperty = getPropertyValueContentByLabel(variantProperty.properties, "seconds-per-image");
 					if (secondsPerImageProperty !== null) {
 						if (typeof secondsPerImageProperty === "number") secondsPerImage = secondsPerImageProperty;
 						else if (typeof secondsPerImageProperty === "string") secondsPerImage = Number.parseFloat(secondsPerImageProperty);
@@ -4469,9 +4569,9 @@ function parseWebElementProperties(componentProperty, elementResource) {
 			}
 			let heroOptions = null;
 			if (variantProperty?.values[0].content === "hero") {
-				let isBackgroundImageDisplayed = getPropertyValueByLabel(variantProperty.properties, "background-image-displayed");
+				let isBackgroundImageDisplayed = getPropertyValueContentByLabel(variantProperty.properties, "background-image-displayed");
 				isBackgroundImageDisplayed ??= true;
-				let isDocumentDisplayed = getPropertyValueByLabel(variantProperty.properties, "document-displayed");
+				let isDocumentDisplayed = getPropertyValueContentByLabel(variantProperty.properties, "document-displayed");
 				isDocumentDisplayed ??= true;
 				heroOptions = {
 					isBackgroundImageDisplayed,
@@ -4500,7 +4600,7 @@ function parseWebElementProperties(componentProperty, elementResource) {
 		case "image-gallery": {
 			const galleryLink = links.find((link) => link.category === "tree" || link.category === "set");
 			if (galleryLink?.uuid == null) throw new Error(`Image gallery link not found for the following component: “${componentName}”`);
-			let isFilterInputDisplayed = getPropertyValueByLabel(componentProperty.properties, "filter-input-displayed");
+			let isFilterInputDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "filter-input-displayed");
 			isFilterInputDisplayed ??= true;
 			properties = {
 				component: "image-gallery",
@@ -4512,23 +4612,23 @@ function parseWebElementProperties(componentProperty, elementResource) {
 		case "map": {
 			const mapLink = links.find((link) => link.category === "set" || link.category === "tree");
 			if (mapLink?.uuid == null) throw new Error(`Map link not found for the following component: “${componentName}”`);
-			let isInteractive = getPropertyValueByLabel(componentProperty.properties, "is-interactive");
+			let isInteractive = getPropertyValueContentByLabel(componentProperty.properties, "is-interactive");
 			isInteractive ??= true;
-			let isClustered = getPropertyValueByLabel(componentProperty.properties, "is-clustered");
+			let isClustered = getPropertyValueContentByLabel(componentProperty.properties, "is-clustered");
 			isClustered ??= false;
-			let isUsingPins = getPropertyValueByLabel(componentProperty.properties, "is-using-pins");
+			let isUsingPins = getPropertyValueContentByLabel(componentProperty.properties, "is-using-pins");
 			isUsingPins ??= false;
-			let customBasemap = getPropertyValueByLabel(componentProperty.properties, "custom-basemap");
+			let customBasemap = getPropertyValueContentByLabel(componentProperty.properties, "custom-basemap");
 			customBasemap ??= null;
 			let initialBounds = null;
-			const initialBoundsProperty = getPropertyValueByLabel(componentProperty.properties, "initial-bounds");
+			const initialBoundsProperty = getPropertyValueContentByLabel(componentProperty.properties, "initial-bounds");
 			if (initialBoundsProperty !== null) initialBounds = parseBounds(String(initialBoundsProperty));
 			let maximumBounds = null;
-			const maximumBoundsProperty = getPropertyValueByLabel(componentProperty.properties, "maximum-bounds");
+			const maximumBoundsProperty = getPropertyValueContentByLabel(componentProperty.properties, "maximum-bounds");
 			if (maximumBoundsProperty !== null) maximumBounds = parseBounds(String(maximumBoundsProperty));
-			let isControlsDisplayed = getPropertyValueByLabel(componentProperty.properties, "controls-displayed");
+			let isControlsDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "controls-displayed");
 			isControlsDisplayed ??= false;
-			let isFullHeight = getPropertyValueByLabel(componentProperty.properties, "is-full-height");
+			let isFullHeight = getPropertyValueContentByLabel(componentProperty.properties, "is-full-height");
 			isFullHeight ??= false;
 			properties = {
 				component: "map",
@@ -4551,7 +4651,7 @@ function parseWebElementProperties(componentProperty, elementResource) {
 			if (componentProperty.properties.length === 0) throw new Error(`Query properties not found for the following component: “${componentName}”`);
 			for (const queryItem of componentProperty.properties) {
 				const querySubProperties = queryItem.properties;
-				const label = getPropertyValueByLabel(querySubProperties, "query-prompt");
+				const label = getPropertyValueContentByLabel(querySubProperties, "query-prompt");
 				if (label === null) continue;
 				const queries = (getPropertyByLabel(querySubProperties, "use-property")?.values.filter((value) => value.uuid !== null) ?? []).map((propertyVariable) => {
 					if (propertyVariable.uuid === null) throw new Error(`Property variable UUID not found for the following component: “${componentName}”`);
@@ -4566,9 +4666,9 @@ function parseWebElementProperties(componentProperty, elementResource) {
 						language: "eng"
 					};
 				});
-				let startIcon = getPropertyValueByLabel(querySubProperties, "start-icon");
+				let startIcon = getPropertyValueContentByLabel(querySubProperties, "start-icon");
 				startIcon ??= null;
-				let endIcon = getPropertyValueByLabel(querySubProperties, "end-icon");
+				let endIcon = getPropertyValueContentByLabel(querySubProperties, "end-icon");
 				endIcon ??= null;
 				items.push({
 					label,
@@ -4599,11 +4699,11 @@ function parseWebElementProperties(componentProperty, elementResource) {
 				}
 			}
 			const displayedProperties = getPropertyByLabel(componentProperty.properties, "use-property");
-			let itemVariant = getPropertyValueByLabel(componentProperty.properties, "item-variant");
-			itemVariant ??= "detailed";
-			let paginationVariant = getPropertyValueByLabel(componentProperty.properties, "pagination-variant");
+			let variant = getPropertyValueContentByLabel(componentProperty.properties, "variant");
+			variant ??= "detailed";
+			let paginationVariant = getPropertyValueContentByLabel(componentProperty.properties, "pagination-variant");
 			paginationVariant ??= "default";
-			let layout = getPropertyValueByLabel(componentProperty.properties, "layout");
+			let layout = getPropertyValueContentByLabel(componentProperty.properties, "layout");
 			layout ??= "image-start";
 			properties = {
 				component: "query",
@@ -4614,7 +4714,7 @@ function parseWebElementProperties(componentProperty, elementResource) {
 					uuid: value.uuid,
 					label: value.content?.toString() ?? ""
 				})) ?? null,
-				itemVariant,
+				variant,
 				paginationVariant,
 				layout
 			};
@@ -4631,15 +4731,15 @@ function parseWebElementProperties(componentProperty, elementResource) {
 		}
 		case "search-bar": {
 			let queryVariant = null;
-			queryVariant = getPropertyValueByLabel(componentProperty.properties, "query-variant");
+			queryVariant = getPropertyValueContentByLabel(componentProperty.properties, "query-variant");
 			queryVariant ??= "submit";
 			const boundElementUuid = getPropertyByLabel(componentProperty.properties, "bound-element")?.values[0]?.uuid ?? null;
 			const linkToProperty = getPropertyByLabel(componentProperty.properties, "link-to");
 			const href = linkToProperty?.values[0]?.href != null ? transformPermanentIdentificationUrl(linkToProperty.values[0].href) : linkToProperty?.values[0]?.slug ?? null;
 			if (!boundElementUuid && !href) throw new Error(`Bound element or href not found for the following component: “${componentName}”`);
-			let placeholder = getPropertyValueByLabel(componentProperty.properties, "placeholder-text");
+			let placeholder = getPropertyValueContentByLabel(componentProperty.properties, "placeholder-text");
 			placeholder ??= null;
-			let baseFilterQueries = getPropertyValueByLabel(componentProperty.properties, "base-filter-queries");
+			let baseFilterQueries = getPropertyValueContentByLabel(componentProperty.properties, "base-filter-queries");
 			baseFilterQueries ??= null;
 			properties = {
 				component: "search-bar",
@@ -4660,7 +4760,7 @@ function parseWebElementProperties(componentProperty, elementResource) {
 			if (variantProperty !== null) {
 				variantName = variantProperty.values[0].content;
 				if (variantName === "paragraph" || variantName === "label" || variantName === "heading" || variantName === "display") {
-					let size = getPropertyValueByLabel(variantProperty.properties, "size");
+					let size = getPropertyValueContentByLabel(variantProperty.properties, "size");
 					size ??= "md";
 					variant = {
 						name: variantName,
@@ -4668,7 +4768,7 @@ function parseWebElementProperties(componentProperty, elementResource) {
 					};
 				} else variant = { name: variantName };
 			} else variant = { name: variantName };
-			let headingLevel = getPropertyValueByLabel(componentProperty.properties, "heading-level");
+			let headingLevel = getPropertyValueContentByLabel(componentProperty.properties, "heading-level");
 			headingLevel ??= null;
 			properties = {
 				component: "text",
@@ -4690,7 +4790,7 @@ function parseWebElementProperties(componentProperty, elementResource) {
 		case "video": {
 			const videoLink = links.find((link) => link.type === "video");
 			if (videoLink?.uuid == null) throw new Error(`Video link not found for the following component: “${componentName}”`);
-			let isChaptersDisplayed = getPropertyValueByLabel(componentProperty.properties, "chapters-displayed");
+			let isChaptersDisplayed = getPropertyValueContentByLabel(componentProperty.properties, "chapters-displayed");
 			isChaptersDisplayed ??= true;
 			properties = {
 				component: "video",
@@ -4718,14 +4818,14 @@ function parseWebTitle(properties, identification, overrides) {
 			isCountDisplayed: overrides?.isCountDisplayed ?? false
 		}
 	};
-	const titleProperties = getPropertyByLabelAndValue(properties, "presentation", "title")?.properties ?? [];
+	const titleProperties = getPropertyByLabelAndValueContent(properties, "presentation", "title")?.properties ?? [];
 	if (titleProperties.length > 0) {
-		title.variant = getPropertyValueByLabel(titleProperties, "variant") ?? "default";
-		title.properties.isNameDisplayed = getPropertyValueByLabel(titleProperties, "name-displayed") ?? false;
-		title.properties.isDescriptionDisplayed = getPropertyValueByLabel(titleProperties, "description-displayed") ?? false;
-		title.properties.isDateDisplayed = getPropertyValueByLabel(titleProperties, "date-displayed") ?? false;
-		title.properties.isCreatorsDisplayed = getPropertyValueByLabel(titleProperties, "creators-displayed") ?? false;
-		title.properties.isCountDisplayed = getPropertyValueByLabel(titleProperties, "count-displayed") ?? false;
+		title.variant = getPropertyValueContentByLabel(titleProperties, "variant") ?? "default";
+		title.properties.isNameDisplayed = getPropertyValueContentByLabel(titleProperties, "name-displayed") ?? false;
+		title.properties.isDescriptionDisplayed = getPropertyValueContentByLabel(titleProperties, "description-displayed") ?? false;
+		title.properties.isDateDisplayed = getPropertyValueContentByLabel(titleProperties, "date-displayed") ?? false;
+		title.properties.isCreatorsDisplayed = getPropertyValueContentByLabel(titleProperties, "creators-displayed") ?? false;
+		title.properties.isCountDisplayed = getPropertyValueContentByLabel(titleProperties, "count-displayed") ?? false;
 	}
 	return title;
 }
@@ -4746,7 +4846,7 @@ function parseWebElement(elementResource) {
 	const cssStyles = parseResponsiveCssStyles(elementProperties);
 	const title = parseWebTitle(elementProperties, identification, {
 		isNameDisplayed: properties.component === "annotated-image" || properties.component === "annotated-document" || properties.component === "collection",
-		isCountDisplayed: properties.component === "collection" && properties.variant === "full"
+		isCountDisplayed: properties.component === "collection"
 	});
 	return {
 		uuid: elementResource.uuid,
@@ -4766,7 +4866,7 @@ function parseWebElement(elementResource) {
 const parseWebpageResources = (webpageResources, type) => {
 	const returnElements = [];
 	for (const resource of webpageResources) {
-		if (getPropertyByLabelAndValue(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation", type) === null) continue;
+		if (getPropertyByLabelAndValueContent(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation", type) === null) continue;
 		switch (type) {
 			case "element": {
 				const element = parseWebElement(resource);
@@ -4795,7 +4895,7 @@ const parseWebpageResources = (webpageResources, type) => {
 */
 function parseWebpage(webpageResource, slugPrefix) {
 	const webpageProperties = webpageResource.properties ? parseProperties(ensureArray(webpageResource.properties.property)) : [];
-	if (webpageProperties.length === 0 || getPropertyValueByLabel(webpageProperties, "presentation") !== "page") return null;
+	if (webpageProperties.length === 0 || getPropertyValueContentByLabel(webpageProperties, "presentation") !== "page") return null;
 	const identification = parseIdentification(webpageResource.identification);
 	const slug = webpageResource.slug?.replace(SEGMENT_UNIQUE_SLUG_PREFIX_REGEX, "") ?? null;
 	if (slug == null) throw new Error(`Slug not found for page “${identification.label}”`);
@@ -4826,7 +4926,7 @@ function parseWebpage(webpageResource, slugPrefix) {
 	const webpageResources = webpageResource.resource != null ? ensureArray(webpageResource.resource) : [];
 	const items = [];
 	for (const resource of webpageResources) {
-		const resourceType = getPropertyValueByLabel(resource.properties != null ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
+		const resourceType = getPropertyValueContentByLabel(resource.properties != null ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
 		if (resourceType === null) continue;
 		switch (resourceType) {
 			case "segment": {
@@ -4848,14 +4948,14 @@ function parseWebpage(webpageResource, slugPrefix) {
 	}
 	returnWebpage.items = items;
 	returnWebpage.webpages = webpageResource.resource != null ? parseWebpageResources(ensureArray(webpageResource.resource), "page") : [];
-	const webpageSubProperties = getPropertyByLabelAndValue(webpageProperties, "presentation", "page")?.properties ?? [];
+	const webpageSubProperties = getPropertyByLabelAndValueContent(webpageProperties, "presentation", "page")?.properties ?? [];
 	if (webpageSubProperties.length > 0) {
-		returnWebpage.properties.isDisplayedInNavbar = getPropertyValueByLabel(webpageSubProperties, "displayed-in-navbar") ?? true;
-		returnWebpage.properties.width = getPropertyValueByLabel(webpageSubProperties, "width") ?? "default";
-		returnWebpage.properties.variant = getPropertyValueByLabel(webpageSubProperties, "variant") ?? "default";
-		returnWebpage.properties.isSidebarDisplayed = getPropertyValueByLabel(webpageSubProperties, "sidebar-displayed") ?? true;
-		returnWebpage.properties.isBreadcrumbsDisplayed = getPropertyValueByLabel(webpageSubProperties, "breadcrumbs-displayed") ?? false;
-		returnWebpage.properties.isNavbarSearchBarDisplayed = getPropertyValueByLabel(webpageSubProperties, "navbar-search-bar-displayed") ?? true;
+		returnWebpage.properties.isDisplayedInNavbar = getPropertyValueContentByLabel(webpageSubProperties, "displayed-in-navbar") ?? true;
+		returnWebpage.properties.width = getPropertyValueContentByLabel(webpageSubProperties, "width") ?? "default";
+		returnWebpage.properties.variant = getPropertyValueContentByLabel(webpageSubProperties, "variant") ?? "default";
+		returnWebpage.properties.isSidebarDisplayed = getPropertyValueContentByLabel(webpageSubProperties, "sidebar-displayed") ?? true;
+		returnWebpage.properties.isBreadcrumbsDisplayed = getPropertyValueContentByLabel(webpageSubProperties, "breadcrumbs-displayed") ?? false;
+		returnWebpage.properties.isNavbarSearchBarDisplayed = getPropertyValueContentByLabel(webpageSubProperties, "navbar-search-bar-displayed") ?? true;
 	}
 	if (imageLink?.uuid != null) returnWebpage.properties.backgroundImage = {
 		uuid: imageLink.uuid,
@@ -4890,7 +4990,7 @@ function parseWebpages(webpageResources, slugPrefix) {
 */
 function parseWebSegment(segmentResource, slugPrefix) {
 	const webpageProperties = segmentResource.properties ? parseProperties(ensureArray(segmentResource.properties.property)) : [];
-	if (webpageProperties.length === 0 || getPropertyValueByLabel(webpageProperties, "presentation") !== "segment") return null;
+	if (webpageProperties.length === 0 || getPropertyValueContentByLabel(webpageProperties, "presentation") !== "segment") return null;
 	const identification = parseIdentification(segmentResource.identification);
 	const slug = segmentResource.identification.abbreviation != null ? parseFakeStringOrContent(segmentResource.identification.abbreviation) : null;
 	if (slug == null) throw new Error(`Slug not found for segment “${identification.label}”`);
@@ -4927,7 +5027,7 @@ function parseSegments(segmentResources, slugPrefix) {
 */
 function parseWebSegmentItem(segmentItemResource, slugPrefix) {
 	const webpageProperties = segmentItemResource.properties ? parseProperties(ensureArray(segmentItemResource.properties.property)) : [];
-	if (webpageProperties.length === 0 || getPropertyValueByLabel(webpageProperties, "presentation") !== "segment-item") return null;
+	if (webpageProperties.length === 0 || getPropertyValueContentByLabel(webpageProperties, "presentation") !== "segment-item") return null;
 	const identification = parseIdentification(segmentItemResource.identification);
 	const slug = segmentItemResource.identification.abbreviation != null ? parseFakeStringOrContent(segmentItemResource.identification.abbreviation) : null;
 	if (slug == null) throw new Error(`Slug not found for segment item “${identification.label}”`);
@@ -4986,7 +5086,7 @@ function parseSidebar(resources) {
 	};
 	const sidebarResource = resources.find((resource) => {
 		const resourceProperties = resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [];
-		return getPropertyValueByLabel(resourceProperties, "presentation") === "element" && getPropertyValueByLabel(resourceProperties[0]?.properties ?? [], "component") === "sidebar";
+		return getPropertyValueContentByLabel(resourceProperties, "presentation") === "element" && getPropertyValueContentByLabel(resourceProperties[0]?.properties ?? [], "component") === "sidebar";
 	});
 	if (sidebarResource != null) {
 		title.label = parseFakeStringOrContent(sidebarResource.identification.label);
@@ -5002,17 +5102,17 @@ function parseSidebar(resources) {
 		cssStyles.mobile = parsedCssStyles.mobile;
 		const titleProperties = sidebarBaseProperties.find((property) => property.label === "presentation" && property.values[0].content === "title")?.properties;
 		if (titleProperties) {
-			const titleVariant = getPropertyValueByLabel(titleProperties, "variant");
+			const titleVariant = getPropertyValueContentByLabel(titleProperties, "variant");
 			if (titleVariant) title.variant = titleVariant;
-			title.properties.isNameDisplayed = getPropertyValueByLabel(titleProperties, "name-displayed") === true;
-			title.properties.isDescriptionDisplayed = getPropertyValueByLabel(titleProperties, "description-displayed") === true;
-			title.properties.isDateDisplayed = getPropertyValueByLabel(titleProperties, "date-displayed") === true;
-			title.properties.isCreatorsDisplayed = getPropertyValueByLabel(titleProperties, "creators-displayed") === true;
-			title.properties.isCountDisplayed = getPropertyValueByLabel(titleProperties, "count-displayed") === true;
+			title.properties.isNameDisplayed = getPropertyValueContentByLabel(titleProperties, "name-displayed") === true;
+			title.properties.isDescriptionDisplayed = getPropertyValueContentByLabel(titleProperties, "description-displayed") === true;
+			title.properties.isDateDisplayed = getPropertyValueContentByLabel(titleProperties, "date-displayed") === true;
+			title.properties.isCreatorsDisplayed = getPropertyValueContentByLabel(titleProperties, "creators-displayed") === true;
+			title.properties.isCountDisplayed = getPropertyValueContentByLabel(titleProperties, "count-displayed") === true;
 		}
 		const sidebarResources = sidebarResource.resource ? ensureArray(sidebarResource.resource) : [];
 		for (const resource of sidebarResources) {
-			const resourceType = getPropertyValueByLabel(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
+			const resourceType = getPropertyValueContentByLabel(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
 			if (resourceType === null) continue;
 			switch (resourceType) {
 				case "element": {
@@ -5049,7 +5149,7 @@ function parseWebElementForAccordion(elementResource) {
 	const childResources = elementResource.resource ? ensureArray(elementResource.resource) : [];
 	const items = [];
 	for (const resource of childResources) {
-		const resourceType = getPropertyValueByLabel(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
+		const resourceType = getPropertyValueContentByLabel(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
 		if (resourceType === null) continue;
 		switch (resourceType) {
 			case "element": {
@@ -5098,33 +5198,33 @@ function parseWebBlock(blockResource) {
 			mobile: []
 		}
 	};
-	const blockMainProperties = getPropertyByLabelAndValue(blockProperties, "presentation", "block")?.properties ?? [];
+	const blockMainProperties = getPropertyByLabelAndValueContent(blockProperties, "presentation", "block")?.properties ?? [];
 	if (blockMainProperties.length > 0) {
-		returnBlock.properties.default.layout = getPropertyValueByLabel(blockMainProperties, "layout") ?? "vertical";
-		returnBlock.properties.default.wrap = getPropertyValueByLabel(blockMainProperties, "wrap") ?? "nowrap";
+		returnBlock.properties.default.layout = getPropertyValueContentByLabel(blockMainProperties, "layout") ?? "vertical";
+		returnBlock.properties.default.wrap = getPropertyValueContentByLabel(blockMainProperties, "wrap") ?? "nowrap";
 		if (returnBlock.properties.default.layout === "accordion") {
-			returnBlock.properties.default.isAccordionEnabled = getPropertyValueByLabel(blockMainProperties, "accordion-enabled") ?? true;
-			returnBlock.properties.default.isAccordionExpandedByDefault = getPropertyValueByLabel(blockMainProperties, "accordion-expanded") ?? true;
-			returnBlock.properties.default.isAccordionSidebarDisplayed = getPropertyValueByLabel(blockMainProperties, "accordion-sidebar-displayed") ?? false;
+			returnBlock.properties.default.isAccordionEnabled = getPropertyValueContentByLabel(blockMainProperties, "accordion-enabled") ?? true;
+			returnBlock.properties.default.isAccordionExpandedByDefault = getPropertyValueContentByLabel(blockMainProperties, "accordion-expanded") ?? true;
+			returnBlock.properties.default.isAccordionSidebarDisplayed = getPropertyValueContentByLabel(blockMainProperties, "accordion-sidebar-displayed") ?? false;
 		}
-		returnBlock.properties.default.spacing = getPropertyValueByLabel(blockMainProperties, "spacing") ?? null;
-		returnBlock.properties.default.gap = getPropertyValueByLabel(blockMainProperties, "gap") ?? null;
+		returnBlock.properties.default.spacing = getPropertyValueContentByLabel(blockMainProperties, "spacing") ?? null;
+		returnBlock.properties.default.gap = getPropertyValueContentByLabel(blockMainProperties, "gap") ?? null;
 		const tabletOverwriteProperty = getPropertyByLabel(blockMainProperties, "overwrite-tablet");
 		if (tabletOverwriteProperty !== null) {
 			const tabletOverwriteProperties = tabletOverwriteProperty.properties;
 			const propertiesTablet = {
-				layout: getPropertyValueByLabel(tabletOverwriteProperties, "layout") ?? void 0,
-				wrap: getPropertyValueByLabel(tabletOverwriteProperties, "wrap") ?? void 0,
-				spacing: getPropertyValueByLabel(tabletOverwriteProperties, "spacing") ?? void 0,
-				gap: getPropertyValueByLabel(tabletOverwriteProperties, "gap") ?? void 0,
+				layout: getPropertyValueContentByLabel(tabletOverwriteProperties, "layout") ?? void 0,
+				wrap: getPropertyValueContentByLabel(tabletOverwriteProperties, "wrap") ?? void 0,
+				spacing: getPropertyValueContentByLabel(tabletOverwriteProperties, "spacing") ?? void 0,
+				gap: getPropertyValueContentByLabel(tabletOverwriteProperties, "gap") ?? void 0,
 				isAccordionEnabled: void 0,
 				isAccordionExpandedByDefault: void 0,
 				isAccordionSidebarDisplayed: void 0
 			};
 			if (propertiesTablet.layout === "accordion" || returnBlock.properties.default.layout === "accordion") {
-				propertiesTablet.isAccordionEnabled = getPropertyValueByLabel(tabletOverwriteProperties, "accordion-enabled") ?? void 0;
-				propertiesTablet.isAccordionExpandedByDefault = getPropertyValueByLabel(tabletOverwriteProperties, "accordion-expanded") ?? void 0;
-				propertiesTablet.isAccordionSidebarDisplayed = getPropertyValueByLabel(tabletOverwriteProperties, "accordion-sidebar-displayed") ?? void 0;
+				propertiesTablet.isAccordionEnabled = getPropertyValueContentByLabel(tabletOverwriteProperties, "accordion-enabled") ?? void 0;
+				propertiesTablet.isAccordionExpandedByDefault = getPropertyValueContentByLabel(tabletOverwriteProperties, "accordion-expanded") ?? void 0;
+				propertiesTablet.isAccordionSidebarDisplayed = getPropertyValueContentByLabel(tabletOverwriteProperties, "accordion-sidebar-displayed") ?? void 0;
 			}
 			const cleanedPropertiesTablet = cleanObject(propertiesTablet);
 			if (Object.keys(cleanedPropertiesTablet).length > 0) returnBlock.properties.tablet = cleanedPropertiesTablet;
@@ -5133,18 +5233,18 @@ function parseWebBlock(blockResource) {
 		if (mobileOverwriteProperty !== null) {
 			const mobileOverwriteProperties = mobileOverwriteProperty.properties;
 			const propertiesMobile = {
-				layout: getPropertyValueByLabel(mobileOverwriteProperties, "layout") ?? void 0,
-				wrap: getPropertyValueByLabel(mobileOverwriteProperties, "wrap") ?? void 0,
-				spacing: getPropertyValueByLabel(mobileOverwriteProperties, "spacing") ?? void 0,
-				gap: getPropertyValueByLabel(mobileOverwriteProperties, "gap") ?? void 0,
+				layout: getPropertyValueContentByLabel(mobileOverwriteProperties, "layout") ?? void 0,
+				wrap: getPropertyValueContentByLabel(mobileOverwriteProperties, "wrap") ?? void 0,
+				spacing: getPropertyValueContentByLabel(mobileOverwriteProperties, "spacing") ?? void 0,
+				gap: getPropertyValueContentByLabel(mobileOverwriteProperties, "gap") ?? void 0,
 				isAccordionEnabled: void 0,
 				isAccordionExpandedByDefault: void 0,
 				isAccordionSidebarDisplayed: void 0
 			};
 			if (propertiesMobile.layout === "accordion" || returnBlock.properties.default.layout === "accordion") {
-				propertiesMobile.isAccordionEnabled = getPropertyValueByLabel(mobileOverwriteProperties, "accordion-enabled") ?? void 0;
-				propertiesMobile.isAccordionExpandedByDefault = getPropertyValueByLabel(mobileOverwriteProperties, "accordion-expanded") ?? void 0;
-				propertiesMobile.isAccordionSidebarDisplayed = getPropertyValueByLabel(mobileOverwriteProperties, "accordion-sidebar-displayed") ?? void 0;
+				propertiesMobile.isAccordionEnabled = getPropertyValueContentByLabel(mobileOverwriteProperties, "accordion-enabled") ?? void 0;
+				propertiesMobile.isAccordionExpandedByDefault = getPropertyValueContentByLabel(mobileOverwriteProperties, "accordion-expanded") ?? void 0;
+				propertiesMobile.isAccordionSidebarDisplayed = getPropertyValueContentByLabel(mobileOverwriteProperties, "accordion-sidebar-displayed") ?? void 0;
 			}
 			const cleanedPropertiesMobile = cleanObject(propertiesMobile);
 			if (Object.keys(cleanedPropertiesMobile).length > 0) returnBlock.properties.mobile = cleanedPropertiesMobile;
@@ -5155,9 +5255,9 @@ function parseWebBlock(blockResource) {
 		const accordionItems = [];
 		for (const resource of blockResources) {
 			const resourceProperties = resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [];
-			const resourceType = getPropertyValueByLabel(resourceProperties, "presentation");
+			const resourceType = getPropertyValueContentByLabel(resourceProperties, "presentation");
 			if (resourceType !== "element") throw new Error(`Accordion only accepts elements, but got “${resourceType}” for the following resource: “${parseStringContent(resource.identification.label)}”`);
-			const componentType = getPropertyValueByLabel(getPropertyByLabel(resourceProperties, "presentation")?.properties ?? [], "component");
+			const componentType = getPropertyValueContentByLabel(getPropertyByLabel(resourceProperties, "presentation")?.properties ?? [], "component");
 			if (componentType !== "text") throw new Error(`Accordion only accepts text components, but got “${componentType}” for the following resource: “${parseStringContent(resource.identification.label)}”`);
 			const element = parseWebElementForAccordion(resource);
 			accordionItems.push(element);
@@ -5166,7 +5266,7 @@ function parseWebBlock(blockResource) {
 	} else {
 		const blockItems = [];
 		for (const resource of blockResources) {
-			const resourceType = getPropertyValueByLabel(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
+			const resourceType = getPropertyValueContentByLabel(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
 			if (resourceType === null) continue;
 			switch (resourceType) {
 				case "element": {
@@ -5194,11 +5294,11 @@ function parseWebBlock(blockResource) {
 */
 function parseWebsiteProperties(properties, websiteTree, sidebar) {
 	const websiteProperties = getPropertyByLabel(parseProperties(properties), "presentation")?.properties ?? [];
-	let type = getPropertyValueByLabel(websiteProperties, "webUI");
+	let type = getPropertyValueContentByLabel(websiteProperties, "webUI");
 	type ??= "traditional";
-	let status = getPropertyValueByLabel(websiteProperties, "status");
+	let status = getPropertyValueContentByLabel(websiteProperties, "status");
 	status ??= "development";
-	let privacy = getPropertyValueByLabel(websiteProperties, "privacy");
+	let privacy = getPropertyValueContentByLabel(websiteProperties, "privacy");
 	privacy ??= "public";
 	const returnProperties = {
 		type,
@@ -5256,30 +5356,30 @@ function parseWebsiteProperties(properties, websiteTree, sidebar) {
 		};
 		else throw new Error(`Contact property must be in the format “name;email”, but got “${contactProperty.values[0]?.content}”`);
 	}
-	returnProperties.theme.isThemeToggleDisplayed = getPropertyValueByLabel(websiteProperties, "supports-theme-toggle") ?? true;
-	returnProperties.theme.defaultTheme = getPropertyValueByLabel(websiteProperties, "default-theme") ?? "system";
+	returnProperties.theme.isThemeToggleDisplayed = getPropertyValueContentByLabel(websiteProperties, "supports-theme-toggle") ?? true;
+	returnProperties.theme.defaultTheme = getPropertyValueContentByLabel(websiteProperties, "default-theme") ?? "system";
 	returnProperties.icon.logoUuid = getPropertyByLabel(websiteProperties, "navbar-logo")?.values[0]?.uuid ?? null;
 	returnProperties.icon.faviconUuid = getPropertyByLabel(websiteProperties, "favicon-ico")?.values[0]?.uuid ?? null;
 	returnProperties.icon.appleTouchIconUuid = getPropertyByLabel(websiteProperties, "favicon-img")?.values[0]?.uuid ?? null;
-	returnProperties.navbar.isDisplayed = getPropertyValueByLabel(websiteProperties, "navbar-displayed") ?? true;
-	returnProperties.navbar.variant = getPropertyValueByLabel(websiteProperties, "navbar-variant") ?? "default";
-	returnProperties.navbar.alignment = getPropertyValueByLabel(websiteProperties, "navbar-alignment") ?? "start";
-	returnProperties.navbar.isProjectDisplayed = getPropertyValueByLabel(websiteProperties, "navbar-project-displayed") ?? true;
+	returnProperties.navbar.isDisplayed = getPropertyValueContentByLabel(websiteProperties, "navbar-displayed") ?? true;
+	returnProperties.navbar.variant = getPropertyValueContentByLabel(websiteProperties, "navbar-variant") ?? "default";
+	returnProperties.navbar.alignment = getPropertyValueContentByLabel(websiteProperties, "navbar-alignment") ?? "start";
+	returnProperties.navbar.isProjectDisplayed = getPropertyValueContentByLabel(websiteProperties, "navbar-project-displayed") ?? true;
 	returnProperties.navbar.searchBarBoundElementUuid = getPropertyByLabel(websiteProperties, "bound-element-navbar-search-bar")?.values[0]?.uuid ?? null;
-	returnProperties.footer.isDisplayed = getPropertyValueByLabel(websiteProperties, "footer-displayed") ?? true;
+	returnProperties.footer.isDisplayed = getPropertyValueContentByLabel(websiteProperties, "footer-displayed") ?? true;
 	returnProperties.footer.logoUuid = getPropertyByLabel(websiteProperties, "footer-logo")?.values[0]?.uuid ?? null;
-	const itemPageTypeProperty = getPropertyByLabelAndValue(websiteProperties, "page-type", "item-page");
+	const itemPageTypeProperty = getPropertyByLabelAndValueContent(websiteProperties, "page-type", "item-page");
 	if (itemPageTypeProperty !== null) {
-		returnProperties.itemPage.isMainContentDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-main-content-displayed") ?? true;
-		returnProperties.itemPage.isDescriptionDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-description-displayed") ?? true;
-		returnProperties.itemPage.isDocumentDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-document-displayed") ?? true;
-		returnProperties.itemPage.isNotesDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-notes-displayed") ?? true;
-		returnProperties.itemPage.isEventsDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-events-displayed") ?? true;
-		returnProperties.itemPage.isPeriodsDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-periods-displayed") ?? true;
-		returnProperties.itemPage.isPropertiesDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-properties-displayed") ?? true;
-		returnProperties.itemPage.isBibliographyDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-bibliography-displayed") ?? true;
-		returnProperties.itemPage.isPropertyValuesGrouped = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-property-values-grouped") ?? true;
-		returnProperties.itemPage.iiifViewer = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-iiif-viewer") ?? "universal-viewer";
+		returnProperties.itemPage.isMainContentDisplayed = getPropertyValueContentByLabel(itemPageTypeProperty.properties, "item-page-main-content-displayed") ?? true;
+		returnProperties.itemPage.isDescriptionDisplayed = getPropertyValueContentByLabel(itemPageTypeProperty.properties, "item-page-description-displayed") ?? true;
+		returnProperties.itemPage.isDocumentDisplayed = getPropertyValueContentByLabel(itemPageTypeProperty.properties, "item-page-document-displayed") ?? true;
+		returnProperties.itemPage.isNotesDisplayed = getPropertyValueContentByLabel(itemPageTypeProperty.properties, "item-page-notes-displayed") ?? true;
+		returnProperties.itemPage.isEventsDisplayed = getPropertyValueContentByLabel(itemPageTypeProperty.properties, "item-page-events-displayed") ?? true;
+		returnProperties.itemPage.isPeriodsDisplayed = getPropertyValueContentByLabel(itemPageTypeProperty.properties, "item-page-periods-displayed") ?? true;
+		returnProperties.itemPage.isPropertiesDisplayed = getPropertyValueContentByLabel(itemPageTypeProperty.properties, "item-page-properties-displayed") ?? true;
+		returnProperties.itemPage.isBibliographyDisplayed = getPropertyValueContentByLabel(itemPageTypeProperty.properties, "item-page-bibliography-displayed") ?? true;
+		returnProperties.itemPage.isPropertyValuesGrouped = getPropertyValueContentByLabel(itemPageTypeProperty.properties, "item-page-property-values-grouped") ?? true;
+		returnProperties.itemPage.iiifViewer = getPropertyValueContentByLabel(itemPageTypeProperty.properties, "item-page-iiif-viewer") ?? "universal-viewer";
 	}
 	if ("options" in websiteTree && websiteTree.options) {
 		returnProperties.options.scopes = websiteTree.options.scopes != null ? ensureArray(websiteTree.options.scopes.scope).map((scope) => ({
@@ -5420,4 +5520,4 @@ async function fetchWebsite(abbreviation, options) {
 	}
 }
 //#endregion
-export { DEFAULT_API_VERSION, DEFAULT_PAGE_SIZE, fetchGallery, fetchItem, fetchSetItems, fetchSetPropertyValues, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByLabelAndValue, getPropertyByLabelAndValues, getPropertyByUuid, getPropertyValueByLabel, getPropertyValueByUuid, getPropertyValuesByLabel, getPropertyValuesByUuid, getUniqueProperties, getUniquePropertyLabels };
+export { DEFAULT_API_VERSION, DEFAULT_PAGE_SIZE, fetchGallery, fetchItem, fetchSetItems, fetchSetPropertyValues, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByLabelAndValue, getPropertyByLabelAndValueContent, getPropertyByLabelAndValueContents, getPropertyByLabelAndValues, getPropertyByUuid, getPropertyValueByLabel, getPropertyValueByUuid, getPropertyValueContentByLabel, getPropertyValueContentByUuid, getPropertyValueContentsByUuid, getPropertyValuesByLabel, getPropertyValuesByUuid, getUniqueProperties, getUniquePropertyLabels };