diff --git a/DPG/Tasks/TPC/treeCreatorPidTpcDiagnostics.cxx b/DPG/Tasks/TPC/treeCreatorPidTpcDiagnostics.cxx
index 66b1d831d3c..8822995d239 100644
--- a/DPG/Tasks/TPC/treeCreatorPidTpcDiagnostics.cxx
+++ b/DPG/Tasks/TPC/treeCreatorPidTpcDiagnostics.cxx
@@ -91,6 +91,7 @@ struct TreeCreatorPidTpcDiagnostics {
   Configurable<bool> requireGoodRct{"requireGoodRct", false, "require good detector flag in run condtion table"};
 
   struct ParticleWiseCfgs : ConfigurableGroup {
+    std::string prefix = "particleWiseCfgs"; // JSON group name
 
 #define DECLARE_PARTICLE_WISE_CONFIGURABLES(Unused1, ParticleNameLong, Unused2)                                                                                                                                                                            \
   Configurable<float> cutTpcInnerParameterMin##ParticleNameLong{"cutTpcInnerParameterMin" #ParticleNameLong, 0.f, "Lower-value cut on tpcInnerParam for " #ParticleNameLong};    /* o2-linter: disable=name/configurable (Configurable defined in macro)*/ \
@@ -223,7 +224,8 @@ struct TreeCreatorPidTpcDiagnostics {
       isFirstCollision = false;
       const float ft0Occ = collision.ft0cOccupancyInTimeRange();
       const float multTPC = collision.multTPC() / MultiplicityNorm;
-      const auto hadronicRate = !irSource.empty() ? mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource) * OneToKilo : 0.;
+      const int runnumber = bc.runNumber();
+      const auto hadronicRate = !irSource.empty() ? mRateFetcher.fetch(ccdb.service, bc.timestamp(), runnumber, irSource) * OneToKilo : 0.;
 
       const auto tracksFromCollision = tracks.sliceBy(perCollisionTracks, static_cast<int>(collision.globalIndex()));
 
@@ -279,7 +281,7 @@ struct TreeCreatorPidTpcDiagnostics {
           nSigmaTof = o2::aod::pidutils::tofNSigma<ParticleId>(track);
         }
 
-        rowPidTpcDiagnostics(isGoodRctEvent, ParticleId, ft0Occ, hadronicRate, multTPC, nClNormalized, nclPID, phi, tgl, tpcInnerParam, rapidity, momentum, signed1Pt, nSigmaTpc, dedxExpected, dedxDiff, expSigma, nSigmaTof);
+        rowPidTpcDiagnostics(isGoodRctEvent, ParticleId, ft0Occ, hadronicRate, multTPC, nClNormalized, nclPID, runnumber, phi, tgl, tpcInnerParam, rapidity, momentum, signed1Pt, nSigmaTpc, dedxExpected, dedxDiff, expSigma, nSigmaTof);
       } // tracksFromCollision
     } // collisions
     ++mProcessedParticles;
diff --git a/DPG/Tasks/TPC/treeCreatorPidTpcDiagnostics.h b/DPG/Tasks/TPC/treeCreatorPidTpcDiagnostics.h
index e75aa5f7e71..235a802aa54 100644
--- a/DPG/Tasks/TPC/treeCreatorPidTpcDiagnostics.h
+++ b/DPG/Tasks/TPC/treeCreatorPidTpcDiagnostics.h
@@ -41,6 +41,7 @@ DECLARE_SOA_TABLE(PidTpcDiagnostics, "AOD", "PIDTPCDIAG",
                   tpcskims::NormMultTPC,
                   tpcskims::NormNClustersTPC,
                   tpcskims::NormNClustersTPCPID,
+                  tpcskims::RunNumber,
                   o2::aod::track::Phi,
                   o2::aod::track::Tgl,
                   o2::aod::track::TPCInnerParam,