diff --git a/dstu3/src/main/java/org/opencds/cqf/dstu3/providers/MeasureOperationsProvider.java b/dstu3/src/main/java/org/opencds/cqf/dstu3/providers/MeasureOperationsProvider.java
index 3ebd9b9e5..34516ed11 100644
--- a/dstu3/src/main/java/org/opencds/cqf/dstu3/providers/MeasureOperationsProvider.java
+++ b/dstu3/src/main/java/org/opencds/cqf/dstu3/providers/MeasureOperationsProvider.java
@@ -277,7 +277,7 @@ public Parameters careGapsReport(@OperationParam(name = "periodStart") String pe
                         .setResource(patientCareGap(periodStart, periodEnd, subject, topic, measure, status)));
                 return returnParams;
             }else if(subject.startsWith("Group/")) {
-                returnParams.setId((status==null?"all-gaps": status) + "-" + subject.replace("/","_") + "-report");
+                returnParams.setId((status==null?"all-gaps": status) + "-" + subject.replace("/","-") + "-report");
                 (getPatientListFromGroup(subject))
                     .forEach(groupSubject ->{
                         Bundle patientGapBundle = patientCareGap(periodStart, periodEnd, groupSubject, topic, measure, status);
@@ -568,7 +568,8 @@ public Parameters report(@OperationParam(name = "periodStart", min = 1, max = 1)
         }    
         if (periodEnd == null) {
             throw new IllegalArgumentException("Parameter 'periodEnd' is required.");
-        }    Date periodStartDate = DateHelper.resolveRequestDate(periodStart, true);
+        }    
+        Date periodStartDate = DateHelper.resolveRequestDate(periodStart, true);
         Date periodEndDate = DateHelper.resolveRequestDate(periodEnd, false);
       
         if (periodStartDate.after(periodEndDate)) {
@@ -580,7 +581,7 @@ public Parameters report(@OperationParam(name = "periodStart", min = 1, max = 1)
         }
 
         Parameters returnParams = new Parameters();
-        returnParams.setId(subject.replace("/", "_") + "-report");
+        returnParams.setId(subject.replace("/", "-") + "-report");
         
         SearchParameterMap theParams = SearchParameterMap.newSynchronous();       
         (getPatientListFromSubject(subject))
diff --git a/r4/src/main/java/org/opencds/cqf/r4/providers/MeasureOperationsProvider.java b/r4/src/main/java/org/opencds/cqf/r4/providers/MeasureOperationsProvider.java
index 918b626f7..f8f6ee73f 100644
--- a/r4/src/main/java/org/opencds/cqf/r4/providers/MeasureOperationsProvider.java
+++ b/r4/src/main/java/org/opencds/cqf/r4/providers/MeasureOperationsProvider.java
@@ -312,7 +312,7 @@ public Parameters careGapsReport(
             if (_subject.startsWith("Patient/")) {
                 resolvePatientGapBundleForMeasures(_periodStart, _periodEnd, _subject, topic, status, returnParams, measures, "return", organization);
             } else if (_subject.startsWith("Group/")) {
-                returnParams.setId(status + "-" + _subject.replace("/", "_") + "-report");
+                returnParams.setId(status + "-" + _subject.replace("/", "-") + "-report");
                 (getPatientListFromGroup(_subject))
                 .forEach(
                     groupSubject -> resolvePatientGapBundleForMeasures(
@@ -750,7 +750,7 @@ public Parameters report(@OperationParam(name = "periodStart", min = 1, max = 1)
         }
 
         Parameters returnParams = new Parameters();
-        returnParams.setId(subject.replace("/", "_") + "-report");
+        returnParams.setId(subject.replace("/", "-") + "-report");
         
         SearchParameterMap theParams = SearchParameterMap.newSynchronous();       
         (getPatientListFromSubject(subject))