diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index f064ce6eff29a0282a7e1fe15bc42cb4c2ffe2aa..878163521dd00e64eb0424e055be74df119e889f 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -28524,7 +28524,7 @@ HLT_noalg_L1jJ30:
 HLT_noalg_L1jJ40:
   eventCount: 20
 HLT_noalg_L1jJ40p30ETA49:
-  eventCount: 2
+  eventCount: 7
 HLT_noalg_L1jJ50:
   eventCount: 20
 HLT_noalg_L1jJ500:
@@ -28534,7 +28534,7 @@ HLT_noalg_L1jJ50p30ETA49:
 HLT_noalg_L1jJ60:
   eventCount: 17
 HLT_noalg_L1jJ60p30ETA49:
-  eventCount: 1
+  eventCount: 2
 HLT_noalg_L1jJ90:
   eventCount: 15
 HLT_noalg_L1jJ90p30ETA49:
diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
index 964f046eddb7604568d46f8ed37e5b6879edc539..4cf2a54fe0bd8327d6621479412c4a4bbc984652 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
+++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
@@ -7130,7 +7130,11 @@ HLT_j45f_L1J15p31ETA49:
   stepFeatures:
     0: 1
 HLT_j45f_L1jJ40p30ETA49:
-  eventCount: 0
+  eventCount: 1
+  stepCounts:
+    0: 1
+  stepFeatures:
+    0: 1
 HLT_j460_L1J100:
   eventCount: 0
 HLT_j460_L1jJ160:
@@ -10298,17 +10302,17 @@ HLT_noalg_L1jJ30:
 HLT_noalg_L1jJ40:
   eventCount: 15
 HLT_noalg_L1jJ40p30ETA49:
-  eventCount: 2
+  eventCount: 6
 HLT_noalg_L1jJ50:
   eventCount: 13
 HLT_noalg_L1jJ500:
   eventCount: 0
 HLT_noalg_L1jJ50p30ETA49:
-  eventCount: 3
+  eventCount: 5
 HLT_noalg_L1jJ60:
   eventCount: 5
 HLT_noalg_L1jJ60p30ETA49:
-  eventCount: 2
+  eventCount: 3
 HLT_noalg_L1jJ90:
   eventCount: 3
 HLT_noalg_L1jJ90p30ETA49:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/L1CaloThresholdMapping.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/L1CaloThresholdMapping.py
index c224798a42bc82b203688d2f8b3ed4d459b3e5d2..69a5a618c0e212259378bc87939ec15c45d58f55 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/L1CaloThresholdMapping.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/L1CaloThresholdMapping.py
@@ -62,6 +62,7 @@ threshold_mapping = {
         140:138,
         160:158,
         180:197,
+        # Must be 400 to ensure threshold can be passed
         500:400,
     },
     'CjJ': { # 0ETA2[1,3,5]
@@ -76,12 +77,12 @@ threshold_mapping = {
     },
     'FjJ': { # 30ETA49
         15:15,
-        20:26,
-        40:53,
-        50:41,
-        60:61,
-        90:101,
-        125:152,
+        20:20,
+        40:26,
+        50:32,
+        60:49,
+        90:83,
+        125:134,
     },
     'gJ':
     {