diff --git a/LesionTracker/client/components/viewer.js b/LesionTracker/client/components/viewer.js
index 07b63cb91..f9698b072 100644
--- a/LesionTracker/client/components/viewer.js
+++ b/LesionTracker/client/components/viewer.js
@@ -172,8 +172,6 @@ Template.viewer.onCreated(function() {
                     log.info('Measurement added');
                     syncMeasurementAndToolData(data);
                     updateRelatedElements(data.imageId);
-
-                    TrialResponseCriteria.validateAll();
                 },
                 changed: function(data) {
                     TrialResponseCriteria.validateAllDelayed();
diff --git a/Packages/lesiontracker/client/components/studyDateList/studyDateList.html b/Packages/lesiontracker/client/components/studyDateList/studyDateList.html
index ed9419c96..ecb5cff78 100644
--- a/Packages/lesiontracker/client/components/studyDateList/studyDateList.html
+++ b/Packages/lesiontracker/client/components/studyDateList/studyDateList.html
@@ -4,7 +4,11 @@
         <span class="loading"><i class="fa fa-spinner fa-spin"></i></span>
         <select id="selectStudyDate">
             {{#each relatedStudies}}
+                {{ #if timepointName }}
                 <option value="{{studyInstanceUid}}" selected={{selected}}>{{formatDA studyDate}} ({{timepointName}}): {{studyDescription}}</option>
+                {{ else }}
+                <option value="{{studyInstanceUid}}" selected={{selected}}>{{formatDA studyDate}}: {{studyDescription}}</option>
+                {{ /if }}
             {{/each}}
         </select>
     </div>