diff --git a/packages/core/forms/src/components/fields/FieldAutoSuggest.vue b/packages/core/forms/src/components/fields/FieldAutoSuggest.vue
index 76162809e3..6a171792d0 100644
--- a/packages/core/forms/src/components/fields/FieldAutoSuggest.vue
+++ b/packages/core/forms/src/components/fields/FieldAutoSuggest.vue
@@ -115,7 +115,7 @@ export default {
       return this.schema.entity
     },
     scope() {
-      return this.entity.replace('_',' ').replace(/s$/,'')
+      return this.schema.label.toLowerCase()
     },
     bypassSearch() {
       return this.$route && this.$route.query && this.$route.query.no_search
diff --git a/packages/core/forms/src/components/fields/FieldSelectionGroup.vue b/packages/core/forms/src/components/fields/FieldSelectionGroup.vue
index 11e36d1990..5008246d79 100644
--- a/packages/core/forms/src/components/fields/FieldSelectionGroup.vue
+++ b/packages/core/forms/src/components/fields/FieldSelectionGroup.vue
@@ -14,7 +14,7 @@
             v-for="(option, i) in schema.fields"
             :key="i"
             class="option-group"
-            :class="{ 'radio-diabled': $props.disabled }"
+            :class="{ 'radio-disabled': $props.disabled }"
           >
             <label
               class="k-label"
@@ -179,14 +179,8 @@ export default {
       gap: $kui-space-80;
     }
 
-    .radio-diabled {
-      label {
-        cursor: not-allowed;
-      }
-
-      input {
-        cursor: not-allowed;
-      }
+    .radio-disabled {
+      cursor: not-allowed;
     }
   }
 }
diff --git a/packages/entities/entities-plugins/src/components/PluginForm.vue b/packages/entities/entities-plugins/src/components/PluginForm.vue
index 120a2f3c2d..f35232a20a 100644
--- a/packages/entities/entities-plugins/src/components/PluginForm.vue
+++ b/packages/entities/entities-plugins/src/components/PluginForm.vue
@@ -444,7 +444,7 @@ const defaultFormSchema: DefaultPluginsSchemaRecord = reactive({
   // plugin scoping
   selectionGroup: {
     type: 'selectionGroup',
-    disabled: !props.hideScopeSelection ? false : props.hideScopeSelection || (formType.value === EntityBaseFormType.Create && props.config.entityId) ? true : false,
+    disabled: props.hideScopeSelection,
     inputType: 'hidden',
     styleClasses: 'hide-label',
     fields: [