diff --git a/module/finc/src/finc/RecordDriver/SolrMarc.php b/module/finc/src/finc/RecordDriver/SolrMarc.php
index 316be68a3e4e963e308c936af8a3b404cc9b2dd6..5e39e43218d15f466f2901929d46748244052333 100644
--- a/module/finc/src/finc/RecordDriver/SolrMarc.php
+++ b/module/finc/src/finc/RecordDriver/SolrMarc.php
@@ -261,15 +261,7 @@ class SolrMarc extends SolrDefault
      */
     public function getGeneralNotes()
     {
-        $retval = [];
-        foreach ($this->getFieldArray('500') as $value) {
-            if (preg_match('/(.*)\.\s*$/',$value,$matches)) {
-                $retval[] = $matches[1];
-            } else {
-                $retval[] = $value;
-            }
-        }
-        return $retval;
+        return $this->getFieldArray('500');
     }
 
     /**
diff --git a/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php b/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php
index b877bf3b1626d9f82ed448d193acb0bbed012afe..3848c9a7768c3995391a7eecb3759d449eb076be 100644
--- a/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php
+++ b/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php
@@ -1649,17 +1649,26 @@ trait SolrMarcFincTrait
         }
         foreach ($fields as $field) {
             if ($subfield = $field->getSubfield('a')) {
-                $value = $subfield->getData();
-                if (preg_match('/(.*)\.\s*$/',$value,$matches)) {
-                    $retval[] = $matches[1];
-                } else {
-                    $retval[] = $value;
-                }
+                $retval[] = $subfield->getData();
             }
         }
         return $retval;
     }
 
+    public function getAllNotes() {
+
+        $notes = array_merge(
+            (array) $this->getGeneralNotes(),
+            (array)$this->getAdditionalNotes()
+        );
+        foreach ($notes as &$note) {
+            if (preg_match('/(.*)\.\s*$/',$note,$matches)) {
+                $note = $matches[1];
+            }
+        }
+        return $notes;
+    }
+
     /**
      * Marc specific implementation for retrieving hierarchy parent id(s).
      * Refs #8369