diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRecOutputItemList_jobOptions.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRecOutputItemList_jobOptions.py
index 8a1d4e206dd49b2ceab1dce1af229541c3b65bc8..15e48f63178ce3c9fa0f5c71246bc4822c283e3a 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRecOutputItemList_jobOptions.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRecOutputItemList_jobOptions.py
@@ -62,13 +62,15 @@ if DetFlags.detdescr.Muon_on() and rec.doWriteESD():
 
 
    #PRDs
-   MuonESDList+=["Muon::CscPrepDataContainer#CSC_Clusters"]
-   MuonESDList+=["Muon::CscStripPrepDataContainer#CSC_Measurements"]
+   if muonRecFlags.doNSWNewThirdChain():
+      MuonESDList+=["Muon::MMPrepDataContainer#MM_Measurements"]
+      MuonESDList+=["Muon::sTgcPrepDataContainer#STGC_Measurements"]
+   if muonRecFlags.doCSCs:
+      MuonESDList+=["Muon::CscPrepDataContainer#CSC_Clusters"]
+      MuonESDList+=["Muon::CscStripPrepDataContainer#CSC_Measurements"]
    MuonESDList+=["Muon::RpcPrepDataContainer#RPC_Measurements"]
    MuonESDList+=["Muon::TgcPrepDataContainer#TGC_MeasurementsAllBCs"]
    MuonESDList+=["Muon::MdtPrepDataContainer#MDT_DriftCircles"]
-   MuonESDList+=["Muon::MMPrepDataContainer#MM_Measurements"]
-   MuonESDList+=["Muon::sTgcPrepDataContainer#STGC_Measurements"]
 
    #trigger related info for offline DQA
    MuonESDList+=["Muon::TgcCoinDataContainer#TrigT1CoinDataCollection"]
@@ -97,12 +99,14 @@ if DetFlags.detdescr.Muon_on() and rec.doWriteESD():
       MuonESDList+=["TrackTruthCollection#MuonSpectrometerTracksTruth"]
 
       if muonRecFlags.writeSDOs():
-         MuonESDList+=["CscSimDataCollection#CSC_SDO"]
+         if muonRecFlags.doCSCs:
+            MuonESDList+=["CscSimDataCollection#CSC_SDO"]
          MuonESDList+=["MuonSimDataCollection#MDT_SDO"]
          MuonESDList+=["MuonSimDataCollection#RPC_SDO"]
          MuonESDList+=["MuonSimDataCollection#TGC_SDO"]
-         MuonESDList+=["MuonSimDataCollection#STGC_SDO"]
-         MuonESDList+=["MuonSimDataCollection#MM_SDO"]
+         if muonRecFlags.doNSWNewThirdChain():
+            MuonESDList+=["MuonSimDataCollection#STGC_SDO"]
+            MuonESDList+=["MuonSimDataCollection#MM_SDO"]
 
    # commenting if-statement since mandatory for e.g. RPC calibration
    # Write out CSC, RPC, and MDT RDOs.
@@ -111,7 +115,7 @@ if DetFlags.detdescr.Muon_on() and rec.doWriteESD():
    if ( muonRecFlags.writeRDOs() or muonRecFlags.writeMdtRDOs() ):
       import MuonCnvExample.MuonCablingConfig
       MuonESDList += [ "MdtCsmContainer#MDTCSM" ]
-   if ( muonRecFlags.writeRDOs() or muonRecFlags.writeCscRDOs() ):
+   if ( muonRecFlags.writeRDOs() or muonRecFlags.writeCscRDOs() and muonRecFlags.doCSCs):
       import MuonCnvExample.MuonCablingConfig
       MuonESDList += [ "CscRawDataContainer#CSCRDO" ] 
    if ( muonRecFlags.writeRDOs() or muonRecFlags.writeRpcRDOs() ):
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerUtils/MuonTrackMakerUtils/SortMeasurementsByPosition.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerUtils/MuonTrackMakerUtils/SortMeasurementsByPosition.h
index 5a623618ccdf22b78ce29b4c3a7f75e334cfb945..c8f432b7383d641b1aed637448ba2022d877f732 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerUtils/MuonTrackMakerUtils/SortMeasurementsByPosition.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerUtils/MuonTrackMakerUtils/SortMeasurementsByPosition.h
@@ -81,17 +81,19 @@ namespace Muon {
 
       bool okId1 = id1.is_valid() && m_idHelperTool->isMuon(id1) ? true : false;
       bool okId2 = id2.is_valid() && m_idHelperTool->isMuon(id2) ? true : false;      
+
       if(tsos1->type(Trk::TrackStateOnSurface::TrackStateOnSurfaceType::CaloDeposit) || tsos2->type(Trk::TrackStateOnSurface::TrackStateOnSurfaceType::CaloDeposit)){
-	if(  okId1 && tsos2->type(Trk::TrackStateOnSurface::TrackStateOnSurfaceType::CaloDeposit) ) return true;
-	if( tsos1->type(Trk::TrackStateOnSurface::TrackStateOnSurfaceType::CaloDeposit) &&  okId2 ) return false;
+	if(  okId1 && tsos2->type(Trk::TrackStateOnSurface::TrackStateOnSurfaceType::CaloDeposit) ) return false;
+	if( tsos1->type(Trk::TrackStateOnSurface::TrackStateOnSurfaceType::CaloDeposit) && okId2 ) return true;
       }
+      
       // get average direction of the 2 TSOSs
       Amg::Vector3D trackDir = tsos1->trackParameters()->momentum().unit();
       trackDir += tsos2->trackParameters()->momentum().unit();
       const Amg::Vector3D& pos1 = tsos1->trackParameters()->position();
       const Amg::Vector3D& pos2 = tsos2->trackParameters()->position();
       double dist = (pos2 - pos1).dot(trackDir);
-      
+
       if( fabs(dist) < 1e-5 ){
 	//one is a good muon hit and one is not: good muon hit comes after
 	if(  okId1 && !okId2 ) return true;
diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCombinedInDetExtensionAlg.h b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCombinedInDetExtensionAlg.h
index 8782d9c11babd1406636c5761e81a94ce59e07d7..bd067ff6fc47e8b3dfd6a369a97c6ce0b949dc83 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCombinedInDetExtensionAlg.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCombinedInDetExtensionAlg.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MUONCOMBINEDALGS_MUONCOMBINEDINDETEXTENSIONALG_H
@@ -39,12 +39,13 @@ class MuonCombinedInDetExtensionAlg : public AthAlgorithm
   SG::ReadHandleKey<Muon::CscPrepDataContainer> m_CSC_ContainerName{this,"CSCPrepDataLocation","CSC_Clusters","CSC prep data"};
   SG::ReadHandleKey<Muon::RpcPrepDataContainer> m_RPC_ContainerName{this,"RPCPrepDataLocation","RPC_Measurements","RPC prep data"};
   SG::ReadHandleKey<Muon::TgcPrepDataContainer> m_TGC_ContainerName{this,"TGCPrepDataLocation","TGC_Measurements","TGC prep data"};
-  SG::ReadHandleKey<Muon::sTgcPrepDataContainer> m_sTGC_ContainerName{this,"sTGCPrepDataLocation","sTGC_Clusters","sTGC prep data"};
-  SG::ReadHandleKey<Muon::MMPrepDataContainer> m_MM_ContainerName{this,"MMPrepDataLocation","MM_Clusters","MM prep data"};
+  SG::ReadHandleKey<Muon::sTgcPrepDataContainer> m_sTGC_ContainerName{this,"sTGCPrepDataLocation","STGC_Measurements","sTGC prep data"};
+  SG::ReadHandleKey<Muon::MMPrepDataContainer> m_MM_ContainerName{this,"MMPrepDataLocation","MM_Measurements","MM prep data"};
   SG::WriteHandleKey<MuonCombined::InDetCandidateToTagMap> m_tagMap{this,"TagMap","muGirlTagMap","tag map"};
   SG::WriteHandleKey<TrackCollection> m_combTracks{this,"CombinedTrackCollection","MuGirlCombinedTracks","combined track collection"};
   SG::WriteHandleKey<TrackCollection> m_METracks{this,"METrackCollection","MuGirlMETracks","ME track collection"};
   SG::WriteHandleKey<Trk::SegmentCollection> m_segments{this,"SegmentCollection","MuGirlSegments","Segment collection"};
+
   bool m_usePRDs;
   bool m_useNSW;
 };