diff --git a/components/PageGensetModel.qml b/components/PageGensetModel.qml
index 501e4ac0e..e1a84f509 100644
--- a/components/PageGensetModel.qml
+++ b/components/PageGensetModel.qml
@@ -6,7 +6,7 @@
 import QtQuick
 import Victron.VenusOS
 
-ObjectModel {
+AllowedItemModel {
 	id: root
 
 	property string bindPrefix
@@ -226,7 +226,7 @@ ObjectModel {
 
 			Page {
 				GradientListView {
-					model: ObjectModel {
+					model: AllowedItemModel {
 						ListQuantity {
 							//% "Speed"
 							text: qsTrId("ac-in-genset_speed")
@@ -345,7 +345,7 @@ ObjectModel {
 
 			Page {
 				GradientListView {
-					model: ObjectModel {
+					model: AllowedItemModel {
 						ListSpinBox {
 							//% "Charge voltage"
 							text: qsTrId("genset_charge_voltage")
diff --git a/components/listitems/ListChargeSchedule.qml b/components/listitems/ListChargeSchedule.qml
index 21491efac..21c5a016d 100644
--- a/components/listitems/ListChargeSchedule.qml
+++ b/components/listitems/ListChargeSchedule.qml
@@ -108,7 +108,7 @@ ListNavigation {
 			id: scheduledOptionsPage
 
 			GradientListView {
-				model: ObjectModel {
+				model: AllowedItemModel {
 					ListSwitch {
 						id: itemEnabled
 
diff --git a/pages/ControlCardsPage.qml b/pages/ControlCardsPage.qml
index d588e9509..46c55f8a5 100644
--- a/pages/ControlCardsPage.qml
+++ b/pages/ControlCardsPage.qml
@@ -36,7 +36,7 @@ Page {
 		maximumFlickVelocity: Theme.geometry_flickable_maximumFlickVelocity
 		flickDeceleration: Theme.geometry_flickable_flickDeceleration
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			Loader {
 				active: systemType.value === "ESS" || systemType.value === "Hub-4"
 				width: active ? root.cardWidth : -cardsView.spacing
diff --git a/pages/NotificationLayer.qml b/pages/NotificationLayer.qml
index a0b1aba30..523962922 100644
--- a/pages/NotificationLayer.qml
+++ b/pages/NotificationLayer.qml
@@ -43,7 +43,7 @@ Item {
 		spacing: Theme.geometry_toastNotification_bottomMargin
 		layoutDirection: Qt.RightToLeft     // layout from bottom to top
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			id: toastItemsModel
 		}
 	}
diff --git a/pages/SettingsPage.qml b/pages/SettingsPage.qml
index 65be38cd7..381433bec 100644
--- a/pages/SettingsPage.qml
+++ b/pages/SettingsPage.qml
@@ -24,7 +24,7 @@ SwipeViewPage {
 		id: settingsListView
 
 		clip: true
-		model: ObjectModel {
+		model: AllowedItemModel {
 			SettingsListNavigation {
 				text: CommonWords.devices
 				//% "All connected devices"
diff --git a/pages/evcs/EvChargerPage.qml b/pages/evcs/EvChargerPage.qml
index 68b34921e..a37b6b1c8 100644
--- a/pages/evcs/EvChargerPage.qml
+++ b/pages/evcs/EvChargerPage.qml
@@ -16,7 +16,7 @@ Page {
 	title: evCharger.name
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListItemBackground {
 				height: phaseTable.y + phaseTable.height
 
diff --git a/pages/evcs/EvChargerSetupPage.qml b/pages/evcs/EvChargerSetupPage.qml
index f74925fe4..279cedaa8 100644
--- a/pages/evcs/EvChargerSetupPage.qml
+++ b/pages/evcs/EvChargerSetupPage.qml
@@ -13,7 +13,7 @@ Page {
 	required property string bindPrefix
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListEvChargerPositionRadioButtonGroup {
 				dataItem.uid: root.bindPrefix + "/Position"
 			}
diff --git a/pages/invertercharger/OverviewInverterChargerPage.qml b/pages/invertercharger/OverviewInverterChargerPage.qml
index d5ed6731a..6b0945271 100644
--- a/pages/invertercharger/OverviewInverterChargerPage.qml
+++ b/pages/invertercharger/OverviewInverterChargerPage.qml
@@ -50,7 +50,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListItem {
 				id: modeListButton
 
diff --git a/pages/settings/GeneratorCondition.qml b/pages/settings/GeneratorCondition.qml
index 8803ba450..cdb3a6c0e 100644
--- a/pages/settings/GeneratorCondition.qml
+++ b/pages/settings/GeneratorCondition.qml
@@ -56,7 +56,7 @@ ListNavigation {
 
 			GradientListView {
 
-				model: ObjectModel {
+				model: AllowedItemModel {
 
 					ListSwitch {
 						text: root.enableDescription
diff --git a/pages/settings/PageCanbusStatus.qml b/pages/settings/PageCanbusStatus.qml
index b3b9351db..6c913386b 100644
--- a/pages/settings/PageCanbusStatus.qml
+++ b/pages/settings/PageCanbusStatus.qml
@@ -93,7 +93,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListTextGroup {
 				id: stateGroup
 
diff --git a/pages/settings/PageDeviceInfo.qml b/pages/settings/PageDeviceInfo.qml
index 2c2a0410b..d881ba585 100644
--- a/pages/settings/PageDeviceInfo.qml
+++ b/pages/settings/PageDeviceInfo.qml
@@ -16,7 +16,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListText {
 				//% "Connection"
 				text: qsTrId("settings_deviceinfo_connection")
diff --git a/pages/settings/PageGenerator.qml b/pages/settings/PageGenerator.qml
index 5f7bdd63a..ee428b23e 100644
--- a/pages/settings/PageGenerator.qml
+++ b/pages/settings/PageGenerator.qml
@@ -45,7 +45,7 @@ Page {
 		}
 	}
 
-	ObjectModel {
+	AllowedItemModel {
 		id: startStopModel
 
 		ListSwitch {
diff --git a/pages/settings/PageGeneratorAcLoad.qml b/pages/settings/PageGeneratorAcLoad.qml
index 44d6ce9ab..2c52782d4 100644
--- a/pages/settings/PageGeneratorAcLoad.qml
+++ b/pages/settings/PageGeneratorAcLoad.qml
@@ -30,7 +30,7 @@ Page {
 
 	GradientListView {
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListSwitch {
 				id: enableSwitch
diff --git a/pages/settings/PageGeneratorConditions.qml b/pages/settings/PageGeneratorConditions.qml
index e970faf2a..10f8bc3b8 100644
--- a/pages/settings/PageGeneratorConditions.qml
+++ b/pages/settings/PageGeneratorConditions.qml
@@ -33,7 +33,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListRadioButtonGroup {
 				id: monitorService
diff --git a/pages/settings/PageGeneratorRuntimeService.qml b/pages/settings/PageGeneratorRuntimeService.qml
index 07d6eb495..c76d20670 100644
--- a/pages/settings/PageGeneratorRuntimeService.qml
+++ b/pages/settings/PageGeneratorRuntimeService.qml
@@ -41,7 +41,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListText {
 				//% "Total run time"
diff --git a/pages/settings/PageGeneratorTestRun.qml b/pages/settings/PageGeneratorTestRun.qml
index aa88641b8..cd3cda722 100644
--- a/pages/settings/PageGeneratorTestRun.qml
+++ b/pages/settings/PageGeneratorTestRun.qml
@@ -11,7 +11,7 @@ Page {
 
 	GradientListView {
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListSwitch {
 				id: enableSwitch
diff --git a/pages/settings/PageGps.qml b/pages/settings/PageGps.qml
index e3f35700c..c2fcf685d 100644
--- a/pages/settings/PageGps.qml
+++ b/pages/settings/PageGps.qml
@@ -35,7 +35,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListText {
 				text: CommonWords.status
 				secondaryText: {
diff --git a/pages/settings/PageHub4Debug.qml b/pages/settings/PageHub4Debug.qml
index ecef95e1b..e7904739b 100644
--- a/pages/settings/PageHub4Debug.qml
+++ b/pages/settings/PageHub4Debug.qml
@@ -20,7 +20,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSpinBox {
 				id: gridSetpoint
 
diff --git a/pages/settings/PageRelayGenerator.qml b/pages/settings/PageRelayGenerator.qml
index ad4b351c6..98eb51b2d 100644
--- a/pages/settings/PageRelayGenerator.qml
+++ b/pages/settings/PageRelayGenerator.qml
@@ -16,7 +16,7 @@ PageGenerator {
 
 	model: !relayFunction.isValid || relayFunction.value === 1 ? startStopModel : disabledModel
 
-	ObjectModel {
+	AllowedItemModel {
 		id: disabledModel
 
 		ListItem {
diff --git a/pages/settings/PageSettingsAcSystem.qml b/pages/settings/PageSettingsAcSystem.qml
index eb37742bf..1bc166e0c 100644
--- a/pages/settings/PageSettingsAcSystem.qml
+++ b/pages/settings/PageSettingsAcSystem.qml
@@ -34,7 +34,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				id: acInput1
 
diff --git a/pages/settings/PageSettingsAccessAndSecurity.qml b/pages/settings/PageSettingsAccessAndSecurity.qml
index 28b6aae47..7e2c38e39 100644
--- a/pages/settings/PageSettingsAccessAndSecurity.qml
+++ b/pages/settings/PageSettingsAccessAndSecurity.qml
@@ -67,7 +67,7 @@ Page {
 		id: settingsListView
 
 		boundsBehavior: Flickable.DragOverBounds
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				//% "Access level"
 				text: qsTrId("settings_access_level")
diff --git a/pages/settings/PageSettingsAlarmsAndFeedback.qml b/pages/settings/PageSettingsAlarmsAndFeedback.qml
index 4ec700fe7..420c05e15 100644
--- a/pages/settings/PageSettingsAlarmsAndFeedback.qml
+++ b/pages/settings/PageSettingsAlarmsAndFeedback.qml
@@ -12,7 +12,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSwitch {
 				//% "Audible alarm"
 				text: qsTrId("settings_audible_alarm")
diff --git a/pages/settings/PageSettingsBatteries.qml b/pages/settings/PageSettingsBatteries.qml
index fad638b8e..0d74107a1 100644
--- a/pages/settings/PageSettingsBatteries.qml
+++ b/pages/settings/PageSettingsBatteries.qml
@@ -14,7 +14,7 @@ Page {
 	title: CommonWords.batteries
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				id: batteryMonitorRadioButtons
 
diff --git a/pages/settings/PageSettingsBatteryMeasurements.qml b/pages/settings/PageSettingsBatteryMeasurements.qml
index 9ca86764c..e5624aa52 100644
--- a/pages/settings/PageSettingsBatteryMeasurements.qml
+++ b/pages/settings/PageSettingsBatteryMeasurements.qml
@@ -81,7 +81,7 @@ Page {
 
 				Page {
 					GradientListView {
-						model: ObjectModel {
+						model: AllowedItemModel {
 							ListText {
 								text: root._visibleText
 								//% "Active battery monitor"
diff --git a/pages/settings/PageSettingsBleSensors.qml b/pages/settings/PageSettingsBleSensors.qml
index dd86c0060..3d69b23e3 100644
--- a/pages/settings/PageSettingsBleSensors.qml
+++ b/pages/settings/PageSettingsBleSensors.qml
@@ -33,7 +33,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSwitch {
 				id: enable
 				text: CommonWords.enable
diff --git a/pages/settings/PageSettingsBluetooth.qml b/pages/settings/PageSettingsBluetooth.qml
index 3cbc4f093..1ca20d11e 100644
--- a/pages/settings/PageSettingsBluetooth.qml
+++ b/pages/settings/PageSettingsBluetooth.qml
@@ -11,7 +11,7 @@ Page {
 
 	GradientListView {
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListSwitch {
 				id: bluetoothEnabled
diff --git a/pages/settings/PageSettingsCGwacs.qml b/pages/settings/PageSettingsCGwacs.qml
index f58ffaef9..ffc193621 100644
--- a/pages/settings/PageSettingsCGwacs.qml
+++ b/pages/settings/PageSettingsCGwacs.qml
@@ -29,7 +29,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				text: CommonWords.ac_input_role
 				optionModel: Global.acInputs.roles.map(function(role) {
diff --git a/pages/settings/PageSettingsCanbus.qml b/pages/settings/PageSettingsCanbus.qml
index f3aed8869..55798fb52 100644
--- a/pages/settings/PageSettingsCanbus.qml
+++ b/pages/settings/PageSettingsCanbus.qml
@@ -35,7 +35,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				//% "CAN-bus profile"
 				text: qsTrId("settings_canbus_profile")
diff --git a/pages/settings/PageSettingsConnectivity.qml b/pages/settings/PageSettingsConnectivity.qml
index b4dd24277..035296894 100644
--- a/pages/settings/PageSettingsConnectivity.qml
+++ b/pages/settings/PageSettingsConnectivity.qml
@@ -12,7 +12,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListNavigation {
 				//% "Ethernet"
 				text: qsTrId("pagesettingsconnectivity_ethernet")
diff --git a/pages/settings/PageSettingsDisplayAndAppearance.qml b/pages/settings/PageSettingsDisplayAndAppearance.qml
index 53cf12948..0af26e02f 100644
--- a/pages/settings/PageSettingsDisplayAndAppearance.qml
+++ b/pages/settings/PageSettingsDisplayAndAppearance.qml
@@ -12,7 +12,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListSwitch {
 				id: autoBrightness
diff --git a/pages/settings/PageSettingsDisplayMinMax.qml b/pages/settings/PageSettingsDisplayMinMax.qml
index 4653d9719..4f26cf5e8 100644
--- a/pages/settings/PageSettingsDisplayMinMax.qml
+++ b/pages/settings/PageSettingsDisplayMinMax.qml
@@ -10,7 +10,7 @@ Page {
 	id: root
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSwitch {
 				//: Whether to adjust the min/max values in the range dynamically, based on the lowest and highest values observed on the system.
 				//% "Auto-ranging"
diff --git a/pages/settings/PageSettingsDisplayStartPage.qml b/pages/settings/PageSettingsDisplayStartPage.qml
index a54365442..c1a23e675 100644
--- a/pages/settings/PageSettingsDisplayStartPage.qml
+++ b/pages/settings/PageSettingsDisplayStartPage.qml
@@ -30,7 +30,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListNavigation {
 				id: startPageNavigation
 				//% "Start page"
@@ -99,7 +99,7 @@ Page {
 
 		Page {
 			GradientListView {
-				model: ObjectModel {
+				model: AllowedItemModel {
 					ListSwitch {
 						id: startPageMode
 						text: CommonWords.auto
diff --git a/pages/settings/PageSettingsDisplayUnits.qml b/pages/settings/PageSettingsDisplayUnits.qml
index d5e7fa17f..19910c887 100644
--- a/pages/settings/PageSettingsDisplayUnits.qml
+++ b/pages/settings/PageSettingsDisplayUnits.qml
@@ -12,7 +12,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				text: CommonWords.temperature
 				optionModel: [
diff --git a/pages/settings/PageSettingsDvcc.qml b/pages/settings/PageSettingsDvcc.qml
index ea76c5be8..6d37ee212 100644
--- a/pages/settings/PageSettingsDvcc.qml
+++ b/pages/settings/PageSettingsDvcc.qml
@@ -13,7 +13,7 @@ Page {
 	GradientListView {
 		id: dvccSettings
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			PrimaryListLabel {
 				//% "<b>CAUTION:</b> Read the manual before adjusting."
 				text: qsTrId("settings_dvcc_instructions")
diff --git a/pages/settings/PageSettingsDynamicEss.qml b/pages/settings/PageSettingsDynamicEss.qml
index b0c86b9fc..00eceb203 100644
--- a/pages/settings/PageSettingsDynamicEss.qml
+++ b/pages/settings/PageSettingsDynamicEss.qml
@@ -10,7 +10,7 @@ Page {
 	id: root
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				id: dEssMode
 				text: CommonWords.mode
diff --git a/pages/settings/PageSettingsEthernet.qml b/pages/settings/PageSettingsEthernet.qml
index da115bb94..eeb5d87b4 100644
--- a/pages/settings/PageSettingsEthernet.qml
+++ b/pages/settings/PageSettingsEthernet.qml
@@ -14,7 +14,7 @@ Page {
 		model: networkServices.ready ? connectedModel : disconnectedModel
 	}
 
-	ObjectModel {
+	AllowedItemModel {
 		id: disconnectedModel
 
 		ListText {
@@ -27,7 +27,7 @@ Page {
 		}
 	}
 
-	ObjectModel {
+	AllowedItemModel {
 		id: connectedModel
 
 		ListText {
diff --git a/pages/settings/PageSettingsFirmware.qml b/pages/settings/PageSettingsFirmware.qml
index aa1c57068..ebfddb024 100644
--- a/pages/settings/PageSettingsFirmware.qml
+++ b/pages/settings/PageSettingsFirmware.qml
@@ -12,7 +12,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListText {
 				id: remotePort
diff --git a/pages/settings/PageSettingsFirmwareOffline.qml b/pages/settings/PageSettingsFirmwareOffline.qml
index cf5c17b6e..45265cbd0 100644
--- a/pages/settings/PageSettingsFirmwareOffline.qml
+++ b/pages/settings/PageSettingsFirmwareOffline.qml
@@ -12,7 +12,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListFirmwareCheckButton {
 				//% "Check for updates on SD/USB"
diff --git a/pages/settings/PageSettingsFirmwareOnline.qml b/pages/settings/PageSettingsFirmwareOnline.qml
index c8e02a025..1e20c0f8c 100644
--- a/pages/settings/PageSettingsFirmwareOnline.qml
+++ b/pages/settings/PageSettingsFirmwareOnline.qml
@@ -12,7 +12,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListRadioButtonGroup {
 				//% "Auto update"
diff --git a/pages/settings/PageSettingsFronius.qml b/pages/settings/PageSettingsFronius.qml
index 3abeb0808..136d94441 100644
--- a/pages/settings/PageSettingsFronius.qml
+++ b/pages/settings/PageSettingsFronius.qml
@@ -24,7 +24,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListNavigation {
 				//% "Inverters"
 				text: qsTrId("page_settings_fronius_inverters")
diff --git a/pages/settings/PageSettingsFroniusInverter.qml b/pages/settings/PageSettingsFroniusInverter.qml
index cd379bd61..c61b12dc2 100644
--- a/pages/settings/PageSettingsFroniusInverter.qml
+++ b/pages/settings/PageSettingsFroniusInverter.qml
@@ -25,7 +25,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListPvInverterPositionRadioButtonGroup {
 				dataItem.uid: bindPrefix + "/Position"
 			}
diff --git a/pages/settings/PageSettingsGeneral.qml b/pages/settings/PageSettingsGeneral.qml
index af18b73cb..4e7edd7ee 100644
--- a/pages/settings/PageSettingsGeneral.qml
+++ b/pages/settings/PageSettingsGeneral.qml
@@ -13,7 +13,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			SettingsListHeader {
 				//% "System"
 				text: qsTrId("pagesettingsgeneral_system")
diff --git a/pages/settings/PageSettingsGenerator.qml b/pages/settings/PageSettingsGenerator.qml
index 2a87cfd4d..5323fc278 100644
--- a/pages/settings/PageSettingsGenerator.qml
+++ b/pages/settings/PageSettingsGenerator.qml
@@ -22,7 +22,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListNavigation {
 				//% "Conditions"
@@ -50,7 +50,7 @@ Page {
 						GradientListView {
 							id: settingsListView
 
-							model: ObjectModel {
+							model: AllowedItemModel {
 								ListSpinBox {
 									//% "Warm-up time"
 									text: qsTrId("page_settings_generator_warm_up_time")
diff --git a/pages/settings/PageSettingsGpsList.qml b/pages/settings/PageSettingsGpsList.qml
index 1b89a95de..10edcab92 100644
--- a/pages/settings/PageSettingsGpsList.qml
+++ b/pages/settings/PageSettingsGpsList.qml
@@ -74,7 +74,7 @@ Page {
 
 				Page {
 					GradientListView {
-						model: ObjectModel {
+						model: AllowedItemModel {
 							ListRadioButtonGroup {
 								//: Format of reported GPS data
 								//% "Format"
diff --git a/pages/settings/PageSettingsGsm.qml b/pages/settings/PageSettingsGsm.qml
index 87ab06d35..ee3a53da9 100644
--- a/pages/settings/PageSettingsGsm.qml
+++ b/pages/settings/PageSettingsGsm.qml
@@ -32,7 +32,7 @@ Page {
 
 		model: simStatus.isValid ? modemConnected : notConnected
 
-		ObjectModel {
+		AllowedItemModel {
 			id: notConnected
 
 			ListItem {
@@ -41,7 +41,7 @@ Page {
 			}
 		}
 
-		ObjectModel {
+		AllowedItemModel {
 			id: modemConnected
 
 			ListText {
@@ -160,7 +160,7 @@ Page {
 
 						GradientListView {
 
-							model: ObjectModel {
+							model: AllowedItemModel {
 
 								ListSwitch {
 									id: useDefaultApn
diff --git a/pages/settings/PageSettingsHub4.qml b/pages/settings/PageSettingsHub4.qml
index 26e9c3eb4..d1ad2db7f 100644
--- a/pages/settings/PageSettingsHub4.qml
+++ b/pages/settings/PageSettingsHub4.qml
@@ -32,7 +32,7 @@ Page {
 		}
 	}
 
-	ObjectModel {
+	AllowedItemModel {
 		id: essSettings
 
 		ListRadioButtonGroup {
diff --git a/pages/settings/PageSettingsHub4Feedin.qml b/pages/settings/PageSettingsHub4Feedin.qml
index c539b3987..696ddbcba 100644
--- a/pages/settings/PageSettingsHub4Feedin.qml
+++ b/pages/settings/PageSettingsHub4Feedin.qml
@@ -12,7 +12,7 @@ Page {
 	property int hub4Mode
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSwitch {
 				id: acFeedin
 
diff --git a/pages/settings/PageSettingsHub4Peakshaving.qml b/pages/settings/PageSettingsHub4Peakshaving.qml
index 137a4022f..9b773f713 100644
--- a/pages/settings/PageSettingsHub4Peakshaving.qml
+++ b/pages/settings/PageSettingsHub4Peakshaving.qml
@@ -42,7 +42,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				//% "Peak shaving"
 				text: qsTrId("settings_ess_peak_shaving")
diff --git a/pages/settings/PageSettingsIntegrations.qml b/pages/settings/PageSettingsIntegrations.qml
index 2f6311d69..1fa96beee 100644
--- a/pages/settings/PageSettingsIntegrations.qml
+++ b/pages/settings/PageSettingsIntegrations.qml
@@ -12,7 +12,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListNavigation {
 				text: CommonWords.add_device
 				icon.source: "qrc:/images/icon_plus_32.svg"
diff --git a/pages/settings/PageSettingsIo.qml b/pages/settings/PageSettingsIo.qml
index c0e52ad7b..bcabe2ffa 100644
--- a/pages/settings/PageSettingsIo.qml
+++ b/pages/settings/PageSettingsIo.qml
@@ -25,7 +25,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListNavigation {
 				//% "Analog inputs"
diff --git a/pages/settings/PageSettingsLarge.qml b/pages/settings/PageSettingsLarge.qml
index 8a9d839ac..a7e4dc290 100644
--- a/pages/settings/PageSettingsLarge.qml
+++ b/pages/settings/PageSettingsLarge.qml
@@ -10,7 +10,7 @@ Page {
 	id: root
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 		}
 	}
diff --git a/pages/settings/PageSettingsLogger.qml b/pages/settings/PageSettingsLogger.qml
index 7d0724cb3..065478a06 100644
--- a/pages/settings/PageSettingsLogger.qml
+++ b/pages/settings/PageSettingsLogger.qml
@@ -31,7 +31,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListRadioButtonGroup {
 				id: vrmPortalMode
diff --git a/pages/settings/PageSettingsModbus.qml b/pages/settings/PageSettingsModbus.qml
index 65caca06a..fcaaef8e1 100644
--- a/pages/settings/PageSettingsModbus.qml
+++ b/pages/settings/PageSettingsModbus.qml
@@ -26,7 +26,7 @@ Page {
 
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSwitch {
 				text: CommonWords.automatic_scanning
 				dataItem.uid: root.settings + "/AutoScan"
diff --git a/pages/settings/PageSettingsModbusAddDevice.qml b/pages/settings/PageSettingsModbusAddDevice.qml
index ac9b0fba3..13ae202e9 100644
--- a/pages/settings/PageSettingsModbusAddDevice.qml
+++ b/pages/settings/PageSettingsModbusAddDevice.qml
@@ -21,7 +21,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListRadioButtonGroup {
 				id: protocol
diff --git a/pages/settings/PageSettingsModbusDevices.qml b/pages/settings/PageSettingsModbusDevices.qml
index 0e53f8040..c65bcfe70 100644
--- a/pages/settings/PageSettingsModbusDevices.qml
+++ b/pages/settings/PageSettingsModbusDevices.qml
@@ -39,7 +39,7 @@ Page {
 			//% "No Modbus devices saved"
 			text: qsTrId("settings_modbus_no_devices_saved")
 		}
-		model: ObjectModel {
+		model: AllowedItemModel {
 			Column {
 				width: parent ? parent.width : 0
 
diff --git a/pages/settings/PageSettingsModbusTcp.qml b/pages/settings/PageSettingsModbusTcp.qml
index 2c37f8097..59ea804c7 100644
--- a/pages/settings/PageSettingsModbusTcp.qml
+++ b/pages/settings/PageSettingsModbusTcp.qml
@@ -22,7 +22,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSwitch {
 				id: enableModbusTcp
 
diff --git a/pages/settings/PageSettingsNodeRed.qml b/pages/settings/PageSettingsNodeRed.qml
index 4a4e98b41..21af10fb4 100644
--- a/pages/settings/PageSettingsNodeRed.qml
+++ b/pages/settings/PageSettingsNodeRed.qml
@@ -10,7 +10,7 @@ Page {
 	id: root
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				id: nodered
 
diff --git a/pages/settings/PageSettingsRelay.qml b/pages/settings/PageSettingsRelay.qml
index a6c03c7a1..0b1d245a5 100644
--- a/pages/settings/PageSettingsRelay.qml
+++ b/pages/settings/PageSettingsRelay.qml
@@ -10,7 +10,7 @@ Page {
 	id: root
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListRadioButtonGroup {
 				id: relayFunction
diff --git a/pages/settings/PageSettingsRelayTempSensors.qml b/pages/settings/PageSettingsRelayTempSensors.qml
index 65ca1127b..1238b1434 100644
--- a/pages/settings/PageSettingsRelayTempSensors.qml
+++ b/pages/settings/PageSettingsRelayTempSensors.qml
@@ -87,7 +87,7 @@ Page {
 							   ? tempRelayModel
 							   : disabledModel
 
-						ObjectModel {
+						AllowedItemModel {
 							id: tempRelayModel
 
 							ListSwitch {
@@ -113,7 +113,7 @@ Page {
 							}
 						}
 
-						ObjectModel {
+						AllowedItemModel {
 							id: disabledModel
 
 							PrimaryListLabel {
diff --git a/pages/settings/PageSettingsRootfsSelect.qml b/pages/settings/PageSettingsRootfsSelect.qml
index d6409e2e6..3136e89f7 100644
--- a/pages/settings/PageSettingsRootfsSelect.qml
+++ b/pages/settings/PageSettingsRootfsSelect.qml
@@ -45,7 +45,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			PrimaryListLabel {
 				//% "This option allows you to switch between the current and the previous firmware version. No internet or sdcard needed."
 				text: qsTrId("settings_firmware_version_switch_option")
diff --git a/pages/settings/PageSettingsRvcDevice.qml b/pages/settings/PageSettingsRvcDevice.qml
index fd3619e72..c8b3715b0 100644
--- a/pages/settings/PageSettingsRvcDevice.qml
+++ b/pages/settings/PageSettingsRvcDevice.qml
@@ -19,7 +19,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListText {
 				text: CommonWords.model_name
diff --git a/pages/settings/PageSettingsRvcDeviceConfiguration.qml b/pages/settings/PageSettingsRvcDeviceConfiguration.qml
index 92480f2af..519340e5b 100644
--- a/pages/settings/PageSettingsRvcDeviceConfiguration.qml
+++ b/pages/settings/PageSettingsRvcDeviceConfiguration.qml
@@ -27,7 +27,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSpinBox {
 				//% "Charger instance"
 				text: qsTrId("settings_rvc_charger_instance")
diff --git a/pages/settings/PageSettingsSystem.qml b/pages/settings/PageSettingsSystem.qml
index 2c26ec933..973e70255 100644
--- a/pages/settings/PageSettingsSystem.qml
+++ b/pages/settings/PageSettingsSystem.qml
@@ -10,7 +10,7 @@ Page {
 	id: root
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListRadioButtonGroup {
 				id: systemNameRadioButtons
diff --git a/pages/settings/PageSettingsSystemStatus.qml b/pages/settings/PageSettingsSystemStatus.qml
index 82ab5eca1..52fcbc96e 100644
--- a/pages/settings/PageSettingsSystemStatus.qml
+++ b/pages/settings/PageSettingsSystemStatus.qml
@@ -10,7 +10,7 @@ Page {
 	id: root
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListText {
 				//% "Synchronize VE.Bus SOC with battery"
 				text: qsTrId("settings_system_status_sync_vebus_soc_with_battery")
diff --git a/pages/settings/PageSettingsTailscale.qml b/pages/settings/PageSettingsTailscale.qml
index f2932b952..f437810e4 100644
--- a/pages/settings/PageSettingsTailscale.qml
+++ b/pages/settings/PageSettingsTailscale.qml
@@ -161,7 +161,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListSwitch {
 				id: switchTailscaleEnabled
@@ -250,7 +250,7 @@ Page {
 
 					Page {
 						GradientListView {
-							model: ObjectModel {
+							model: AllowedItemModel {
 								ListSwitch {
 									//% "Access local ethernet network"
 									text: qsTrId("settings_tailscale_local_network_access_ethernet")
@@ -307,7 +307,7 @@ Page {
 
 					Page {
 						GradientListView {
-							model: ObjectModel {
+							model: AllowedItemModel {
 								ListTextField {
 									//% "Custom \"tailscale up\" arguments"
 									text: qsTrId("settings_tailscale_advanced_custom_tailscale_up_arguments")
diff --git a/pages/settings/PageSettingsTankPump.qml b/pages/settings/PageSettingsTankPump.qml
index 802b81d67..c497952ba 100644
--- a/pages/settings/PageSettingsTankPump.qml
+++ b/pages/settings/PageSettingsTankPump.qml
@@ -30,7 +30,7 @@ Page {
 		}
 	}
 
-	ObjectModel {
+	AllowedItemModel {
 		id: disabledModel
 
 		PrimaryListLabel {
@@ -39,7 +39,7 @@ Page {
 		}
 	}
 
-	ObjectModel {
+	AllowedItemModel {
 		id: startStopModel
 
 		ListText {
diff --git a/pages/settings/PageSettingsTcpIp.qml b/pages/settings/PageSettingsTcpIp.qml
index 687d0b7fe..f2883c9d5 100644
--- a/pages/settings/PageSettingsTcpIp.qml
+++ b/pages/settings/PageSettingsTcpIp.qml
@@ -115,7 +115,7 @@ Page {
 		model: root.ready ? connectedModel : disconnectedModel
 	}
 
-	ObjectModel {
+	AllowedItemModel {
 		id: disconnectedModel
 
 		ListText {
@@ -128,7 +128,7 @@ Page {
 		}
 	}
 
-	ObjectModel {
+	AllowedItemModel {
 		id: connectedModel
 
 		ListText {
diff --git a/pages/settings/PageSettingsVecanDevice.qml b/pages/settings/PageSettingsVecanDevice.qml
index 0c83b7b0f..4463d57ef 100644
--- a/pages/settings/PageSettingsVecanDevice.qml
+++ b/pages/settings/PageSettingsVecanDevice.qml
@@ -12,7 +12,7 @@ Page {
 	property string bindPrefix
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListText {
 				text: CommonWords.model_name
diff --git a/pages/settings/PageSettingsVrm.qml b/pages/settings/PageSettingsVrm.qml
index 62e44915d..6b5cfa65f 100644
--- a/pages/settings/PageSettingsVrm.qml
+++ b/pages/settings/PageSettingsVrm.qml
@@ -10,7 +10,7 @@ Page {
 	id: root
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListNavigation {
 				//% "VRM Portal mode"
 				text: qsTrId("settings_vrm_portal_mode")
diff --git a/pages/settings/PageTzInfo.qml b/pages/settings/PageTzInfo.qml
index 9acd2e0b0..ba41fca22 100644
--- a/pages/settings/PageTzInfo.qml
+++ b/pages/settings/PageTzInfo.qml
@@ -80,7 +80,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListText {
 				//% "Date/Time UTC"
diff --git a/pages/settings/debug/PageDebug.qml b/pages/settings/debug/PageDebug.qml
index 1db821966..50599d8df 100644
--- a/pages/settings/debug/PageDebug.qml
+++ b/pages/settings/debug/PageDebug.qml
@@ -10,7 +10,7 @@ Page {
 	id: root
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			component SwitchItem : ListItem {
 				id: switchItem
diff --git a/pages/settings/debug/PagePowerDebug.qml b/pages/settings/debug/PagePowerDebug.qml
index 387b27957..f6deff718 100644
--- a/pages/settings/debug/PagePowerDebug.qml
+++ b/pages/settings/debug/PagePowerDebug.qml
@@ -73,7 +73,7 @@ Page {
 		// in a D-Bus format.
 		model: BackendConnection.type === BackendConnection.MqttSource ? invalidModel : validModel
 
-		ObjectModel {
+		AllowedItemModel {
 			id: invalidModel
 
 			PrimaryListLabel {
@@ -81,7 +81,7 @@ Page {
 			}
 		}
 
-		ObjectModel {
+		AllowedItemModel {
 			id: validModel
 
 			ListTextGroup {
diff --git a/pages/settings/debug/PageSettingsDemo.qml b/pages/settings/debug/PageSettingsDemo.qml
index 5cdca912e..1b4d7e93e 100644
--- a/pages/settings/debug/PageSettingsDemo.qml
+++ b/pages/settings/debug/PageSettingsDemo.qml
@@ -13,7 +13,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			PrimaryListLabel {
 				text: "This page demonstrates the components that can be used to build settings pages."
 			}
@@ -345,7 +345,7 @@ Page {
 
 		Page {
 			GradientListView {
-				model: ObjectModel {
+				model: AllowedItemModel {
 					ListItem {
 						text: "New page item"
 					}
diff --git a/pages/settings/debug/PageSystemData.qml b/pages/settings/debug/PageSystemData.qml
index c5768be69..2159e65ef 100644
--- a/pages/settings/debug/PageSystemData.qml
+++ b/pages/settings/debug/PageSystemData.qml
@@ -22,7 +22,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListTextGroup {
 				text: "PV On ACIn1"
 				textModel: [
diff --git a/pages/settings/devicelist/PageAcCharger.qml b/pages/settings/devicelist/PageAcCharger.qml
index 2f38c4d81..92e17d4a3 100644
--- a/pages/settings/devicelist/PageAcCharger.qml
+++ b/pages/settings/devicelist/PageAcCharger.qml
@@ -19,7 +19,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSwitch {
 				text: CommonWords.switch_mode
 				dataItem.uid: root.bindPrefix + "/Mode"
diff --git a/pages/settings/devicelist/PageDigitalInput.qml b/pages/settings/devicelist/PageDigitalInput.qml
index 6ea2e7f5b..7ed04e503 100644
--- a/pages/settings/devicelist/PageDigitalInput.qml
+++ b/pages/settings/devicelist/PageDigitalInput.qml
@@ -20,7 +20,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListText {
 				text: CommonWords.state
 				dataItem.uid: root.bindPrefix + "/State"
@@ -40,7 +40,7 @@ Page {
 						readonly property string settingsBindPrefix: Global.systemSettings.serviceUid + "/Settings/DigitalInput/" + (deviceInstance.value || 0)
 
 						GradientListView {
-							model: ObjectModel {
+							model: AllowedItemModel {
 								ListSwitch {
 									id: alarmSwitch
 									//% "Enable alarm"
diff --git a/pages/settings/devicelist/PageMeteo.qml b/pages/settings/devicelist/PageMeteo.qml
index d1e5f2fa4..9a8807264 100644
--- a/pages/settings/devicelist/PageMeteo.qml
+++ b/pages/settings/devicelist/PageMeteo.qml
@@ -30,7 +30,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListQuantity {
 				property var displayText: Units.getDisplayText(VenusOS.Units_WattsPerSquareMeter, dataItem.value, 1)
diff --git a/pages/settings/devicelist/PageMeteoSettings.qml b/pages/settings/devicelist/PageMeteoSettings.qml
index d98a16111..a342197a7 100644
--- a/pages/settings/devicelist/PageMeteoSettings.qml
+++ b/pages/settings/devicelist/PageMeteoSettings.qml
@@ -18,7 +18,7 @@ Page {
 	]
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				//% "Wind speed sensor"
 				text: qsTrId("page_meteo_settings_wind_speed_sensor")
diff --git a/pages/settings/devicelist/PageMotorDrive.qml b/pages/settings/devicelist/PageMotorDrive.qml
index 98473832c..3eae4b84a 100644
--- a/pages/settings/devicelist/PageMotorDrive.qml
+++ b/pages/settings/devicelist/PageMotorDrive.qml
@@ -19,7 +19,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListQuantity {
 				//% "Motor RPM"
 				text: qsTrId("devicelist_motordrive_motorrpm")
diff --git a/pages/settings/devicelist/PageUnsupportedDevice.qml b/pages/settings/devicelist/PageUnsupportedDevice.qml
index 19160a900..e5c034aa9 100644
--- a/pages/settings/devicelist/PageUnsupportedDevice.qml
+++ b/pages/settings/devicelist/PageUnsupportedDevice.qml
@@ -12,7 +12,7 @@ Page {
 	property string bindPrefix
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListText {
 				//% "Unsupported device found"
 				text: qsTrId("devicelist_unsupporteddevices_found")
diff --git a/pages/settings/devicelist/ac-in/PageAcInModel.qml b/pages/settings/devicelist/ac-in/PageAcInModel.qml
index fc76cf5ce..db02869ce 100644
--- a/pages/settings/devicelist/ac-in/PageAcInModel.qml
+++ b/pages/settings/devicelist/ac-in/PageAcInModel.qml
@@ -6,7 +6,7 @@
 import QtQuick
 import Victron.VenusOS
 
-ObjectModel {
+AllowedItemModel {
 	id: root
 
 	property string bindPrefix
diff --git a/pages/settings/devicelist/ac-in/PageAcInSetup.qml b/pages/settings/devicelist/ac-in/PageAcInSetup.qml
index c34216891..7bf100852 100644
--- a/pages/settings/devicelist/ac-in/PageAcInSetup.qml
+++ b/pages/settings/devicelist/ac-in/PageAcInSetup.qml
@@ -73,7 +73,7 @@ Page {
 	GradientListView {
 		id: settingsListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				id: role
 
diff --git a/pages/settings/devicelist/ac-in/PageSmappeeCTSetup.qml b/pages/settings/devicelist/ac-in/PageSmappeeCTSetup.qml
index 2afdf20fe..b78583ee5 100644
--- a/pages/settings/devicelist/ac-in/PageSmappeeCTSetup.qml
+++ b/pages/settings/devicelist/ac-in/PageSmappeeCTSetup.qml
@@ -29,7 +29,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				id: type
 
diff --git a/pages/settings/devicelist/battery/BatterySettingsAlarmModel.qml b/pages/settings/devicelist/battery/BatterySettingsAlarmModel.qml
index 24999c9ce..622859e7a 100644
--- a/pages/settings/devicelist/battery/BatterySettingsAlarmModel.qml
+++ b/pages/settings/devicelist/battery/BatterySettingsAlarmModel.qml
@@ -6,7 +6,7 @@
 import QtQuick
 import Victron.VenusOS
 
-ObjectModel {
+AllowedItemModel {
 	id: root
 
 	property string bindPrefix
diff --git a/pages/settings/devicelist/battery/BatterySettingsRelayModel.qml b/pages/settings/devicelist/battery/BatterySettingsRelayModel.qml
index 67498ff12..1dcae23e4 100644
--- a/pages/settings/devicelist/battery/BatterySettingsRelayModel.qml
+++ b/pages/settings/devicelist/battery/BatterySettingsRelayModel.qml
@@ -6,7 +6,7 @@
 import QtQuick
 import Victron.VenusOS
 
-ObjectModel {
+AllowedItemModel {
 	id: root
 
 	property string bindPrefix
diff --git a/pages/settings/devicelist/battery/Page48TlDiagnostics.qml b/pages/settings/devicelist/battery/Page48TlDiagnostics.qml
index ac2ebbe05..50fe2ac63 100644
--- a/pages/settings/devicelist/battery/Page48TlDiagnostics.qml
+++ b/pages/settings/devicelist/battery/Page48TlDiagnostics.qml
@@ -12,7 +12,7 @@ Page {
 	property string bindPrefix
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListItem {
 				//% "Status LEDs"
 				text: qsTrId("batterydiagnostics_status_leds")
diff --git a/pages/settings/devicelist/battery/PageBattery.qml b/pages/settings/devicelist/battery/PageBattery.qml
index c2eccb7ec..3c6caed21 100644
--- a/pages/settings/devicelist/battery/PageBattery.qml
+++ b/pages/settings/devicelist/battery/PageBattery.qml
@@ -21,7 +21,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				text: CommonWords.switch_mode
 				dataItem.uid: root.bindPrefix + "/Mode"
diff --git a/pages/settings/devicelist/battery/PageBatteryAlarms.qml b/pages/settings/devicelist/battery/PageBatteryAlarms.qml
index 5b3f28fa9..22e5330ff 100644
--- a/pages/settings/devicelist/battery/PageBatteryAlarms.qml
+++ b/pages/settings/devicelist/battery/PageBatteryAlarms.qml
@@ -12,7 +12,7 @@ Page {
 	property string bindPrefix
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListAlarm {
 				text: CommonWords.low_battery_voltage
 				dataItem.uid: root.bindPrefix + "/Alarms/LowVoltage"
diff --git a/pages/settings/devicelist/battery/PageBatteryDetails.qml b/pages/settings/devicelist/battery/PageBatteryDetails.qml
index b41d47d15..d22037da8 100644
--- a/pages/settings/devicelist/battery/PageBatteryDetails.qml
+++ b/pages/settings/devicelist/battery/PageBatteryDetails.qml
@@ -13,7 +13,7 @@ Page {
 	property BatteryDetails details
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListQuantityGroup {
 				//% "Lowest cell voltage"
 				text: qsTrId("batterydetails_lowest_cell_voltage")
diff --git a/pages/settings/devicelist/battery/PageBatteryHistory.qml b/pages/settings/devicelist/battery/PageBatteryHistory.qml
index 3c17f488a..dff61e5e1 100644
--- a/pages/settings/devicelist/battery/PageBatteryHistory.qml
+++ b/pages/settings/devicelist/battery/PageBatteryHistory.qml
@@ -13,7 +13,7 @@ Page {
 	required property BatteryHistory history
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListQuantity {
 				//% "Deepest discharge"
 				text: qsTrId("batteryalarms_deepest_discharge")
diff --git a/pages/settings/devicelist/battery/PageBatteryParameters.qml b/pages/settings/devicelist/battery/PageBatteryParameters.qml
index 355c442de..7f7dd0230 100644
--- a/pages/settings/devicelist/battery/PageBatteryParameters.qml
+++ b/pages/settings/devicelist/battery/PageBatteryParameters.qml
@@ -12,7 +12,7 @@ Page {
 	property string bindPrefix
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListQuantity {
 				//% "Charge Voltage Limit (CVL)"
 				text: qsTrId("batteryparameters_charge_voltage_limit_cvl")
diff --git a/pages/settings/devicelist/battery/PageBatterySettings.qml b/pages/settings/devicelist/battery/PageBatterySettings.qml
index e73d03500..2ed4b23fb 100644
--- a/pages/settings/devicelist/battery/PageBatterySettings.qml
+++ b/pages/settings/devicelist/battery/PageBatterySettings.qml
@@ -32,7 +32,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListNavigation {
 				//% "Battery bank"
 				text: qsTrId("batterysettings_battery_bank")
diff --git a/pages/settings/devicelist/battery/PageBatterySettingsBattery.qml b/pages/settings/devicelist/battery/PageBatterySettingsBattery.qml
index 140cdd10f..a68f82aec 100644
--- a/pages/settings/devicelist/battery/PageBatterySettingsBattery.qml
+++ b/pages/settings/devicelist/battery/PageBatterySettingsBattery.qml
@@ -18,7 +18,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				//% "Nominal Voltage"
 				text: qsTrId("batterysettingsbattery_nominal_voltage")
diff --git a/pages/settings/devicelist/battery/PageLynxIonDiagnostics.qml b/pages/settings/devicelist/battery/PageLynxIonDiagnostics.qml
index cba50f79b..706ec255b 100644
--- a/pages/settings/devicelist/battery/PageLynxIonDiagnostics.qml
+++ b/pages/settings/devicelist/battery/PageLynxIonDiagnostics.qml
@@ -12,7 +12,7 @@ Page {
 	property string bindPrefix
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListText {
 				//% "Shutdowns due error"
 				text: qsTrId("lynxiondiagnostics_shutdowns_due_error")
diff --git a/pages/settings/devicelist/battery/PageLynxIonIo.qml b/pages/settings/devicelist/battery/PageLynxIonIo.qml
index 1970619b9..c651223c2 100644
--- a/pages/settings/devicelist/battery/PageLynxIonIo.qml
+++ b/pages/settings/devicelist/battery/PageLynxIonIo.qml
@@ -12,7 +12,7 @@ Page {
 	property string bindPrefix
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListText {
 				//% "System Switch"
 				text: qsTrId("lynxionio_system_switch")
diff --git a/pages/settings/devicelist/battery/PageLynxIonSystem.qml b/pages/settings/devicelist/battery/PageLynxIonSystem.qml
index 6126fe2d7..a120a4300 100644
--- a/pages/settings/devicelist/battery/PageLynxIonSystem.qml
+++ b/pages/settings/devicelist/battery/PageLynxIonSystem.qml
@@ -12,7 +12,7 @@ Page {
 	property string bindPrefix
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListText {
 				//% "Capacity"
 				text: qsTrId("lynxionsystem_capacity")
diff --git a/pages/settings/devicelist/dc-in/PageAlternatorModel.qml b/pages/settings/devicelist/dc-in/PageAlternatorModel.qml
index be6f8ba03..5677baf94 100644
--- a/pages/settings/devicelist/dc-in/PageAlternatorModel.qml
+++ b/pages/settings/devicelist/dc-in/PageAlternatorModel.qml
@@ -6,7 +6,7 @@
 import QtQuick
 import Victron.VenusOS
 
-ObjectModel {
+AllowedItemModel {
 	id: root
 
 	property string bindPrefix
@@ -113,7 +113,7 @@ ObjectModel {
 			model: overallHistoryModel
 		}
 
-		ObjectModel {
+		AllowedItemModel {
 			id: overallHistoryModel
 
 			ListText {
diff --git a/pages/settings/devicelist/dc-in/PageDcDcConverter.qml b/pages/settings/devicelist/dc-in/PageDcDcConverter.qml
index 175d10134..c0d2e11bf 100644
--- a/pages/settings/devicelist/dc-in/PageDcDcConverter.qml
+++ b/pages/settings/devicelist/dc-in/PageDcDcConverter.qml
@@ -19,7 +19,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSwitch {
 				text: CommonWords.switch_mode
 				dataItem.uid: root.bindPrefix + "/Mode"
diff --git a/pages/settings/devicelist/dc-in/PageDcMeterAlarms.qml b/pages/settings/devicelist/dc-in/PageDcMeterAlarms.qml
index b883b1cdc..84f3d7f56 100644
--- a/pages/settings/devicelist/dc-in/PageDcMeterAlarms.qml
+++ b/pages/settings/devicelist/dc-in/PageDcMeterAlarms.qml
@@ -23,7 +23,7 @@ Page {
 					 && !highTemp.visible
 		}
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListAlarm {
 				id: lowVoltage
 
diff --git a/pages/settings/devicelist/dc-in/PageDcMeterHistory.qml b/pages/settings/devicelist/dc-in/PageDcMeterHistory.qml
index 20e50b063..baa1fa37c 100644
--- a/pages/settings/devicelist/dc-in/PageDcMeterHistory.qml
+++ b/pages/settings/devicelist/dc-in/PageDcMeterHistory.qml
@@ -25,7 +25,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListQuantity {
 				text: CommonWords.minimum_voltage
 				dataItem.uid: root.bindPrefix + "/History/MinimumVoltage"
diff --git a/pages/settings/devicelist/dc-in/PageDcMeterModel.qml b/pages/settings/devicelist/dc-in/PageDcMeterModel.qml
index 2ac65d629..6a3f44002 100644
--- a/pages/settings/devicelist/dc-in/PageDcMeterModel.qml
+++ b/pages/settings/devicelist/dc-in/PageDcMeterModel.qml
@@ -6,7 +6,7 @@
 import QtQuick
 import Victron.VenusOS
 
-ObjectModel {
+AllowedItemModel {
 	id: root
 
 	property string bindPrefix
diff --git a/pages/settings/devicelist/inverter/PageInverter.qml b/pages/settings/devicelist/inverter/PageInverter.qml
index 1b1129caa..36740be01 100644
--- a/pages/settings/devicelist/inverter/PageInverter.qml
+++ b/pages/settings/devicelist/inverter/PageInverter.qml
@@ -19,7 +19,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListItem {
 				id: modeListButton
 
diff --git a/pages/settings/devicelist/inverter/PageSolarStats.qml b/pages/settings/devicelist/inverter/PageSolarStats.qml
index 291d32557..edac1c7b6 100644
--- a/pages/settings/devicelist/inverter/PageSolarStats.qml
+++ b/pages/settings/devicelist/inverter/PageSolarStats.qml
@@ -12,7 +12,7 @@ Page {
 	property string bindPrefix
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListQuantity {
 				//% "Maximum PV voltage"
 				text: qsTrId("inverter_maximum_pv_voltage")
diff --git a/pages/settings/devicelist/pulsemeter/PagePulseCounter.qml b/pages/settings/devicelist/pulsemeter/PagePulseCounter.qml
index 1d0c86aa1..b827a1766 100644
--- a/pages/settings/devicelist/pulsemeter/PagePulseCounter.qml
+++ b/pages/settings/devicelist/pulsemeter/PagePulseCounter.qml
@@ -19,7 +19,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListQuantity {
 				//% "Aggregate"
 				text: qsTrId("pulsecounter_aggregate")
diff --git a/pages/settings/devicelist/pulsemeter/PagePulseCounterSetup.qml b/pages/settings/devicelist/pulsemeter/PagePulseCounterSetup.qml
index 5d02a7d24..a05e15457 100644
--- a/pages/settings/devicelist/pulsemeter/PagePulseCounterSetup.qml
+++ b/pages/settings/devicelist/pulsemeter/PagePulseCounterSetup.qml
@@ -12,7 +12,7 @@ Page {
 	property string bindPrefix
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListVolumeUnitRadioButtonGroup {}
 
 			ListSwitch {
diff --git a/pages/settings/devicelist/rs/PageMultiRs.qml b/pages/settings/devicelist/rs/PageMultiRs.qml
index ff074e6ae..c0de5f67e 100644
--- a/pages/settings/devicelist/rs/PageMultiRs.qml
+++ b/pages/settings/devicelist/rs/PageMultiRs.qml
@@ -46,7 +46,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListText {
 				text: CommonWords.state
 				secondaryText: Global.system.systemStateToText(dataItem.value)
diff --git a/pages/settings/devicelist/rs/PageRsSystem.qml b/pages/settings/devicelist/rs/PageRsSystem.qml
index 854db3dd9..0c55bee25 100644
--- a/pages/settings/devicelist/rs/PageRsSystem.qml
+++ b/pages/settings/devicelist/rs/PageRsSystem.qml
@@ -25,7 +25,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListItem {
 				id: modeListButton
 
diff --git a/pages/settings/devicelist/rs/PageRsSystemAlarms.qml b/pages/settings/devicelist/rs/PageRsSystemAlarms.qml
index d782231a4..e8685c6ce 100644
--- a/pages/settings/devicelist/rs/PageRsSystemAlarms.qml
+++ b/pages/settings/devicelist/rs/PageRsSystemAlarms.qml
@@ -17,7 +17,7 @@ Page {
 		uid: root.bindPrefix + "/Ac/NumberOfPhases"
 	}
 
-	ObjectModel {
+	AllowedItemModel {
 		id: validAlarmsModel
 
 		VeBusAlarm {
@@ -52,7 +52,7 @@ Page {
 		}
 	}
 
-	ObjectModel {
+	AllowedItemModel {
 		id: noAlarmsModel
 
 		PrimaryListLabel {
diff --git a/pages/settings/devicelist/rs/PageRsSystemEss.qml b/pages/settings/devicelist/rs/PageRsSystemEss.qml
index 3dc4c3871..a8e3c501a 100644
--- a/pages/settings/devicelist/rs/PageRsSystemEss.qml
+++ b/pages/settings/devicelist/rs/PageRsSystemEss.qml
@@ -27,7 +27,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				id: essMode
 				text: CommonWords.mode
diff --git a/pages/settings/devicelist/tank/PageTankAlarm.qml b/pages/settings/devicelist/tank/PageTankAlarm.qml
index 3e8477491..17f3d4ffb 100644
--- a/pages/settings/devicelist/tank/PageTankAlarm.qml
+++ b/pages/settings/devicelist/tank/PageTankAlarm.qml
@@ -12,7 +12,7 @@ Page {
 	property string bindPrefix
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSwitch {
 				//% "Enable alarm"
 				text: qsTrId("devicelist_tankalarm_enable_alarm")
diff --git a/pages/settings/devicelist/tank/PageTankSensor.qml b/pages/settings/devicelist/tank/PageTankSensor.qml
index 0843a6db0..0235658b2 100644
--- a/pages/settings/devicelist/tank/PageTankSensor.qml
+++ b/pages/settings/devicelist/tank/PageTankSensor.qml
@@ -19,7 +19,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListText {
 				text: CommonWords.status
 				dataItem.uid: root.bindPrefix + "/Status"
diff --git a/pages/settings/devicelist/tank/PageTankSetup.qml b/pages/settings/devicelist/tank/PageTankSetup.qml
index 656ed78c9..248a9a586 100644
--- a/pages/settings/devicelist/tank/PageTankSetup.qml
+++ b/pages/settings/devicelist/tank/PageTankSetup.qml
@@ -13,7 +13,7 @@ Page {
 	property string bindPrefix
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListSpinBox {
 				//% "Capacity"
 				text: qsTrId("devicelist_tanksetup_capacity")
diff --git a/pages/settings/devicelist/temperature/PageTemperatureSensor.qml b/pages/settings/devicelist/temperature/PageTemperatureSensor.qml
index 2f840174a..ac5302ddb 100644
--- a/pages/settings/devicelist/temperature/PageTemperatureSensor.qml
+++ b/pages/settings/devicelist/temperature/PageTemperatureSensor.qml
@@ -29,7 +29,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListText {
 				text: CommonWords.status
 				dataItem.uid: root.bindPrefix + "/Status"
diff --git a/pages/settings/devicelist/temperature/PageTemperatureSensorSetup.qml b/pages/settings/devicelist/temperature/PageTemperatureSensorSetup.qml
index 35a1a9650..31d245b26 100644
--- a/pages/settings/devicelist/temperature/PageTemperatureSensorSetup.qml
+++ b/pages/settings/devicelist/temperature/PageTemperatureSensorSetup.qml
@@ -22,7 +22,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListRadioButtonGroup {
 				text: CommonWords.type
 				dataItem.uid: bindPrefix + "/TemperatureType"
diff --git a/pages/solar/PvInverterPage.qml b/pages/solar/PvInverterPage.qml
index ba1300e88..26be782e1 100644
--- a/pages/solar/PvInverterPage.qml
+++ b/pages/solar/PvInverterPage.qml
@@ -14,7 +14,7 @@ Page {
 	title: pvInverter.name
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListItemBackground {
 				height: phaseTable.y + phaseTable.height
 
diff --git a/pages/solar/SolarChargerAlarmsAndErrorsPage.qml b/pages/solar/SolarChargerAlarmsAndErrorsPage.qml
index 15dd36e53..7f6fbb320 100644
--- a/pages/solar/SolarChargerAlarmsAndErrorsPage.qml
+++ b/pages/solar/SolarChargerAlarmsAndErrorsPage.qml
@@ -15,7 +15,7 @@ Page {
 	GradientListView {
 		id: chargerListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			PrimaryListLabel {
 				allowed: lowBatteryAlarm.visible || highBatteryAlarm.visible || highTemperatureAlarm.visible || shortCircuitAlarm.visible
 				leftPadding: 0
diff --git a/pages/solar/SolarChargerNetworkedOperationPage.qml b/pages/solar/SolarChargerNetworkedOperationPage.qml
index 23806e519..c683ce2de 100644
--- a/pages/solar/SolarChargerNetworkedOperationPage.qml
+++ b/pages/solar/SolarChargerNetworkedOperationPage.qml
@@ -15,7 +15,7 @@ Page {
 	GradientListView {
 		id: chargerListView
 
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListText {
 				id: networkModeEnabled
 				//% "Networked"
diff --git a/pages/solar/SolarChargerPage.qml b/pages/solar/SolarChargerPage.qml
index a1e4d7331..8f6d0aea5 100644
--- a/pages/solar/SolarChargerPage.qml
+++ b/pages/solar/SolarChargerPage.qml
@@ -16,7 +16,7 @@ Page {
 	title: solarCharger.name
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListItemBackground {
 				height: trackerTable.y + trackerTable.height
 
diff --git a/pages/vebusdevice/PageAcSensor.qml b/pages/vebusdevice/PageAcSensor.qml
index 70b0f8263..3b27a7370 100644
--- a/pages/vebusdevice/PageAcSensor.qml
+++ b/pages/vebusdevice/PageAcSensor.qml
@@ -13,7 +13,7 @@ Page {
 	property int index
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			Column {
 				width: parent ? parent.width : 0
diff --git a/pages/vebusdevice/PageAcSensors.qml b/pages/vebusdevice/PageAcSensors.qml
index 6e5b0eebb..cafdf9329 100644
--- a/pages/vebusdevice/PageAcSensors.qml
+++ b/pages/vebusdevice/PageAcSensors.qml
@@ -12,7 +12,7 @@ Page {
 	property string bindPrefix
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			Column {
 				width: parent ? parent.width : 0
 
diff --git a/pages/vebusdevice/PageVeBus.qml b/pages/vebusdevice/PageVeBus.qml
index 373ee4d49..f942832b5 100644
--- a/pages/vebusdevice/PageVeBus.qml
+++ b/pages/vebusdevice/PageVeBus.qml
@@ -67,7 +67,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListItem {
 				id: modeListButton
 
@@ -174,7 +174,7 @@ Page {
 								onTriggered: Global.pageManager.popPage()
 							}
 
-							model: ObjectModel {
+							model: AllowedItemModel {
 								ListItem {
 									text: {
 										var message = ""
diff --git a/pages/vebusdevice/PageVeBusAdvanced.qml b/pages/vebusdevice/PageVeBusAdvanced.qml
index 61d3ddb65..5281cf1d2 100644
--- a/pages/vebusdevice/PageVeBusAdvanced.qml
+++ b/pages/vebusdevice/PageVeBusAdvanced.qml
@@ -78,7 +78,7 @@ Page {
 
 	GradientListView {
 		id:  gradientListView
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListButton {
 				property bool interrupt: vebusSubState.value === VenusOS.VeBusDevice_ChargeState_Equalize
@@ -260,7 +260,7 @@ Page {
 
 					Page {
 						GradientListView {
-							model: ObjectModel {
+							model: AllowedItemModel {
 								Column {
 									width: parent ? parent.width : 0
 
diff --git a/pages/vebusdevice/PageVeBusAlarms.qml b/pages/vebusdevice/PageVeBusAlarms.qml
index 0f48c6953..fa40a0bc5 100644
--- a/pages/vebusdevice/PageVeBusAlarms.qml
+++ b/pages/vebusdevice/PageVeBusAlarms.qml
@@ -23,7 +23,7 @@ Page {
 	title: CommonWords.alarm_status
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListText {
 				text: CommonWords.vebus_error
diff --git a/pages/vebusdevice/PageVeBusBms.qml b/pages/vebusdevice/PageVeBusBms.qml
index 3d1267c65..0878cac8a 100644
--- a/pages/vebusdevice/PageVeBusBms.qml
+++ b/pages/vebusdevice/PageVeBusBms.qml
@@ -13,7 +13,7 @@ Page {
 	property int bmsType
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 			ListText {
 				text: CommonWords.allow_to_charge
 				secondaryText: CommonWords.yesOrNo(dataItem.value)
diff --git a/pages/vebusdevice/PageVeBusDebug.qml b/pages/vebusdevice/PageVeBusDebug.qml
index 5933a7196..3b3700130 100644
--- a/pages/vebusdevice/PageVeBusDebug.qml
+++ b/pages/vebusdevice/PageVeBusDebug.qml
@@ -36,7 +36,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListNavigation {
 				text: CommonWords.ac_sensors
diff --git a/pages/vebusdevice/PageVeBusError11Device.qml b/pages/vebusdevice/PageVeBusError11Device.qml
index 5248c06a5..868c3c672 100644
--- a/pages/vebusdevice/PageVeBusError11Device.qml
+++ b/pages/vebusdevice/PageVeBusError11Device.qml
@@ -26,7 +26,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListText {
 				//% "Last VE.Bus Error 11 report #%1"
diff --git a/pages/vebusdevice/PageVeBusError11View.qml b/pages/vebusdevice/PageVeBusError11View.qml
index 82f69413c..e56a242a2 100644
--- a/pages/vebusdevice/PageVeBusError11View.qml
+++ b/pages/vebusdevice/PageVeBusError11View.qml
@@ -18,7 +18,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			PrimaryListLabel {
 				//% "VE.Bus Error 11 reporting requires minimum VE.Bus firmware version 454."
diff --git a/pages/vebusdevice/PageVeBusKwhCounters.qml b/pages/vebusdevice/PageVeBusKwhCounters.qml
index c1ad50915..5743092db 100644
--- a/pages/vebusdevice/PageVeBusKwhCounters.qml
+++ b/pages/vebusdevice/PageVeBusKwhCounters.qml
@@ -13,7 +13,7 @@ Page {
 	property var service
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			ListText {
 				//% "VE.Bus Quirks"
diff --git a/pages/vebusdevice/PageVeBusSerialNumbers.qml b/pages/vebusdevice/PageVeBusSerialNumbers.qml
index f6e49d8e8..7d5801a1a 100644
--- a/pages/vebusdevice/PageVeBusSerialNumbers.qml
+++ b/pages/vebusdevice/PageVeBusSerialNumbers.qml
@@ -30,7 +30,7 @@ Page {
 	}
 
 	GradientListView {
-		model: ObjectModel {
+		model: AllowedItemModel {
 
 			Column {
 				width: parent ? parent.width : 0