diff --git a/packages/survey-angular-ui/src/question.component.html b/packages/survey-angular-ui/src/question.component.html
index e4ef63a0d7..1e68dd4d01 100644
--- a/packages/survey-angular-ui/src/question.component.html
+++ b/packages/survey-angular-ui/src/question.component.html
@@ -2,17 +2,18 @@
   <div *ngIf="!!model" #elementContainer [class]="model.getRootCss()" [style]="model.getRootStyle()" [id]="model.id" [attr.data-name]="model.name" [attr.role]="model.ariaRole" [attr.aria-required]="model.ariaRequired" [attr.aria-invalid]="model.ariaInvalid" [attr.aria-labelledby]="model.ariaLabelledBy" [attr.aria-expanded]="model.ariaExpanded">
     <div *ngIf="model.showErrorsAboveQuestion && model.hasVisibleErrors" [element]="model" sv-ng-errors></div>
     <div [element]="model" *ngIf="model.hasTitleOnLeftTop" sv-ng-element-header></div>
-    <div [class]="model.cssContent" role="presentation" [visible]="!model.isCollapsed">
-      <div *ngIf="model.showErrorOnTop && model.hasVisibleErrors" [element]="model" sv-ng-errors></div>
-      <ng-template [component]="{ name: getQuestionContentWrapperComponentName(), data: getQuestionContentWrapperComponentData(), default: 'skeleton-question' }">
-      </ng-template>
-      <div *ngIf="model.hasComment" [class]="model.getCommentAreaCss(false)">
-        <div [model]="model.locCommentText" sv-ng-string></div>
-        <sv-ng-comment [question]="model"></sv-ng-comment>
+    <ng-template [component]="{ name: getQuestionContentWrapperComponentName(), data: getQuestionContentWrapperComponentData() }">
+      <div [class]="model.cssContent" role="presentation" [visible]="!model.isCollapsed">
+        <div *ngIf="model.showErrorOnTop && model.hasVisibleErrors" [element]="model" sv-ng-errors></div>
+        <ng-template [component]="{ name: getComponentName(), data: { model: model }, default: 'skeleton-question' }"></ng-template>
+        <div *ngIf="model.hasComment" [class]="model.getCommentAreaCss(false)">
+          <div [model]="model.locCommentText" sv-ng-string></div>
+          <sv-ng-comment [question]="model"></sv-ng-comment>
+        </div>
+        <div *ngIf="model.showErrorOnBottom && model.hasVisibleErrors" [element]="model" sv-ng-errors></div>
+        <div *ngIf="model.hasDescriptionUnderInput" [class]="model.cssDescription" [model]="model.locDescription" sv-ng-string></div>
       </div>
-      <div *ngIf="model.showErrorOnBottom && model.hasVisibleErrors" [element]="model" sv-ng-errors></div>
-      <div *ngIf="model.hasDescriptionUnderInput" [class]="model.cssDescription" [model]="model.locDescription" sv-ng-string></div>
-  </div>
+    </ng-template>
     <div [element]="model" *ngIf="model.hasTitleOnBottom" sv-ng-element-header></div>
     <div *ngIf="model.showErrorsBelowQuestion && model.hasVisibleErrors" [element]="model" sv-ng-errors></div>
   </div>
diff --git a/packages/survey-angular-ui/src/question.component.ts b/packages/survey-angular-ui/src/question.component.ts
index 5587b83863..63aeefb4d6 100644
--- a/packages/survey-angular-ui/src/question.component.ts
+++ b/packages/survey-angular-ui/src/question.component.ts
@@ -26,11 +26,10 @@ export class QuestionComponent extends EmbeddedViewContentComponent {
   }
   public getComponentName(): string { return getComponentName(this.model); }
   public getQuestionContentWrapperComponentName(): string {
-    return (<any>this.model.survey).getQuestionContentWrapperComponentName(this.model) || this.getComponentName();
+    return (<any>this.model.survey).getQuestionContentWrapperComponentName(this.model);
   }
   public getQuestionContentWrapperComponentData(): any {
     return {
-      componentName: this.getComponentName(),
       componentData: {
         model: this.model,
         data: (<any>this.model.survey).getElementWrapperComponentData(this.model)
diff --git a/packages/survey-vue3-ui/src/Question.vue b/packages/survey-vue3-ui/src/Question.vue
index 082f5b048a..fd98da2725 100644
--- a/packages/survey-vue3-ui/src/Question.vue
+++ b/packages/survey-vue3-ui/src/Question.vue
@@ -26,40 +26,42 @@
       :element="element"
       :css="css"
     />
-    <div
-      :class="getContentClass(element) || undefined"
-      v-show="!element.isCollapsed"
-      role="presentation"
-    >
-      <survey-errors
-        v-if="hasErrorsOnTop"
-        :element="element"
-        :location="'top'"
-      />
-
-      <component
-        :is="contentComponentName"
-        v-if="!element.isCollapsed"
-        v-bind="contentComponentData"
-      />
-      <div v-if="element.hasComment" :class="element.getCommentAreaCss()">
-        <div>
-          <survey-string :locString="element.locCommentText" />
-        </div>
-        <survey-question-comment :question="element" />
-      </div>
-      <survey-errors
-        v-if="hasErrorsOnBottom"
-        :element="element"
-        :location="'bottom'"
-      />
+    <component :is="contentComponentName" v-bind="contentComponentData">
       <div
-        v-if="element.hasDescriptionUnderInput"
-        :class="element.cssClasses.descriptionUnderInput"
+        :class="getContentClass(element) || undefined"
+        v-show="!element.isCollapsed"
+        role="presentation"
       >
-        <survey-string :locString="element.locDescription" />
+        <survey-errors
+          v-if="hasErrorsOnTop"
+          :element="element"
+          :location="'top'"
+        />
+
+        <component
+          :is="componentName"
+          v-if="!element.isCollapsed"
+          :question="element"
+        />
+        <div v-if="element.hasComment" :class="element.getCommentAreaCss()">
+          <div>
+            <survey-string :locString="element.locCommentText" />
+          </div>
+          <survey-question-comment :question="element" />
+        </div>
+        <survey-errors
+          v-if="hasErrorsOnBottom"
+          :element="element"
+          :location="'bottom'"
+        />
+        <div
+          v-if="element.hasDescriptionUnderInput"
+          :class="element.cssClasses.descriptionUnderInput"
+        >
+          <survey-string :locString="element.locDescription" />
+        </div>
       </div>
-    </div>
+    </component>
     <survey-element-header
       v-if="element.hasTitleOnBottom"
       :element="element"
@@ -124,15 +126,11 @@ const componentName = computed(() => {
 });
 const contentComponentName = computed(() => {
   return (
-    (
-      props.element.survey as SurveyModel
-    ).getQuestionContentWrapperComponentName(props.element) ||
-    componentName.value
-  );
+    props.element.survey as SurveyModel
+  ).getQuestionContentWrapperComponentName(props.element);
 });
 const contentComponentData = computed(() => {
   return {
-    componentName: componentName.value,
     componentData: {
       question: props.element,
       data: (
diff --git a/src/defaultV2-theme/blocks/sd-complex-element.scss b/src/defaultV2-theme/blocks/sd-complex-element.scss
index ae516b239d..4177069102 100644
--- a/src/defaultV2-theme/blocks/sd-complex-element.scss
+++ b/src/defaultV2-theme/blocks/sd-complex-element.scss
@@ -94,7 +94,7 @@
     padding-bottom: 0;
   }
 
-  &>.sd-question__content:first-child {
+  &>.sd-question__content:first-of-type {
     padding-top: var(--sd-base-padding);
   }
 
diff --git a/src/defaultV2-theme/blocks/sd-table.scss b/src/defaultV2-theme/blocks/sd-table.scss
index aca2ca9225..dbdb367bee 100644
--- a/src/defaultV2-theme/blocks/sd-table.scss
+++ b/src/defaultV2-theme/blocks/sd-table.scss
@@ -56,7 +56,7 @@
       }
 
       &>.sd-question__header {
-        &+.sd-question__content {
+        &~.sd-question__content {
           padding-top: calcSize(2);
 
           .sd-table--no-header {
@@ -83,11 +83,11 @@
       margin-top: calcSize(0);
     }
 
-    .sd-question--table>.sd-question__header+.sd-question__content .sd-table-wrapper .sd-table:not(.sd-table--no-header) {
+    .sd-question--table>.sd-question__header~.sd-question__content .sd-table-wrapper .sd-table:not(.sd-table--no-header) {
       margin-top: calcSize(1);
     }
 
-    &>.sd-row:not(:first-of-type) .sd-question--table>.sd-question__header+.sd-question__content .sd-table-wrapper .sd-table:not(.sd-table--no-header) {
+    &>.sd-row:not(:first-of-type) .sd-question--table>.sd-question__header~.sd-question__content .sd-table-wrapper .sd-table:not(.sd-table--no-header) {
       margin-top: calcSize(1);
     }
   }