diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Responsive_Telescope_HBA_LoTSS-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Responsive_Telescope_HBA_LoTSS-1.json
index f6d8ca5fe91f4834fe9508b6c7b8d90a2d7e31a6..a037d704e927a8452ed3a4840c9bbd730e487e69 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Responsive_Telescope_HBA_LoTSS-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Responsive_Telescope_HBA_LoTSS-1.json
@@ -6,581 +6,572 @@
     "version": 1
   },
   "template": {
-    "description": "This observation strategy template defines a similar observation strategy as for LoTSS, but then with a single Calibrator at the end so that the Target Observation can start immediately once the trigger is submitted.",
-    "name": "Responsive Telescope HBA LoTSS",
-    "scheduling_unit_template": {
-      "name": "scheduling unit",
-      "version": 1
+    "parameters": [
+      {
+        "name": "Scheduling Constraints",
+        "refs": [
+          "#/scheduling_constraints_doc/time"
+        ]
+      },
+      {
+        "name": "Target Name",
+        "refs": [
+          "#/tasks/Target Observation/specifications_doc/SAPs/0/name"
+        ]
+      },
+      {
+        "name": "Target Pointing",
+        "refs": [
+          "#/tasks/Target Observation/specifications_doc/SAPs/0/digital_pointing"
+        ]
+      },
+      {
+        "name": "Subbands",
+        "refs": [
+          "#/tasks/Target Observation/specifications_doc/SAPs/0/subbands"
+        ]
+      },
+      {
+        "name": "Tile Beam",
+        "refs": [
+          "#/tasks/Target Observation/specifications_doc/tile_beam"
+        ]
+      },
+      {
+        "name": "Target Duration",
+        "refs": [
+          "#/tasks/Target Observation/specifications_doc/duration"
+        ]
+      },
+      {
+        "name": "Calibrator Name",
+        "refs": [
+          "#/tasks/Calibrator Observation 2/specifications_doc/name"
+        ]
+      },
+      {
+        "name": "Calibrator Pointing",
+        "refs": [
+          "#/tasks/Calibrator Observation 2/specifications_doc/pointing"
+        ]
+      },
+      {
+        "name": "Calibrator Duration",
+        "refs": [
+          "#/tasks/Calibrator Observation 2/specifications_doc/duration"
+        ]
+      }
+    ],
+    "scheduling_constraints_doc": {
+      "sky": {
+        "transit_offset": {
+          "from": -86400,
+          "to": 86400
+        }
+      },
+      "time": {
+        "between": []
+      }
     },
-    "template": {
-      "parameters": [
-        {
-          "name": "Scheduling Constraints",
-          "refs": [
-            "#/scheduling_constraints_doc/time"
-          ]
+    "scheduling_constraints_template": "constraints",
+    "task_relations": [
+      {
+        "consumer": "Calibrator Pipeline",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
         },
-        {
-          "name": "Target Name",
-          "refs": [
-            "#/tasks/Target Observation/specifications_doc/SAPs/0/name"
-          ]
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
         },
-        {
-          "name": "Target Pointing",
-          "refs": [
-            "#/tasks/Target Observation/specifications_doc/SAPs/0/digital_pointing"
-          ]
+        "producer": "Calibrator Observation",
+        "selection_doc": {},
+        "selection_template": "all",
+        "tags": []
+      },
+      {
+        "consumer": "Target Pipeline",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
         },
-        {
-          "name": "Subbands",
-          "refs": [
-            "#/tasks/Target Observation/specifications_doc/SAPs/0/subbands"
-          ]
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "correlator"
         },
-        {
-          "name": "Tile Beam",
-          "refs": [
-            "#/tasks/Target Observation/specifications_doc/tile_beam"
+        "producer": "Target Observation",
+        "selection_doc": {
+          "sap": [
+            "target1"
           ]
         },
-        {
-          "name": "Target Duration",
-          "refs": [
-            "#/tasks/Target Observation/specifications_doc/duration"
-          ]
+        "selection_template": "SAP",
+        "tags": []
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
         },
-        {
-          "name": "Calibrator Name",
-          "refs": [
-            "#/tasks/Calibrator Observation 2/specifications_doc/name"
-          ]
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
         },
-        {
-          "name": "Calibrator Pointing",
-          "refs": [
-            "#/tasks/Calibrator Observation 2/specifications_doc/pointing"
-          ]
+        "producer": "Calibrator Pipeline",
+        "selection_doc": {},
+        "selection_template": "all",
+        "tags": []
+      },
+      {
+        "consumer": "Ingest",
+        "input": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
         },
-        {
-          "name": "Calibrator Duration",
-          "refs": [
-            "#/tasks/Calibrator Observation 2/specifications_doc/duration"
-          ]
-        }
-      ],
-      "scheduling_constraints_doc": {
-        "sky": {
-          "transit_offset": {
-            "from": -86400,
-            "to": 86400
+        "output": {
+          "dataformat": "MeasurementSet",
+          "datatype": "visibilities",
+          "role": "any"
+        },
+        "producer": "Target Pipeline",
+        "selection_doc": {},
+        "selection_template": "all",
+        "tags": []
+      }
+    ],
+    "task_scheduling_relations": [
+      {
+        "first": "Calibrator Observation",
+        "placement": "after",
+        "second": "Target Observation",
+        "time_offset": 60
+      }
+    ],
+    "tasks": {
+      "Calibrator Observation": {
+        "description": "Calibrator Observation after Target Observation",
+        "specifications_doc": {
+          "autoselect": false,
+          "duration": 600,
+          "name": "calibrator",
+          "pointing": {
+            "angle1": 0.6624317181687094,
+            "angle2": 1.5579526427549426,
+            "direction_type": "J2000",
+            "target": "PXXX+YY"
           }
         },
-        "time": {
-          "between": []
-        }
-      },
-      "scheduling_constraints_template": "constraints",
-      "task_relations": [
-        {
-          "consumer": "Calibrator Pipeline",
-          "input": {
-            "dataformat": "MeasurementSet",
-            "datatype": "visibilities",
-            "role": "any"
-          },
-          "output": {
-            "dataformat": "MeasurementSet",
-            "datatype": "visibilities",
-            "role": "correlator"
-          },
-          "producer": "Calibrator Observation",
-          "selection_doc": {},
-          "selection_template": "all",
-          "tags": []
+        "specifications_template": {
+          "name": "calibrator observation"
         },
-        {
-          "consumer": "Target Pipeline",
-          "input": {
-            "dataformat": "MeasurementSet",
-            "datatype": "visibilities",
-            "role": "any"
+        "tags": []
+      },
+      "Calibrator Pipeline": {
+        "description": "Preprocessing Pipeline for Calibrator Observation",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 4,
+            "time_steps": 1
           },
-          "output": {
-            "dataformat": "MeasurementSet",
-            "datatype": "visibilities",
-            "role": "correlator"
+          "demix": {
+            "frequency_steps": 64,
+            "ignore_target": false,
+            "sources": {},
+            "time_steps": 10
           },
-          "producer": "Target Observation",
-          "selection_doc": {
-            "sap": [
-              "target1"
-            ]
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "HBAdefault"
           },
-          "selection_template": "SAP",
-          "tags": []
+          "storagemanager": "dysco"
         },
-        {
-          "consumer": "Ingest",
-          "input": {
-            "dataformat": "MeasurementSet",
-            "datatype": "visibilities",
-            "role": "any"
-          },
-          "output": {
-            "dataformat": "MeasurementSet",
-            "datatype": "visibilities",
-            "role": "any"
-          },
-          "producer": "Calibrator Pipeline",
-          "selection_doc": {},
-          "selection_template": "all",
-          "tags": []
+        "specifications_template": {
+          "name": "preprocessing pipeline"
         },
-        {
-          "consumer": "Ingest",
-          "input": {
-            "dataformat": "MeasurementSet",
-            "datatype": "visibilities",
-            "role": "any"
-          },
-          "output": {
-            "dataformat": "MeasurementSet",
-            "datatype": "visibilities",
-            "role": "any"
-          },
-          "producer": "Target Pipeline",
-          "selection_doc": {},
-          "selection_template": "all",
-          "tags": []
-        }
-      ],
-      "task_scheduling_relations": [
-        {
-          "first": "Calibrator Observation",
-          "placement": "after",
-          "second": "Target Observation",
-          "time_offset": 60
-        }
-      ],
-      "tasks": {
-        "Calibrator Observation": {
-          "description": "Calibrator Observation after Target Observation",
-          "specifications_doc": {
-            "autoselect": false,
-            "duration": 600,
-            "name": "calibrator",
-            "pointing": {
-              "angle1": 0.6624317181687094,
-              "angle2": 1.5579526427549426,
-              "direction_type": "J2000",
-              "target": "PXXX+YY"
-            }
-          },
-          "specifications_template": {
-            "name": "calibrator observation"
-          },
-          "tags": []
+        "tags": []
+      },
+      "Ingest": {
+        "description": "Ingest all preprocessed dataproducts",
+        "specifications_doc": {},
+        "specifications_template": {
+          "name": "ingest"
         },
-        "Calibrator Pipeline": {
-          "description": "Preprocessing Pipeline for Calibrator Observation",
-          "specifications_doc": {
-            "average": {
-              "frequency_steps": 4,
-              "time_steps": 1
-            },
-            "demix": {
-              "frequency_steps": 64,
-              "ignore_target": false,
-              "sources": {},
-              "time_steps": 10
-            },
-            "flag": {
-              "autocorrelations": true,
-              "outerchannels": true,
-              "rfi_strategy": "HBAdefault"
+        "tags": []
+      },
+      "Target Observation": {
+        "description": "Target Observation",
+        "specifications_doc": {
+          "QA": {
+            "file_conversion": {
+              "enabled": true,
+              "nr_of_subbands": -1,
+              "nr_of_timestamps": 256
             },
-            "storagemanager": "dysco"
-          },
-          "specifications_template": {
-            "name": "preprocessing pipeline"
-          },
-          "tags": []
-        },
-        "Ingest": {
-          "description": "Ingest all preprocessed dataproducts",
-          "specifications_doc": {},
-          "specifications_template": {
-            "name": "ingest"
+            "inspection_plots": "msplots",
+            "plots": {
+              "autocorrelation": true,
+              "crosscorrelation": true,
+              "enabled": true
+            }
           },
-          "tags": []
-        },
-        "Target Observation": {
-          "description": "Target Observation",
-          "specifications_doc": {
-            "QA": {
-              "file_conversion": {
-                "enabled": true,
-                "nr_of_subbands": -1,
-                "nr_of_timestamps": 256
+          "SAPs": [
+            {
+              "digital_pointing": {
+                "angle1": 0.6624317181687094,
+                "angle2": 1.5579526427549426,
+                "direction_type": "J2000",
+                "target": "PXXX+YY"
               },
-              "inspection_plots": "msplots",
-              "plots": {
-                "autocorrelation": true,
-                "crosscorrelation": true,
-                "enabled": true
-              }
-            },
-            "SAPs": [
-              {
-                "digital_pointing": {
-                  "angle1": 0.6624317181687094,
-                  "angle2": 1.5579526427549426,
-                  "direction_type": "J2000",
-                  "target": "PXXX+YY"
-                },
-                "name": "target",
-                "subbands": [
-                  104,
-                  105,
-                  106,
-                  107,
-                  108,
-                  109,
-                  110,
-                  111,
-                  112,
-                  113,
-                  114,
-                  115,
-                  116,
-                  117,
-                  118,
-                  119,
-                  120,
-                  121,
-                  122,
-                  123,
-                  124,
-                  125,
-                  126,
-                  127,
-                  128,
-                  129,
-                  130,
-                  131,
-                  132,
-                  133,
-                  134,
-                  135,
-                  136,
-                  137,
-                  138,
-                  139,
-                  140,
-                  141,
-                  142,
-                  143,
-                  144,
-                  145,
-                  146,
-                  147,
-                  148,
-                  149,
-                  150,
-                  151,
-                  152,
-                  153,
-                  154,
-                  155,
-                  156,
-                  157,
-                  158,
-                  159,
-                  160,
-                  161,
-                  162,
-                  163,
-                  164,
-                  165,
-                  166,
-                  167,
-                  168,
-                  169,
-                  170,
-                  171,
-                  172,
-                  173,
-                  174,
-                  175,
-                  176,
-                  177,
-                  178,
-                  179,
-                  180,
-                  181,
-                  182,
-                  183,
-                  184,
-                  185,
-                  186,
-                  187,
-                  188,
-                  189,
-                  190,
-                  191,
-                  192,
-                  193,
-                  194,
-                  195,
-                  196,
-                  197,
-                  198,
-                  199,
-                  200,
-                  201,
-                  202,
-                  203,
-                  204,
-                  205,
-                  206,
-                  207,
-                  208,
-                  209,
-                  210,
-                  211,
-                  212,
-                  213,
-                  214,
-                  215,
-                  216,
-                  217,
-                  218,
-                  219,
-                  220,
-                  221,
-                  222,
-                  223,
-                  224,
-                  225,
-                  226,
-                  227,
-                  228,
-                  229,
-                  230,
-                  231,
-                  232,
-                  233,
-                  234,
-                  235,
-                  236,
-                  237,
-                  238,
-                  239,
-                  240,
-                  241,
-                  242,
-                  243,
-                  244,
-                  245,
-                  246,
-                  247,
-                  248,
-                  249,
-                  250,
-                  251,
-                  252,
-                  253,
-                  254,
-                  255,
-                  256,
-                  257,
-                  258,
-                  259,
-                  260,
-                  261,
-                  262,
-                  263,
-                  264,
-                  265,
-                  266,
-                  267,
-                  268,
-                  269,
-                  270,
-                  271,
-                  272,
-                  273,
-                  274,
-                  275,
-                  276,
-                  277,
-                  278,
-                  279,
-                  280,
-                  281,
-                  282,
-                  283,
-                  284,
-                  285,
-                  286,
-                  287,
-                  288,
-                  289,
-                  290,
-                  291,
-                  292,
-                  293,
-                  294,
-                  295,
-                  296,
-                  297,
-                  298,
-                  299,
-                  300,
-                  301,
-                  302,
-                  303,
-                  304,
-                  305,
-                  306,
-                  307,
-                  308,
-                  309,
-                  310,
-                  311,
-                  312,
-                  313,
-                  314,
-                  315,
-                  316,
-                  317,
-                  318,
-                  319,
-                  320,
-                  321,
-                  322,
-                  323,
-                  324,
-                  325,
-                  326,
-                  327,
-                  328,
-                  329,
-                  330,
-                  331,
-                  332,
-                  333,
-                  334,
-                  335,
-                  336,
-                  337,
-                  338,
-                  339,
-                  340,
-                  341,
-                  342,
-                  343,
-                  344,
-                  345,
-                  346,
-                  347
-                ]
-              }
-            ],
-            "antenna_set": "HBA_DUAL_INNER",
-            "correlator": {
-              "channels_per_subband": 64,
-              "integration_time": 1,
-              "storage_cluster": "CEP4"
-            },
-            "duration": 7200,
-            "filter": "HBA_110_190",
-            "station_groups": [
-              {
-                "max_nr_missing": 4,
-                "stations": [
-                  "CS001",
-                  "CS002",
-                  "CS003",
-                  "CS004",
-                  "CS005",
-                  "CS006",
-                  "CS007",
-                  "CS011",
-                  "CS013",
-                  "CS017",
-                  "CS021",
-                  "CS024",
-                  "CS026",
-                  "CS028",
-                  "CS030",
-                  "CS031",
-                  "CS032",
-                  "CS101",
-                  "CS103",
-                  "CS201",
-                  "CS301",
-                  "CS302",
-                  "CS401",
-                  "CS501",
-                  "RS106",
-                  "RS205",
-                  "RS208",
-                  "RS210",
-                  "RS305",
-                  "RS306",
-                  "RS307",
-                  "RS310",
-                  "RS406",
-                  "RS407",
-                  "RS409",
-                  "RS503",
-                  "RS508",
-                  "RS509"
-                ]
-              }
-            ],
-            "tile_beam": {
-              "angle1": 0.6624317181687094,
-              "angle2": 1.5579526427549426,
-              "direction_type": "J2000",
-              "target": "PXXX+YY"
+              "name": "target",
+              "subbands": [
+                104,
+                105,
+                106,
+                107,
+                108,
+                109,
+                110,
+                111,
+                112,
+                113,
+                114,
+                115,
+                116,
+                117,
+                118,
+                119,
+                120,
+                121,
+                122,
+                123,
+                124,
+                125,
+                126,
+                127,
+                128,
+                129,
+                130,
+                131,
+                132,
+                133,
+                134,
+                135,
+                136,
+                137,
+                138,
+                139,
+                140,
+                141,
+                142,
+                143,
+                144,
+                145,
+                146,
+                147,
+                148,
+                149,
+                150,
+                151,
+                152,
+                153,
+                154,
+                155,
+                156,
+                157,
+                158,
+                159,
+                160,
+                161,
+                162,
+                163,
+                164,
+                165,
+                166,
+                167,
+                168,
+                169,
+                170,
+                171,
+                172,
+                173,
+                174,
+                175,
+                176,
+                177,
+                178,
+                179,
+                180,
+                181,
+                182,
+                183,
+                184,
+                185,
+                186,
+                187,
+                188,
+                189,
+                190,
+                191,
+                192,
+                193,
+                194,
+                195,
+                196,
+                197,
+                198,
+                199,
+                200,
+                201,
+                202,
+                203,
+                204,
+                205,
+                206,
+                207,
+                208,
+                209,
+                210,
+                211,
+                212,
+                213,
+                214,
+                215,
+                216,
+                217,
+                218,
+                219,
+                220,
+                221,
+                222,
+                223,
+                224,
+                225,
+                226,
+                227,
+                228,
+                229,
+                230,
+                231,
+                232,
+                233,
+                234,
+                235,
+                236,
+                237,
+                238,
+                239,
+                240,
+                241,
+                242,
+                243,
+                244,
+                245,
+                246,
+                247,
+                248,
+                249,
+                250,
+                251,
+                252,
+                253,
+                254,
+                255,
+                256,
+                257,
+                258,
+                259,
+                260,
+                261,
+                262,
+                263,
+                264,
+                265,
+                266,
+                267,
+                268,
+                269,
+                270,
+                271,
+                272,
+                273,
+                274,
+                275,
+                276,
+                277,
+                278,
+                279,
+                280,
+                281,
+                282,
+                283,
+                284,
+                285,
+                286,
+                287,
+                288,
+                289,
+                290,
+                291,
+                292,
+                293,
+                294,
+                295,
+                296,
+                297,
+                298,
+                299,
+                300,
+                301,
+                302,
+                303,
+                304,
+                305,
+                306,
+                307,
+                308,
+                309,
+                310,
+                311,
+                312,
+                313,
+                314,
+                315,
+                316,
+                317,
+                318,
+                319,
+                320,
+                321,
+                322,
+                323,
+                324,
+                325,
+                326,
+                327,
+                328,
+                329,
+                330,
+                331,
+                332,
+                333,
+                334,
+                335,
+                336,
+                337,
+                338,
+                339,
+                340,
+                341,
+                342,
+                343,
+                344,
+                345,
+                346,
+                347
+              ]
             }
+          ],
+          "antenna_set": "HBA_DUAL_INNER",
+          "correlator": {
+            "channels_per_subband": 64,
+            "integration_time": 1,
+            "storage_cluster": "CEP4"
           },
-          "specifications_template": {
-            "name": "target observation"
-          },
-          "tags": []
+          "duration": 7200,
+          "filter": "HBA_110_190",
+          "station_groups": [
+            {
+              "max_nr_missing": 4,
+              "stations": [
+                "CS001",
+                "CS002",
+                "CS003",
+                "CS004",
+                "CS005",
+                "CS006",
+                "CS007",
+                "CS011",
+                "CS013",
+                "CS017",
+                "CS021",
+                "CS024",
+                "CS026",
+                "CS028",
+                "CS030",
+                "CS031",
+                "CS032",
+                "CS101",
+                "CS103",
+                "CS201",
+                "CS301",
+                "CS302",
+                "CS401",
+                "CS501",
+                "RS106",
+                "RS205",
+                "RS208",
+                "RS210",
+                "RS305",
+                "RS306",
+                "RS307",
+                "RS310",
+                "RS406",
+                "RS407",
+                "RS409",
+                "RS503",
+                "RS508",
+                "RS509"
+              ]
+            }
+          ],
+          "tile_beam": {
+            "angle1": 0.6624317181687094,
+            "angle2": 1.5579526427549426,
+            "direction_type": "J2000",
+            "target": "PXXX+YY"
+          }
         },
-        "Target Pipeline": {
-          "description": "Preprocessing Pipeline for Target Observation",
-          "specifications_doc": {
-            "average": {
-              "frequency_steps": 4,
-              "time_steps": 1
-            },
-            "demix": {
-              "frequency_steps": 64,
-              "ignore_target": false,
-              "sources": {},
-              "time_steps": 10
-            },
-            "flag": {
-              "autocorrelations": true,
-              "outerchannels": true,
-              "rfi_strategy": "HBAdefault"
-            },
-            "storagemanager": "dysco"
+        "specifications_template": {
+          "name": "target observation"
+        },
+        "tags": []
+      },
+      "Target Pipeline": {
+        "description": "Preprocessing Pipeline for Target Observation",
+        "specifications_doc": {
+          "average": {
+            "frequency_steps": 4,
+            "time_steps": 1
           },
-          "specifications_template": {
-            "name": "preprocessing pipeline"
+          "demix": {
+            "frequency_steps": 64,
+            "ignore_target": false,
+            "sources": {},
+            "time_steps": 10
           },
-          "tags": []
-        }
+          "flag": {
+            "autocorrelations": true,
+            "outerchannels": true,
+            "rfi_strategy": "HBAdefault"
+          },
+          "storagemanager": "dysco"
+        },
+        "specifications_template": {
+          "name": "preprocessing pipeline"
+        },
+        "tags": []
       }
-    },
-    "version": 1
+    }
   },
   "version": 1
 }
\ No newline at end of file