diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/StreamTagMakerTool.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/StreamTagMakerTool.cxx
index fd0e4515e1312fd8918f9312909fdbcc59200c17..af8307bffe2fb247864f2c150311250341071fca 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/StreamTagMakerTool.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/StreamTagMakerTool.cxx
@@ -15,6 +15,11 @@ StreamTagMakerTool::~StreamTagMakerTool() {
 
 StatusCode StreamTagMakerTool::initialize() {  
   // decode mapping
+  for ( auto& chainAndStream: m_chainToStreamProperty ) {
+    struct { std::string chain, stream; } conf { chainAndStream.first, chainAndStream.second };    
+    m_mapping[ HLT::Identifier( conf.chain ) ] = eformat::helper::StreamTag( conf.stream, "physics", true );
+  }
+
   return StatusCode::SUCCESS;
 }
 
@@ -41,11 +46,7 @@ StatusCode StreamTagMakerTool::fill( HLT::HLTResultMT& resultToFill ) const {
   }
 
   // push back ST vector to HLTResultMT
-
-
-
-
-  // make sure thy are unique
+  // make sure ST vector contains only unique content
   std::sort( streams.begin(), streams.end() );
   streams.erase( std::unique( streams.begin(), streams.end() ),  streams.end() );
   
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/components/TrigOutputHandling_entries.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/components/TrigOutputHandling_entries.cxx
index d97695735c6520c8a0573721103564d13d8b0b50..d6d200154bbd6d84365cf233000576bad05d7776 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/components/TrigOutputHandling_entries.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/components/TrigOutputHandling_entries.cxx
@@ -2,9 +2,11 @@
 #include "../HLTEDMCreator.h"
 #include "../StreamTagMakerTool.h"
 #include "../HLTResultMTMakerAlg.h"
+#include "../DecisionSummaryMakerAlg.h"
 
 DECLARE_COMPONENT( HLTResultCreatorByteStream )
 DECLARE_COMPONENT( HLTEDMCreator )
 DECLARE_COMPONENT( HLTResultMTMakerAlg )
 DECLARE_COMPONENT( StreamTagMakerTool )
+DECLARE_COMPONENT( DecisionSummaryMakerAlg )