diff --git a/Trigger/TrigDataAccess/TrigSerializeResult/python/dictwrite.py b/Trigger/TrigDataAccess/TrigSerializeResult/python/dictwrite.py
index a3e8619d6cc1be136a278b7dc89b0ed7b0c7b329..3dc80172aed0bb53c1a3c2af086dee66ec0b72fb 100755
--- a/Trigger/TrigDataAccess/TrigSerializeResult/python/dictwrite.py
+++ b/Trigger/TrigDataAccess/TrigSerializeResult/python/dictwrite.py
@@ -23,8 +23,8 @@ b) have a real class in the 'objects' list BEFORE the typedef
 """
 
 def update_streamerinfos(objects, updated_objects):
-  doEDM=False
-  #doEDM=True
+  #doEDM=False
+  doEDM=True
   doxAODonly=False
   bs_filename = 'bs-streamerinfos.root'
   import ROOT
@@ -45,10 +45,13 @@ def update_streamerinfos(objects, updated_objects):
   print("")
 
   if doEDM:
-    from TrigEDMConfig.TriggerEDM import EDMDetails
-    for item in EDMDetails.keys():
-      pers = EDMDetails[item]['persistent']
-      objects.append(pers)
+    from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTListRun3
+    from TrigEDMConfig.DataScoutingInfo import DataScoutingIdentifiers
+    BS_destinations = ["BS"] + list(DataScoutingIdentifiers)
+    print("BS_destinations = {}".format(BS_destinations))
+    for item in TriggerHLTListRun3:
+      if any(bs in item[1].split() for bs in BS_destinations):
+        objects.append(item[0].split("#")[0])
 
   for pers in objects:
     SIG.inspect(pers)
diff --git a/Trigger/TrigDataAccess/TrigSerializeResult/share/bs-streamerinfos.root b/Trigger/TrigDataAccess/TrigSerializeResult/share/bs-streamerinfos.root
index bec235d093be6adf51c2d52bfd17f0c8b0045086..c5496aff99e746fa01deef77d036623d0b574f2b 100644
Binary files a/Trigger/TrigDataAccess/TrigSerializeResult/share/bs-streamerinfos.root and b/Trigger/TrigDataAccess/TrigSerializeResult/share/bs-streamerinfos.root differ
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
index aa95c6efc07cf9987085dc84be1b5bb0b6b3d489..ba507c005a73ac5142f2a873cf840d311d7d1a25 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
@@ -262,6 +262,10 @@ def getCategory(s):
         if (s == k):
             bestMatch = k
             category = item[2]
+
+    if category == '' and 'HLTNav' in s:
+        category = 'HLTNav'
+
     if category == '': return 'NOTFOUND'
     return category