diff --git a/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/add-polling-source.component.html b/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/add-polling-source.component.html
index 9c71e6f7c..66aef7305 100644
--- a/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/add-polling-source.component.html
+++ b/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/add-polling-source.component.html
@@ -2,7 +2,7 @@
     <div class="mt-4">
         <div class="border border-1 mt-4 px-2 py-4 rounded-3">
             <form [formGroup]="pollingSourceForm">
-                <mat-stepper [linear]="true" #stepper>
+                <mat-stepper linear #stepper>
                     <mat-step [stepControl]="fetchForm">
                         <ng-template matStepLabel>Fetch</ng-template>
                         <div class="container-step">
@@ -12,7 +12,9 @@
                                 [defaultKind]="FETCH_DEFAULT_KIND"
                                 [sectionName]="steps.FETCH"
                                 [eventYamlByHash]="eventYamlByHash"
-                                eventHistory
+                                [description]="
+                                    'Determines where data is sourced from'
+                                "
                             ></app-base-step>
                             <app-stepper-navigation
                                 [prevStep]="null"
@@ -22,7 +24,10 @@
                             ></app-stepper-navigation>
                         </div>
                     </mat-step>
-                    <mat-step [stepControl]="prepareForm" [optional]="false">
+                    <mat-step
+                        [stepControl]="prepareForm"
+                        errorMessage="Field is required"
+                    >
                         <ng-template matStepLabel>Prepare</ng-template>
                         <div class="container-step">
                             <app-prepare-step
@@ -46,6 +51,9 @@
                                 [defaultKind]="READ_DEFAULT_KIND"
                                 [sectionName]="steps.READ"
                                 [eventYamlByHash]="eventYamlByHash"
+                                [description]="
+                                    'Defines how data is read into structured format'
+                                "
                             ></app-base-step>
                             <app-stepper-navigation
                                 [prevStep]="steps.PREPARE"
@@ -55,7 +63,7 @@
                             ></app-stepper-navigation>
                         </div>
                     </mat-step>
-                    <mat-step>
+                    <mat-step [stepControl]="readForm">
                         <ng-template matStepLabel>Preprocess</ng-template>
                         <div class="container-step">
                             <app-preprocess-step
@@ -83,6 +91,9 @@
                                 [defaultKind]="MERGE_DEFAULT_KIND"
                                 [sectionName]="steps.MERGE"
                                 [eventYamlByHash]="eventYamlByHash"
+                                [description]="
+                                    'Determines how newly-ingested data should be merged with existing history'
+                                "
                             >
                                 <div
                                     *ngIf="errorMessage"
diff --git a/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/base-step/base-step.component.html b/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/base-step/base-step.component.html
index aa74d2c61..2d5967d34 100644
--- a/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/base-step/base-step.component.html
+++ b/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/base-step/base-step.component.html
@@ -2,6 +2,7 @@
     <h2 class="text-center">
         {{ title }}
     </h2>
+    <p class="text-center mb-4">{{ description }}</p>
     <app-select-kind-field
         [form]="sectionForm"
         [data]="sectionStepRadioData"
diff --git a/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/base-step/base-step.component.ts b/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/base-step/base-step.component.ts
index 1e498c303..fcbb44abf 100644
--- a/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/base-step/base-step.component.ts
+++ b/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/base-step/base-step.component.ts
@@ -36,6 +36,7 @@ export class BaseStepComponent extends BaseComponent implements OnInit {
     @Input() public sectionStepRadioData: RadioControlType[];
     @Input() public sectionFormData: JsonFormData;
     @Input() public defaultKind: string;
+    @Input() public description: string;
     @Input() public sectionName: SetPollingSourceSection;
     @Input() public eventYamlByHash: MaybeNull<string> = null;
     private editFormValue: EditFormType;
diff --git a/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/preprocess-step/preprocess-step.component.html b/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/preprocess-step/preprocess-step.component.html
index bf0ff6f12..04ccbef5d 100644
--- a/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/preprocess-step/preprocess-step.component.html
+++ b/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/preprocess-step/preprocess-step.component.html
@@ -1,4 +1,5 @@
 <h2 class="text-center">Preprocess</h2>
+<p class="text-center mb-4">Pre-processing query that shapes the data.</p>
 <div class="d-flex justify-content-center flex-column align-items-center mt-4">
     <div class="form-check">
         <input
diff --git a/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/preprocess-step/preprocess-step.component.ts b/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/preprocess-step/preprocess-step.component.ts
index 2f28b73dc..83723710c 100644
--- a/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/preprocess-step/preprocess-step.component.ts
+++ b/src/app/dataset-view/additional-components/metadata-component/components/add-polling-source/steps/preprocess-step/preprocess-step.component.ts
@@ -42,6 +42,8 @@ export class PreprocessStepComponent extends BaseComponent implements OnInit {
             } else {
                 this.initDefaultQueriesSection();
             }
+        } else {
+            this.initDefaultQueriesSection();
         }
     }
 
@@ -55,7 +57,9 @@ export class PreprocessStepComponent extends BaseComponent implements OnInit {
     }
 
     private initDefaultQueriesSection(query = ""): void {
+        console.log("2");
         if (!this.preprocessValue.queries.length) {
+            console.log("3");
             this.preprocessValue.queries.push({
                 alias: this.getDatasetInfoFromUrl().datasetName,
                 query,