diff --git a/Modules/GLO/ITSTPCmatchedTracks.json b/Modules/GLO/ITSTPCmatchedTracks.json
index fad493b734..bb538e42a4 100644
--- a/Modules/GLO/ITSTPCmatchedTracks.json
+++ b/Modules/GLO/ITSTPCmatchedTracks.json
@@ -70,7 +70,7 @@
              "active" : "true",
              "machines" : [],
              "query_comment" : "checking every 10% matched track",
-             "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS",
+             "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS;trackITS:ITS/TRACKS/0;trackITSROF:ITS/ITSTrackROF/0;trackITSClIdx:ITS/TRACKCLSID/0;alpparITS:ITS/ALPIDEPARAM/0?lifetime=condition&ccdb-path=ITS/Config/AlpideParam",
              "samplingConditions" : [
                {
                  "condition" : "random",
diff --git a/Modules/GLO/ITSTPCmatchedTracks_MC.json b/Modules/GLO/ITSTPCmatchedTracks_MC.json
index 82089df5e7..be3dd869f4 100644
--- a/Modules/GLO/ITSTPCmatchedTracks_MC.json
+++ b/Modules/GLO/ITSTPCmatchedTracks_MC.json
@@ -85,7 +85,7 @@
              "active" : "true",
              "machines" : [],
              "query_comment" : "checking every 10% matched track",
-             "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS;trackTPCMCTR:TPC/TRACKSMCLBL;trackITSTPCMCTR:GLO/TPCITS_MC;trackITSTPCABMCTR:GLO/TPCITSAB_MC",
+             "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS;trackITS:ITS/TRACKS/0;trackITSROF:ITS/ITSTrackROF/0;trackITSClIdx:ITS/TRACKCLSID/0;alpparITS:ITS/ALPIDEPARAM/0?lifetime=condition&ccdb-path=ITS/Config/AlpideParam;trackTPCMCTR:TPC/TRACKSMCLBL;trackITSTPCMCTR:GLO/TPCITS_MC;trackITSTPCABMCTR:GLO/TPCITSAB_MC;trackITSMCTR:ITS/TRACKSMCTR",
              "samplingConditions" : [
                {
                  "condition" : "random",
diff --git a/Modules/GLO/ITSTPCmatchedTracks_direct.json b/Modules/GLO/ITSTPCmatchedTracks_direct.json
index 1605643da2..397e0b92bc 100644
--- a/Modules/GLO/ITSTPCmatchedTracks_direct.json
+++ b/Modules/GLO/ITSTPCmatchedTracks_direct.json
@@ -38,7 +38,7 @@
         "dataSource" : {
           "type" : "direct",
           "query_comment" : "checking every matched track",
-          "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS"
+          "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS;trackITS:ITS/TRACKS/0;trackITSROF:ITS/ITSTrackROF/0;trackITSClIdx:ITS/TRACKCLSID/0;alpparITS:ITS/ALPIDEPARAM/0?lifetime=condition&ccdb-path=ITS/Config/AlpideParam"
         },
         "taskParameters" : {
           "GID" : "ITS-TPC,ITS",
diff --git a/Modules/GLO/ITSTPCmatchedTracks_direct_MC.json b/Modules/GLO/ITSTPCmatchedTracks_direct_MC.json
index c5302b2bcb..3d1ddfc100 100644
--- a/Modules/GLO/ITSTPCmatchedTracks_direct_MC.json
+++ b/Modules/GLO/ITSTPCmatchedTracks_direct_MC.json
@@ -38,7 +38,7 @@
         "dataSource" : {
           "type" : "direct",
           "query_comment" : "checking every matched track",
-          "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS;trackTPCMCTR:TPC/TRACKSMCLBL;trackITSTPCMCTR:GLO/TPCITS_MC;trackITSTPCABMCTR:GLO/TPCITSAB_MC"
+          "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS;trackITS:ITS/TRACKS/0;trackITSROF:ITS/ITSTrackROF/0;trackITSClIdx:ITS/TRACKCLSID/0;alpparITS:ITS/ALPIDEPARAM/0?lifetime=condition&ccdb-path=ITS/Config/AlpideParam;trackTPCMCTR:TPC/TRACKSMCLBL;trackITSTPCMCTR:GLO/TPCITS_MC;trackITSTPCABMCTR:GLO/TPCITSAB_MC;trackITSMCTR:ITS/TRACKSMCTR"
         },
         "taskParameters" : {
           "GID" : "ITS-TPC,ITS",
diff --git a/Modules/GLO/ITSTPCmatchedTracks_mnl.json b/Modules/GLO/ITSTPCmatchedTracks_mnl.json
index 799ec3adb8..30eb106398 100644
--- a/Modules/GLO/ITSTPCmatchedTracks_mnl.json
+++ b/Modules/GLO/ITSTPCmatchedTracks_mnl.json
@@ -76,7 +76,7 @@
              "active" : "true",
              "machines" : [],
              "query_comment" : "checking every 10% matched track",
-             "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS",
+             "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS;trackITS:ITS/TRACKS/0;trackITSROF:ITS/ITSTrackROF/0;trackITSClIdx:ITS/TRACKCLSID/0;alpparITS:ITS/ALPIDEPARAM/0?lifetime=condition&ccdb-path=ITS/Config/AlpideParam",
              "samplingConditions" : [
                {
                  "condition" : "random",
diff --git a/Modules/GLO/glo-itstpc-mtch-qcmn-epn.json b/Modules/GLO/glo-itstpc-mtch-qcmn-epn.json
index ea2490c633..38e95f12c4 100644
--- a/Modules/GLO/glo-itstpc-mtch-qcmn-epn.json
+++ b/Modules/GLO/glo-itstpc-mtch-qcmn-epn.json
@@ -75,7 +75,7 @@
       "active" : "true",
       "machines" : [],
       "query_comment" : "checking every 10% matched track",
-      "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS",
+      "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS;trackITS:ITS/TRACKS/0;trackITSROF:ITS/ITSTrackROF/0;trackITSClIdx:ITS/TRACKCLSID/0;alpparITS:ITS/ALPIDEPARAM/0?lifetime=condition&ccdb-path=ITS/Config/AlpideParam",
       "samplingConditions" : [
          {
            "condition" : "random",
diff --git a/Modules/GLO/src/ITSTPCMatchingTask.cxx b/Modules/GLO/src/ITSTPCMatchingTask.cxx
index 924c3b8ebe..163550339f 100644
--- a/Modules/GLO/src/ITSTPCMatchingTask.cxx
+++ b/Modules/GLO/src/ITSTPCMatchingTask.cxx
@@ -22,6 +22,8 @@
 #include <Framework/InputRecord.h>
 #include <Framework/InputRecordWalker.h>
 
+using matchType = o2::globaltracking::MatchITSTPCQC::matchType;
+
 namespace o2::quality_control_modules::glo
 {
 
@@ -63,21 +65,61 @@ void ITSTPCMatchingTask::initialize(o2::framework::InitContext& /*ctx*/)
   mMatchITSTPCQC.initDataRequest();
   mMatchITSTPCQC.init();
 
-  // Pt
-  getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPt());
-  getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPtTPC());
-  getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatch());
-  // Phi
-  getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPhi());
-  getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPhiTPC());
-  getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchPhi());
-  getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchPhiVsPt());
-  // Eta
-  getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoEta());
-  getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoEtaTPC());
-  getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchEta());
-  getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchEtaVsPt());
+  for (int i = 0; i < matchType::SIZE; ++i) {
+    // Pt
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPtNum(matchType(i)));
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPtDen(matchType(i)));
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatch(matchType(i)));
+
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPtNumNoEta0(matchType(i)));
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPtDenNoEta0(matchType(i)));
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchNoEta0(matchType(i)));
 
+    // Phi
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPhiNum(matchType(i)));
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPhiDen(matchType(i)));
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchPhi(matchType(i)));
+
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPhiVsPtNum(matchType(i)));
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPhiVsPtDen(matchType(i)));
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchPhiVsPt(matchType(i)));
+
+    // Eta
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoEtaNum(matchType(i)));
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoEtaDen(matchType(i)));
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchEta(matchType(i)));
+
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoEtaVsPtNum(matchType(i)));
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoEtaVsPtDen(matchType(i)));
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchEtaVsPt(matchType(i)));
+
+    // 1/Pt
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHisto1OverPtNum(matchType(i)));
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHisto1OverPtDen(matchType(i)));
+    getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatch1OverPt(matchType(i)));
+
+    if (mMatchITSTPCQC.getUseMC()) {
+      // Pt
+      getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPtPhysPrimNum(matchType(i)));
+      getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPtPhysPrimDen(matchType(i)));
+      getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchPhysPrim(matchType(i)));
+
+      // Phi
+      getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPhiPhysPrimNum(matchType(i)));
+      getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPhiPhysPrimDen(matchType(i)));
+      getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchPhiPhysPrim(matchType(i)));
+
+      // Eta
+      getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoEtaPhysPrimNum(matchType(i)));
+      getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoEtaPhysPrimDen(matchType(i)));
+      getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchEtaPhysPrim(matchType(i)));
+
+      // 1/Pt
+      getObjectsManager()->startPublishing(mMatchITSTPCQC.getHisto1OverPtPhysPrimNum(matchType(i)));
+      getObjectsManager()->startPublishing(mMatchITSTPCQC.getHisto1OverPtPhysPrimDen(matchType(i)));
+      getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchPhysPrim1OverPt(matchType(i)));
+    }
+  }
   // Residuals
   getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoResidualPt());
   getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoResidualPhi());
@@ -86,20 +128,8 @@ void ITSTPCMatchingTask::initialize(o2::framework::InitContext& /*ctx*/)
   getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoChi2Matching());
   getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoChi2Refit());
   getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoTimeResVsPt());
-  if (mMatchITSTPCQC.getUseMC()) {
-    // Pt
-    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPtPhysPrim());
-    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPtTPCPhysPrim());
-    getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchPhysPrim());
-    // Phi
-    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPhiPhysPrim());
-    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPhiTPCPhysPrim());
-    getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchPhiPhysPrim());
-    // Eta
-    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoEtaPhysPrim());
-    getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoEtaTPCPhysPrim());
-    getObjectsManager()->startPublishing(mMatchITSTPCQC.getFractionITSTPCmatchEtaPhysPrim());
-  }
+
+  getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoDCAr());
 }
 
 void ITSTPCMatchingTask::startOfActivity(const Activity& activity)