diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/C32SectionSwitch.java b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/C32SectionSwitch.java
index 537dd34..54439fd 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/C32SectionSwitch.java
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/C32SectionSwitch.java
@@ -676,6 +676,12 @@
 					}
 				}
 			}
+
+			row.createCell(offset++).setCellValue(CDAUtil.getDomainPath(ivlts));
+
+		} else {
+			row.createCell(offset++).setCellValue("");
+			row.createCell(offset++).setCellValue("");
 		}
 
 		cell.setCellValue(sb.toString());
@@ -748,8 +754,11 @@
 		Date d = CDAValueUtil.getDate(CDAValueUtil.getValueAsString(coverageActivity.getEffectiveTime()));
 		if (d != null) {
 			row.createCell(offset++).setCellValue(CDAValueUtil.DATE_PRETTY.format(d));
+			row.createCell(offset++).setCellValue(CDAUtil.getDomainPath(coverageActivity.getEffectiveTime()));
+
 		} else {
 			row.createCell(offset++).setCellValue("");
+			row.createCell(offset++).setCellValue("");
 		}
 
 		offset = SpreadsheetSerializer.appendCode(
