diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java
index 41ac09ed..a8671803 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestDetailsPageController.java
@@ -315,10 +315,11 @@ public class ReferenceManifestDetailsPageController
                     LOGGER.error("Failed to update Support RIM", ex);
                 }
             }
-            measurements = EventLogMeasurements.select(referenceManifestManager)
-                    .byManufacturer(support.getPlatformManufacturer()).getRIM();
         }
 
+        measurements = EventLogMeasurements.select(referenceManifestManager)
+                .byManufacturer(support.getPlatformManufacturer()).getRIM();
+
         data.put("baseRim", support.getTagId());
         data.put("associatedRim", support.getAssociatedRim());
         data.put("rimType", support.getRimType());
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp
index ecdd813d..05571e35 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp
@@ -200,11 +200,11 @@
                                     <c:choose>
                                         <c:when test="${event.isError()}">
                                             <tr style="background: tomato">
-                                            </c:when>
-                                            <c:otherwise>
+                                        </c:when>
+                                        <c:otherwise>
                                             <tr>
-                                            </c:otherwise>
-                                        </c:choose>
+                                        </c:otherwise>
+                                    </c:choose>
                                         <td style="width: 75px">${count}</td>
                                         <td class="pcrCell">PCR${event.getPcrIndex()}</td>
                                         <td>${event.getEventTypeStr()}</td>
@@ -243,7 +243,7 @@
                                     <div class="event-element">
                                         <div class="event-data">
                                             <div class="data-label">Event#:</div>
-                                            <div class="data-value">${sEvent.getEventNumber()}</div>
+                                            <div class="data-value">${sEvent.getEventNumber()+1}</div>
                                         </div>           
                                         <div class="event-data">
                                             <div class="data-label">PCR Index:</div>
@@ -268,7 +268,7 @@
                                     <div class="event-element">
                                         <div class="event-data">
                                             <div class="data-label">Event#:</div>
-                                            <div class="data-value">${lEvent.getEventNumber()}</div>
+                                            <div class="data-value">${lEvent.getEventNumber()+1}</div>
                                         </div>           
                                         <div class="event-data">
                                             <div class="data-label">PCR Index:</div>