diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-pulsar_pipeline-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-pulsar_pipeline-1.json
index 90516f0c5087a4d023fbd2127ae36bcb86288fb6..256b033c1d034bfda4f110014a7886b891242e05 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-pulsar_pipeline-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-pulsar_pipeline-1.json
@@ -176,31 +176,31 @@
               "type": "boolean",
               "default": true
             }
-          },
-          "filterbank": {
-            "title": "Create filter bank",
-            "type": "object",
-            "default": {},
-            "additionalProperties": false,
-            "properties": {
-              "enabled": {
-                "type": "boolean",
-                "title": "Enabled",
-                "default": false
-              },
-              "frequency_channels": {
-                "title": "Frequency channels",
-                "description": "Number of frequency channels (multiple of subbands/part)",
-                "type": "integer",
-                "minimum": 1,
-                "maximum": 512,
-                "default": 120
-              },
-              "coherent_dedispersion": {
-                "title": "Coherent Dedispersion",
-                "type": "boolean",
-                "default": true
-              }
+          }
+        },
+        "filterbank": {
+          "title": "Create filter bank",
+          "type": "object",
+          "default": {},
+          "additionalProperties": false,
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "title": "Enabled",
+              "default": false
+            },
+            "frequency_channels": {
+              "title": "Frequency channels",
+              "description": "Number of frequency channels (multiple of subbands/part)",
+              "type": "integer",
+              "minimum": 1,
+              "maximum": 512,
+              "default": 120
+            },
+            "coherent_dedispersion": {
+              "title": "Coherent Dedispersion",
+              "type": "boolean",
+              "default": true
             }
           }
         },
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py b/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py
index 9eca785afc4200bc89e5d9f399affcb8a678a5ff..a697ba433def94e4783fdec5fd16b451d5de61a1 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py
@@ -2042,12 +2042,14 @@ def _generate_subtask_specs_from_pulsar_pipeline_task_specs(pipeline_task_specs,
 
     # DSPSR
     dspsr_specs = pipeline_task_specs["dspsr"]
+    digifil_specs = dspsr_specs["digifil"]
+    filterbank_specs = dspsr_specs["filterbank"]
     subtask_specs["dspsr"] = {}
     subtask_specs["dspsr"]["skip_dspsr"]           = not dspsr_specs["enabled"]
     subtask_specs["dspsr"]["digifil_extra_opts"]   = " ".join([
-              "-D {dm}".format(**dspsr_specs) if dspsr_specs["digifil"]["dm"] != -1 else "",
-              "-t {integration_time}".format(**dspsr_specs),
-              "-f {frequency_channels}{dedispersion}".format(**dspsr_specs, dedispersion=":D" if dspsr_specs["digifil"]["coherent_dedispersion"] else ""),
+              "-D {dm}".format(**digifil_specs) if digifil_specs["dm"] != -1 else "",
+              "-t {integration_time}".format(**digifil_specs),
+              "-f {frequency_channels}{dedispersion}".format(**digifil_specs, dedispersion=":D" if digifil_specs["coherent_dedispersion"] else ""),
               ])
 
     subtask_specs["dspsr"]["nopdmp"]               = not dspsr_specs["optimise_period_dm"]
@@ -2056,7 +2058,7 @@ def _generate_subtask_specs_from_pulsar_pipeline_task_specs(pipeline_task_specs,
     subtask_specs["dspsr"]["dspsr_extra_opts"]     = " ".join([
               "-U minX1 -t 1", # minimise memory usage, and use 1 thread
               "-s -K" if dspsr_specs["single_pulse_subintegration"] else "",
-              "-F {frequency_channels}{dedispersion}".format(**dspsr_specs["filterbank"], dedispersion=":D" if dspsr_specs["coherent_dedispersion"] else "") if dspsr_specs["filterbank"]["enabled"] else "",
+              "-F {frequency_channels}{dedispersion}".format(**filterbank_specs, dedispersion=":D" if filterbank_specs["coherent_dedispersion"] else "") if filterbank_specs["enabled"] else "",
               ])
 
     # output