diff --git a/api/src/Page/Proposal.php b/api/src/Page/Proposal.php
index 47a32bc5d..17dedd2c4 100644
--- a/api/src/Page/Proposal.php
+++ b/api/src/Page/Proposal.php
@@ -391,7 +391,7 @@ function _get_visits($visit = null, $output = true)
         }
 
         if ($this->has_arg('cm')) {
-            $where .= " AND p.proposalcode LIKE :" . (sizeof($args) + 1) . " AND s.startdate <= SYSDATE";
+            $where .= " AND p.proposalcode LIKE :" . (sizeof($args) + 1) . " AND s.startdate <= SYSDATE AND s.enddate >= SYSDATE";
             array_push($args, $commissioning_code);
         }
 
diff --git a/client/src/css/partials/_form.scss b/client/src/css/partials/_form.scss
index 09407a780..b2620bb72 100644
--- a/client/src/css/partials/_form.scss
+++ b/client/src/css/partials/_form.scss
@@ -31,7 +31,12 @@ div.form {
         float: left;
         display: block;
         font-size: 12px;
-        
+
+        span.label {
+            display: block;
+            width: 100%;
+        }
+
         span.small {
             display: block;
             font-size: 10px;
diff --git a/client/src/js/templates/samples/protein.html b/client/src/js/templates/samples/protein.html
index 7ac09630e..6f6e9cefc 100644
--- a/client/src/js/templates/samples/protein.html
+++ b/client/src/js/templates/samples/protein.html
@@ -19,9 +19,12 @@ <h1 data-testid="protein-header">View Protein</h1>
             <span class="label">Acronym</span>
             <span data-testid="protein-acronym" class="ACRONYM"><%-ACRONYM%></span>
         </li>
-        
+
         <li>
-            <span class="label">Molecular Mass</span>
+            <label>
+                <span class="label">Molecular Mass (Da)</span>
+                <span class="small">This may be used for dose calculations on some beamlines</span>
+            </label>
             <span data-testid="protein-molecular-mass" class="MOLECULARMASS"><%-MOLECULARMASS%></span>
         </li>