diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 7edb0bf8bd..646e257ff3 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -91,7 +91,10 @@ class CuraApplication(QtApplication):
         self._open_file_queue = []  # Files to open when plug-ins are loaded.
 
         # Need to do this before ContainerRegistry tries to load the machines
-        SettingDefinition.addSupportedProperty("global_only", DefinitionPropertyType.Function, default = False)
+        SettingDefinition.addSupportedProperty("settable_per_mesh", DefinitionPropertyType.Function, default = True)
+        SettingDefinition.addSupportedProperty("settable_per_extruder", DefinitionPropertyType.Function, default = True)
+        SettingDefinition.addSupportedProperty("settable_per_meshgroup", DefinitionPropertyType.Function, default = True)
+        SettingDefinition.addSupportedProperty("settable_globally", DefinitionPropertyType.Function, default = True)
         SettingDefinition.addSettingType("extruder", int, str, UM.Settings.Validator)
 
         super().__init__(name = "cura", version = CuraVersion, buildtype = CuraBuildType)
diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
index c89485517e..bc721782ae 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
@@ -190,11 +190,11 @@ Item {
             {
                 if(text != "")
                 {
-                    listview.model.filter = {"global_only": false, "label": "*" + text}
+                    listview.model.filter = {"settable_per_mesh": true, "label": "*" + text}
                 }
                 else
                 {
-                    listview.model.filter = {"global_only": false}
+                    listview.model.filter = {"settable_per_mesh": true}
                 }
             }
         }
@@ -219,7 +219,7 @@ Item {
                     containerId: Cura.MachineManager.activeDefinitionId
                     filter:
                     {
-                        "global_only": false
+                        "settable_per_mesh": true
                     }
                     visibilityHandler: UM.SettingPreferenceVisibilityHandler {}
                 }