diff --git a/src/components/parameter-schema/ParameterSchemaFormComponent.vue b/src/components/parameter-schema/ParameterSchemaFormComponent.vue
index 5d79f31bac346566bf4ca2c7046eed995e11b0a7..4a93a52f9669beb1b047b1a609907103feec4405 100644
--- a/src/components/parameter-schema/ParameterSchemaFormComponent.vue
+++ b/src/components/parameter-schema/ParameterSchemaFormComponent.vue
@@ -232,7 +232,7 @@ function scroll(selectedAnchor: string) {
 // =============================================================================
 onMounted(() => {
   if (props.schema) updateSchema(props.schema);
-  if (props.clowmInfo) Tooltip.getOrCreateInstance("#exampleDataButton");
+  if (props.clowmInfo?.exampleParameters) Tooltip.getOrCreateInstance("#exampleDataButton");
   bucketRepository.fetchBuckets();
   bucketRepository.fetchOwnPermissions();
   keyRepository.fetchS3Keys();
diff --git a/src/components/parameter-schema/form-mode/ParameterGroupForm.vue b/src/components/parameter-schema/form-mode/ParameterGroupForm.vue
index 95d09663bf78ba27591046b2398511b9a8a73c80..be65227cd15dd3b2699a1b7ef1010b5509123e95 100644
--- a/src/components/parameter-schema/form-mode/ParameterGroupForm.vue
+++ b/src/components/parameter-schema/form-mode/ParameterGroupForm.vue
@@ -106,19 +106,12 @@ watch(
           "
         >
           <code
-            class="p-2 rounded-top border-bottom-0 border bg-secondary-subtle"
-            :class="{
-              'border-warning': parameterRequired(
-                parameterGroup,
-                parameterName,
-              ),
-              'border-secondary': !parameterRequired(
-                parameterGroup,
-                parameterName,
-              ),
-              'border-2': parameterRequired(parameterGroup, parameterName),
-            }"
+            class="p-2 rounded-top border-bottom-0 border bg-secondary-subtle border-secondary"
             >--{{ parameter["name"] ?? parameterName }}</code
+          ><span
+            v-if="parameterRequired(parameterGroup, parameterName)"
+            class="rounded p-1 bg-warning text-light ms-2"
+            >required</span
           >
           <div class="input-group">
             <span