diff --git a/src/utils/FileRecordTools/RecordOutputMgr.cpp b/src/utils/FileRecordTools/RecordOutputMgr.cpp
index 880face56284161195c726c328b74dea0936229e..57fc8ac4df72cea1f6f9184ef66d4d52627e3d2d 100644
--- a/src/utils/FileRecordTools/RecordOutputMgr.cpp
+++ b/src/utils/FileRecordTools/RecordOutputMgr.cpp
@@ -117,11 +117,10 @@ void RecordOutputMgr::printRecord(const Record *record)
 	printRecord(keyList);
 }
 
-void RecordOutputMgr::printRecord(const Record *record, const string value)
+void RecordOutputMgr::printRecord(const Record *record, const QuickString & value)
 {	
-	RecordKeyList keyList(record);
-	printRecord(keyList);
-	_outBuf.append(value.c_str());
+	printRecord(record);
+	_outBuf.append(value);
 	newline();
 
 	if (needsFlush()) {
@@ -213,7 +212,8 @@ void RecordOutputMgr::printRecord(RecordKeyList &keyList, RecordKeyList *blockLi
 }
 
 void RecordOutputMgr::checkForHeader() {
-	if (_context->getProgram() == ContextBase::INTERSECT) {
+	if (_context->getProgram() == ContextBase::INTERSECT ||
+		_context->getProgram() == ContextBase::MAP) {
 		if (_context->getPrintHeader()) {
 			_outBuf.append(_context->getHeader((static_cast<ContextIntersect *>(_context))->getQueryFileIdx()));
 		}
diff --git a/src/utils/FileRecordTools/RecordOutputMgr.h b/src/utils/FileRecordTools/RecordOutputMgr.h
index 7758df29be150b6b3808a9cadcec033c2cff5367..c6921561affe0a05c2cd9172ec4b8629fa958f66 100644
--- a/src/utils/FileRecordTools/RecordOutputMgr.h
+++ b/src/utils/FileRecordTools/RecordOutputMgr.h
@@ -28,7 +28,7 @@ public:
 	void printRecord(const Record *record);
 	void printRecord(RecordKeyList &keyList);
 	// Added by ARQ
-	void printRecord(const Record *record, const string value);
+	void printRecord(const Record *record, const QuickString & value);
 
 private:
 	typedef enum { NOT_BAM, BAM_AS_BAM, BAM_AS_BED} printBamType;