diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
index 7e1e1273cc8fc9fbab1de8ca3a8d1da29a57b361..db8cd2b9032bc477808ba35ccd5114aa7731a608 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
@@ -54,12 +54,12 @@ TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3
TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 decisions 140 140 185 0 0 0
TrigSignatureMoniMT INFO HLT_g5_etcut_LArPEB_L1EM3 20 20 20 20 20 20 0 0 20
TrigSignatureMoniMT INFO HLT_g5_etcut_LArPEB_L1EM3 decisions 140 140 185 185 0 0
-TrigSignatureMoniMT INFO HLT_g5_loose_L1EM3 20 20 17 17 17 17 0 0 17
-TrigSignatureMoniMT INFO HLT_g5_loose_L1EM3 decisions 57 57 116 64 0 0
-TrigSignatureMoniMT INFO HLT_g5_medium_L1EM3 20 20 16 16 16 15 0 0 15
-TrigSignatureMoniMT INFO HLT_g5_medium_L1EM3 decisions 48 48 92 55 0 0
-TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 20 20 16 16 16 0 0 0 0
-TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 decisions 45 45 84 0 0 0
+TrigSignatureMoniMT INFO HLT_g5_loose_L1EM3 20 20 17 17 17 9 0 0 9
+TrigSignatureMoniMT INFO HLT_g5_loose_L1EM3 decisions 57 57 116 14 0 0
+TrigSignatureMoniMT INFO HLT_g5_medium_L1EM3 20 20 16 16 16 9 0 0 9
+TrigSignatureMoniMT INFO HLT_g5_medium_L1EM3 decisions 48 48 92 14 0 0
+TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 20 20 16 16 16 9 0 0 9
+TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 decisions 45 45 84 9 0 0
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J2019 19 15 0 0 0 0 0 15
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 decisions 39 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J1004 4 0 0 0 0 0 0 0
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
index 0d9a5d2f35dd33807161c0f235d7e2802dd0dd6c..e34510d3e89c98b5b671e3e69b6e62065b6bdad7 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
@@ -58,12 +58,12 @@ TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3
TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 decisions 51 51 55 0 0 0
TrigSignatureMoniMT INFO HLT_g5_etcut_LArPEB_L1EM3 20 20 17 17 17 17 0 0 17
TrigSignatureMoniMT INFO HLT_g5_etcut_LArPEB_L1EM3 decisions 51 51 55 55 0 0
-TrigSignatureMoniMT INFO HLT_g5_loose_L1EM3 20 20 12 12 12 12 0 0 12
-TrigSignatureMoniMT INFO HLT_g5_loose_L1EM3 decisions 21 21 37 25 0 0
-TrigSignatureMoniMT INFO HLT_g5_medium_L1EM3 20 20 11 11 11 11 0 0 11
-TrigSignatureMoniMT INFO HLT_g5_medium_L1EM3 decisions 20 20 37 25 0 0
-TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 20 20 11 11 11 0 0 0 0
-TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 decisions 20 20 37 0 0 0
+TrigSignatureMoniMT INFO HLT_g5_loose_L1EM3 20 20 12 12 12 8 0 0 8
+TrigSignatureMoniMT INFO HLT_g5_loose_L1EM3 decisions 21 21 37 11 0 0
+TrigSignatureMoniMT INFO HLT_g5_medium_L1EM3 20 20 11 11 11 8 0 0 8
+TrigSignatureMoniMT INFO HLT_g5_medium_L1EM3 decisions 20 20 37 11 0 0
+TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 20 20 11 11 11 5 0 0 5
+TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 decisions 20 20 37 5 0 0
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J2020 20 1 0 0 0 0 0 1
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 decisions 2 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J10020 20 0 0 0 0 0 0 0
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/TrigPhotonFactories.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/TrigPhotonFactories.py
index 8bf2606b3d8f6060c717415518cba08de4c896d8..16f2e3860ba349ca3752798fd481151bacf5bbad 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/TrigPhotonFactories.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/TrigPhotonFactories.py
@@ -49,7 +49,7 @@ TrigEgammaOQFlagsBuilder = ToolFactory( egammaToolsConf.egammaOQFlagsBuilder,
# Copying from https://gitlab.cern.ch/atlas/athena/blob/master/Reconstruction/egamma/egammaRec/python/topoEgammaGetter.py#L28
def TrigEgammaDecorationTools():
#Return a list with the tools that decorate both electrons and photons.
- return [ EMFourMomBuilder(), TrigEMShowerBuilder()] #[, TrigEgammaOQFlagsBuilder()]
+ return [ EMFourMomBuilder(), TrigEMShowerBuilder() ]
def TrigPhotonDecorationTools():
#Return a list with the tools that decorate only photons