diff --git a/DATA/production/qc-async/mft.json b/DATA/production/qc-async/mft.json
index d055da0d8..d5dd315fe 100644
--- a/DATA/production/qc-async/mft.json
+++ b/DATA/production/qc-async/mft.json
@@ -37,20 +37,21 @@
         },
         "movingWindows": [ "mClustersROFSize" ],
         "taskParameters": {
+          "onlineQC" : "0",
           "maxClusterROFSize" : "50000",
           "maxDuration" : "60000",
           "timeBinSize" : "0.1",
           "ROFLengthInBC" : "594"
         },
-	"grpGeomRequest" : {
-          "geomRequest": "Aligned",
-          "askGRPECS": "false",
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
           "askGRPLHCIF": "false",
-          "askGRPMagField": "true",
+          "askGRPMagField": "false",
           "askMatLUT": "false",
           "askTime": "false",
-          "askOnceAllButField": "true",
-          "needPropagatorD":  "false"
+          "askOnceAllButField": "false",
+          "needPropagatorD": "false"
         }
       },
       "MFTTracks": {
@@ -74,6 +75,16 @@
           "MaxClusterROFSize": "50000",
           "MaxDuration": "60000",
           "TimeBinSize": "0.1"
+        },
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
+          "askGRPLHCIF": "false",
+          "askGRPMagField": "false",
+          "askMatLUT": "false",
+          "askTime": "false",
+          "askOnceAllButField": "false",
+          "needPropagatorD": "false"
         }
       }
     },
diff --git a/DATA/production/qc-sync/mft-full-no-tracks.json b/DATA/production/qc-sync/mft-full-no-tracks.json
index 6087535a8..6e78d3bd9 100644
--- a/DATA/production/qc-sync/mft-full-no-tracks.json
+++ b/DATA/production/qc-sync/mft-full-no-tracks.json
@@ -58,6 +58,16 @@
           "timeBinSize" : "0.1",
           "ROFLengthInBC" : "594"
         },
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
+          "askGRPLHCIF": "false",
+          "askGRPMagField": "false",
+          "askMatLUT": "false",
+          "askTime": "false",
+          "askOnceAllButField": "false",
+          "needPropagatorD": "false"
+        },
         "location": "local",
         "localMachines" : [ "flp" ], 
         "remoteMachine": "any",
@@ -75,21 +85,22 @@
           "name": "mft-clusters"
         },
         "taskParameters" : {
+          "onlineQC" : "1",
           "maxClusterROFSize" : "50000",
           "maxDuration" : "60000",
           "timeBinSize" : "0.1",
           "ROFLengthInBC" : "594"
         },
-	"grpGeomRequest" : {
-          "geomRequest": "Aligned",
-          "askGRPECS": "false",
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
           "askGRPLHCIF": "false",
-          "askGRPMagField": "true",
+          "askGRPMagField": "false",
           "askMatLUT": "false",
           "askTime": "false",
-          "askOnceAllButField": "true",
-            "needPropagatorD":  "false"
-	},
+          "askOnceAllButField": "false",
+          "needPropagatorD": "false"
+        },
         "location": "local",
         "localMachines": [
           "epn", "localhost"
diff --git a/DATA/production/qc-sync/mft-full.json b/DATA/production/qc-sync/mft-full.json
index 5a446e3e5..5da86f79c 100644
--- a/DATA/production/qc-sync/mft-full.json
+++ b/DATA/production/qc-sync/mft-full.json
@@ -58,6 +58,16 @@
           "timeBinSize" : "0.1",
           "ROFLengthInBC" : "594"
         },
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
+          "askGRPLHCIF": "false",
+          "askGRPMagField": "false",
+          "askMatLUT": "false",
+          "askTime": "false",
+          "askOnceAllButField": "false",
+          "needPropagatorD": "false"
+        },
         "location": "local",
         "localMachines" : [ "flp" ], 
         "remoteMachine": "any",
@@ -75,21 +85,22 @@
           "name": "mft-clusters"
         },
         "taskParameters" : {
+          "onlineQC" : "1",
           "maxClusterROFSize" : "50000",
           "maxDuration" : "60000",
           "timeBinSize" : "0.1",
           "ROFLengthInBC" : "594"
         },
-	"grpGeomRequest" : {
-          "geomRequest": "Aligned",
-          "askGRPECS": "false",
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
           "askGRPLHCIF": "false",
-          "askGRPMagField": "true",
+          "askGRPMagField": "false",
           "askMatLUT": "false",
           "askTime": "false",
-          "askOnceAllButField": "true",
-            "needPropagatorD":  "false"
-	},
+          "askOnceAllButField": "false",
+          "needPropagatorD": "false"
+        },
         "location": "local",
         "localMachines": [
           "epn", "localhost"
@@ -109,6 +120,16 @@
           "type" : "direct",
           "query" : "tracks:MFT/TRACKS/0;tracksrofs:MFT/MFTTrackROF/0;clustersrofs:MFT/CLUSTERSROF/0"
         },
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
+          "askGRPLHCIF": "false",
+          "askGRPMagField": "false",
+          "askMatLUT": "false",
+          "askTime": "false",
+          "askOnceAllButField": "false",
+          "needPropagatorD": "false"
+        },
         "location": "local",
         "localMachines": [
           "epn", "localhost"
diff --git a/MC/config/QC/json/mft-clusters.json b/MC/config/QC/json/mft-clusters.json
index ba03a1e9d..f58c9d38f 100644
--- a/MC/config/QC/json/mft-clusters.json
+++ b/MC/config/QC/json/mft-clusters.json
@@ -39,19 +39,20 @@
           "query": "randomcluster:MFT/COMPCLUSTERS/0;clustersrof:MFT/CLUSTERSROF/0;patterns:MFT/PATTERNS/0;cldict:MFT/CLUSDICT/0?lifetime=condition&ccdb-path=MFT/Calib/ClusterDictionary"
         },
         "taskParameters": {
+          "onlineQC" : "0",
           "maxClusterROFSize": "50000",
           "maxDuration": "60000",
           "timeBinSize": "0.1",
           "ROFLengthInBC": "594"
         },
-        "grpGeomRequest": {
-          "geomRequest": "Aligned",
-          "askGRPECS": "false",
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
           "askGRPLHCIF": "false",
-          "askGRPMagField": "true",
+          "askGRPMagField": "false",
           "askMatLUT": "false",
           "askTime": "false",
-          "askOnceAllButField": "true",
+          "askOnceAllButField": "false",
           "needPropagatorD": "false"
         },
         "location": "remote"
diff --git a/MC/config/QC/json/mft-digits-0.json b/MC/config/QC/json/mft-digits-0.json
index c23beec15..215b86758 100644
--- a/MC/config/QC/json/mft-digits-0.json
+++ b/MC/config/QC/json/mft-digits-0.json
@@ -46,6 +46,16 @@
           "timeBinSize": "0.1",
           "ROFLengthInBC": "594"
         },
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
+          "askGRPLHCIF": "false",
+          "askGRPMagField": "false",
+          "askMatLUT": "false",
+          "askTime": "false",
+          "askOnceAllButField": "false",
+          "needPropagatorD": "false"
+        },
         "location": "remote"
       }
     },
diff --git a/MC/config/QC/json/mft-digits-1.json b/MC/config/QC/json/mft-digits-1.json
index 59d3ea277..13f5260b6 100644
--- a/MC/config/QC/json/mft-digits-1.json
+++ b/MC/config/QC/json/mft-digits-1.json
@@ -46,6 +46,16 @@
           "timeBinSize": "0.1",
           "ROFLengthInBC": "594"
         },
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
+          "askGRPLHCIF": "false",
+          "askGRPMagField": "false",
+          "askMatLUT": "false",
+          "askTime": "false",
+          "askOnceAllButField": "false",
+          "needPropagatorD": "false"
+        },
         "location": "remote"
       }
     },
diff --git a/MC/config/QC/json/mft-digits-2.json b/MC/config/QC/json/mft-digits-2.json
index 8ae2a2d58..ace3733ff 100644
--- a/MC/config/QC/json/mft-digits-2.json
+++ b/MC/config/QC/json/mft-digits-2.json
@@ -46,6 +46,16 @@
           "timeBinSize": "0.1",
           "ROFLengthInBC": "594"
         },
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
+          "askGRPLHCIF": "false",
+          "askGRPMagField": "false",
+          "askMatLUT": "false",
+          "askTime": "false",
+          "askOnceAllButField": "false",
+          "needPropagatorD": "false"
+        },
         "location": "remote"
       }
     },
diff --git a/MC/config/QC/json/mft-digits-3.json b/MC/config/QC/json/mft-digits-3.json
index 287edbb97..cd5362d70 100644
--- a/MC/config/QC/json/mft-digits-3.json
+++ b/MC/config/QC/json/mft-digits-3.json
@@ -46,6 +46,16 @@
           "timeBinSize": "0.1",
           "ROFLengthInBC": "594"
         },
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
+          "askGRPLHCIF": "false",
+          "askGRPMagField": "false",
+          "askMatLUT": "false",
+          "askTime": "false",
+          "askOnceAllButField": "false",
+          "needPropagatorD": "false"
+        },
         "location": "remote"
       }
     },
diff --git a/MC/config/QC/json/mft-digits-4.json b/MC/config/QC/json/mft-digits-4.json
index a544794ce..156cf3391 100644
--- a/MC/config/QC/json/mft-digits-4.json
+++ b/MC/config/QC/json/mft-digits-4.json
@@ -46,6 +46,16 @@
           "timeBinSize": "0.1",
           "ROFLengthInBC": "594"
         },
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
+          "askGRPLHCIF": "false",
+          "askGRPMagField": "false",
+          "askMatLUT": "false",
+          "askTime": "false",
+          "askOnceAllButField": "false",
+          "needPropagatorD": "false"
+        },
         "location": "remote"
       }
     },
diff --git a/MC/config/QC/json/mft-tracks.json b/MC/config/QC/json/mft-tracks.json
index 718c1e581..e71d94416 100644
--- a/MC/config/QC/json/mft-tracks.json
+++ b/MC/config/QC/json/mft-tracks.json
@@ -44,6 +44,16 @@
           "MaxDuration": "60000",
           "TimeBinSize": "0.1"
         },
+        "grpGeomRequest" : {
+          "geomRequest": "None",
+          "askGRPECS": "true",
+          "askGRPLHCIF": "false",
+          "askGRPMagField": "false",
+          "askMatLUT": "false",
+          "askTime": "false",
+          "askOnceAllButField": "false",
+          "needPropagatorD": "false"
+        },
         "location": "remote"
       }
     },