diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
index a1d7a96e336250a9597c70ddc8833af212304ba7..c510901bc0c82e484de30d9e009289b9bc40a39b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
@@ -118,7 +118,7 @@ class ViewSchedulingUnit extends Component {
                 dataSizeOnDisk: "Data size on Disk",
                 subtaskContent: "Subtask Content",
                 tags: "Tags",
-                blueprint_draft: "BluePrint / Task Draft link",
+                blueprint_draft: this.props.match.params.type==="draft"?"Linked Blueprint": "Linked Draft",
                 url: "API URL",
                 created_at: {
                     name: "Created at",
@@ -148,7 +148,8 @@ class ViewSchedulingUnit extends Component {
                 "Data size": "filter-input-50",
                 "Data size on Disk": "filter-input-50",
                 "Subtask Content": "filter-input-75",
-                "BluePrint / Task Draft link": "filter-input-50",
+                "Linked Blueprint": "filter-input-50",
+                "Linked Draft": "filter-input-50"
             }],
             stationGroup: [],
             dialog: { header: 'Confirm', detail: 'Do you want to create a Scheduling Unit Blueprint?' },
@@ -376,6 +377,7 @@ class ViewSchedulingUnit extends Component {
         const columnDefinitionToRemove = type === 'blueprint' ?['scheduling_unit_draft']:['scheduling_unit_blueprint', 'status', 'status_logs', 'start_time', 'stop_time', 'subTaskID','noOfOutputProducts','size','dataSizeOnDisk','subtaskContent'];
         let tmpDefaulColumns = _.cloneDeep(this.state.defaultcolumns[0]);
         let tmpOptionalColumns = _.cloneDeep(this.state.optionalcolumns[0]);
+        tmpOptionalColumns.blueprint_draft = this.props.match.params.type==="draft"?"Linked Blueprint": "Linked Draft"
         let tmpColumnOrders = _.cloneDeep(this.state.columnOrders);
         tmpColumnOrders = _.differenceWith(tmpColumnOrders, columnOrderToRemove, _.isEqual);
         tmpDefaulColumns = _.omit(tmpDefaulColumns,columnDefinitionToRemove);
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
index a7d4dd8a4d1ae2632b0a2d82f686210a82e40e59..e7a843f10d1649867ca4fc8f23779a9774002f07 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
@@ -288,14 +288,7 @@ export class SchedulingUnitCreate extends Component {
         } else if (key === 'scheduling_set_id') {
             schedulingUnit[key] = value;
             let schedulingUnitList= await ScheduleService.getSchedulingBySet(value);
-            let observationIdSet = new Set(); 
-            if (schedulingUnitList && schedulingUnitList.length > 0) {
-                schedulingUnitList.forEach(schedulingUnit => {
-                    observationIdSet.add(schedulingUnit.observation_strategy_template_id);
-                });
-                this.setState({schedulingUnitList:schedulingUnitList});
-            }
-            observationIdSet = Array.from(observationIdSet);
+            let observationIdSet = _.uniq(_.map(schedulingUnitList, 'observation_strategy_template_id'));
             this.setState({observationIdSet: observationIdSet});
         } 
            else {
@@ -699,7 +692,7 @@ export class SchedulingUnitCreate extends Component {
                             <label htmlFor="observStrategy" className="col-lg-2 col-md-2 col-sm-12">Observation Strategy <span style={{color:'red'}}>*</span></label>
                             <div className="col-lg-3 col-md-3 col-sm-12" data-testid="observStrategy" >
                                 <Dropdown inputId="observStrategy" optionLabel="name" optionValue="id" 
-                                        tooltip="Observation Strategy Template to be used to create the Scheduling Unit and Tasks" tooltipOptions={this.tooltipOptions}
+                                        tooltip="Observation Strategy Template to be used to create the Scheduling Unit and Tasks. Strategies already used are highlighted in bold" tooltipOptions={this.tooltipOptions}
                                         value={this.state.observStrategy.id} 
                                         options={this.observStrategies} filter
                                         itemTemplate={this.observOptionTemplate}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js
index 4f8bf1199147bca5687695c7942a231d91e2a57d..c86dd2d82e70db422d45521482a48a5dd3e18f99 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js
@@ -2657,7 +2657,7 @@ export class SchedulingSetCreate extends Component {
                                 <label htmlFor="observStrategy" className="col-lg-2 col-md-2 col-sm-12">Observation Strategy <span style={{color:'red'}}>*</span></label>
                                 <div className="col-lg-3 col-md-3 col-sm-12" data-testid="observStrategy" >
                                     <Dropdown inputId="observStrategy" optionLabel="name" optionValue="id" 
-                                            tooltip="Observation Strategy Template to be used to create the Scheduling Unit, Strategies used in the Scheduling Set are in bold" tooltipOptions={this.tooltipOptions}
+                                            tooltip="Observation Strategy Template to be used to create the Scheduling Unit. Strategies already used in the Scheduling Set are in bold" tooltipOptions={this.tooltipOptions}
                                             value={this.state.observStrategy.id} 
                                             options={this.observStrategies} filter
                                             itemTemplate={this.observOptionTemplate}