diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7BiochemistryPivot.query.xml b/snprc_ehr/resources/queries/snprc_ehr/HL7BiochemistryPivot.query.xml
index b6e82c36b..5715c58ba 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7BiochemistryPivot.query.xml
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7BiochemistryPivot.query.xml
@@ -2,7 +2,14 @@
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="HL7BiochemistryPivot" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
                 <tableTitle>Biochemistry Results Pivot</tableTitle>
+                <columns>
+                    <column columnName="Key">
+                        <isKeyField>true</isKeyField>
+                        <isHidden>true</isHidden>
+                    </column>
+                 </columns>
             </table>
         </tables>
     </metadata>
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7BiochemistryPivot.sql b/snprc_ehr/resources/queries/snprc_ehr/HL7BiochemistryPivot.sql
index 3ecffee2b..de3a70914 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7BiochemistryPivot.sql
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7BiochemistryPivot.sql
@@ -1,6 +1,7 @@
 SELECT
     obr.ANIMAL_ID as id,
     obr.OBSERVATION_DATE_TM as date,
+    obr.ANIMAL_ID || '-' || CAST(obr.OBSERVATION_DATE_TM AS VARCHAR) as key,
     obr.MESSAGE_ID,
     COALESCE (lp.ServiceId.ServiceName, obr.PROCEDURE_NAME) as PROCEDURE_NAME,
     obr.PROCEDURE_ID,
@@ -20,6 +21,6 @@ GROUP BY obr.ANIMAL_ID, obr.OBSERVATION_DATE_TM, obr.MESSAGE_ID, COALESCE (lp.Se
 
     IN
     (
-    select DISTINCT TestName as TEST_NAME from snprc_ehr.labwork_panels t
+    select DISTINCT ltrim(Rtrim(TestName)) as TEST_NAME from snprc_ehr.labwork_panels t
     where t.includeInPanel = true AND t.ServiceId.Dataset='Biochemistry'
     )
\ No newline at end of file
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7BiochemistryPivot/RoutineChemistry.qview.xml b/snprc_ehr/resources/queries/snprc_ehr/HL7BiochemistryPivot/RoutineChemistry.qview.xml
new file mode 100644
index 000000000..6ea27d34d
--- /dev/null
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7BiochemistryPivot/RoutineChemistry.qview.xml
@@ -0,0 +1,43 @@
+<!-- $S is the escape code for / -->
+<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+    <columns>
+        <column name="Id"/>
+        <column name="Date"/>
+        <column name="CREATININE::RESULT"/>
+        <column name="CREATININE::ABNORMAL_FLAGS"/>
+        <column name="GLUCOSE::RESULT"/>
+        <column name="GLUCOSE::ABNORMAL_FLAGS"/>
+        <column name="BUN$SCREAT RATIO::RESULT"/>
+        <column name="BUN$SCREAT RATIO::ABNORMAL_FLAGS"/>
+        <column name="TOTAL PROTEIN::RESULT"/>
+        <column name="TOTAL PROTEIN::ABNORMAL_FLAGS"/>
+        <column name="ALBUMIN::RESULT"/>
+        <column name="ALBUMIN::ABNORMAL_FLAGS"/>
+        <column name="GLOBULIN (CALC)::RESULT"/>
+        <column name="GLOBULIN (CALC)::ABNORMAL_FLAGS"/>
+        <column name="A$SG RATIO (CALC)::RESULT"/>
+        <column name="A$SG RATIO (CALC)::ABNORMAL_FLAGS"/>
+        <column name="ALT $S SGPT::RESULT"/>
+        <column name="ALT $S SGPT::ABNORMAL_FLAGS"/>
+        <column name="AST $S SGOT::RESULT"/>
+        <column name="AST $S SGOT::ABNORMAL_FLAGS"/>
+        <column name="ALK PHOSPHATASE::RESULT"/>
+        <column name="ALK PHOSPHATASE::ABNORMAL_FLAGS"/>
+        <column name="SODIUM::RESULT"/>
+        <column name="SODIUM::ABNORMAL_FLAGS"/>
+        <column name="POTASSIUM::RESULT"/>
+        <column name="POTASSIUM::ABNORMAL_FLAGS"/>
+        <column name="CHLORIDE::RESULT"/>
+        <column name="CHLORIDE::ABNORMAL_FLAGS"/>
+        <column name="CARBON DIOXIDE::RESULT"/>
+        <column name="CARBON DIOXIDE::ABNORMAL_FLAGS"/>
+        <column name="ANION GAP (CALC)::RESULT"/>
+        <column name="ANION GAP (CALC)::ABNORMAL_FLAGS"/>
+        <column name="COMMENT"/>
+    </columns>
+    <sorts>
+        <sort column="Id"/>
+        <sort column="Date" descending="true"/>
+    </sorts>
+</customView>
+
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7CulturePivot.query.xml b/snprc_ehr/resources/queries/snprc_ehr/HL7CulturePivot.query.xml
index af585aeee..c09f67af8 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7CulturePivot.query.xml
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7CulturePivot.query.xml
@@ -2,7 +2,14 @@
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="HL7CulturePivot" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
                 <tableTitle>Culture and Sensitivity Results Pivot</tableTitle>
+                <columns>
+                    <column columnName="Key">
+                        <isKeyField>true</isKeyField>
+                        <isHidden>true</isHidden>
+                    </column>
+                </columns>
             </table>
         </tables>
     </metadata>
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7CulturePivot.sql b/snprc_ehr/resources/queries/snprc_ehr/HL7CulturePivot.sql
index 4f3d8856b..07d6a6bf4 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7CulturePivot.sql
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7CulturePivot.sql
@@ -1,6 +1,7 @@
 SELECT
     obr.ANIMAL_ID as id,
     obr.OBSERVATION_DATE_TM as date,
+    obr.ANIMAL_ID || '-' || CAST(obr.OBSERVATION_DATE_TM AS VARCHAR) as key,
     obr.MESSAGE_ID,
     COALESCE (lp.ServiceId.ServiceName, obr.PROCEDURE_NAME) as PROCEDURE_NAME,
     obr.PROCEDURE_ID,
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7HematologyPivot.query.xml b/snprc_ehr/resources/queries/snprc_ehr/HL7HematologyPivot.query.xml
index 30d9242ab..c3888f804 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7HematologyPivot.query.xml
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7HematologyPivot.query.xml
@@ -2,7 +2,14 @@
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="HL7HematologyPivot" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
                 <tableTitle>Hematology Pivot</tableTitle>
+                <columns>
+                    <column columnName="Key">
+                        <isKeyField>true</isKeyField>
+                        <isHidden>true</isHidden>
+                    </column>
+                </columns>
             </table>
         </tables>
     </metadata>
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7HematologyPivot.sql b/snprc_ehr/resources/queries/snprc_ehr/HL7HematologyPivot.sql
index 778aaf4ca..e85632f99 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7HematologyPivot.sql
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7HematologyPivot.sql
@@ -1,6 +1,7 @@
 SELECT
     obr.ANIMAL_ID as id,
     obr.OBSERVATION_DATE_TM as date,
+    obr.ANIMAL_ID || '-' || CAST(obr.OBSERVATION_DATE_TM AS VARCHAR) as key,
     obr.MESSAGE_ID,
     COALESCE (lp.ServiceId.ServiceName, obr.PROCEDURE_NAME) as PROCEDURE_NAME,
     obr.PROCEDURE_ID,
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7HistologyPivot.query.xml b/snprc_ehr/resources/queries/snprc_ehr/HL7HistologyPivot.query.xml
index 7a648b718..b0bb616af 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7HistologyPivot.query.xml
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7HistologyPivot.query.xml
@@ -2,7 +2,14 @@
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="HL7HistologyPivot" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
                 <tableTitle>Histology Pivot</tableTitle>
+                <columns>
+                    <column columnName="Key">
+                        <isKeyField>true</isKeyField>
+                        <isHidden>true</isHidden>
+                    </column>
+                </columns>
             </table>
         </tables>
     </metadata>
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7HistologyPivot.sql b/snprc_ehr/resources/queries/snprc_ehr/HL7HistologyPivot.sql
index 8e570d272..5158720ad 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7HistologyPivot.sql
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7HistologyPivot.sql
@@ -1,5 +1,6 @@
 SELECT obr.ANIMAL_ID as id,
        obr.OBSERVATION_DATE_TM as date,
+    obr.ANIMAL_ID || '-' || CAST(obr.OBSERVATION_DATE_TM AS VARCHAR) as key,
     obr.MESSAGE_ID,
     COALESCE (lp.ServiceId.ServiceName, obr.PROCEDURE_NAME) as PROCEDURE_NAME,
     obr.PROCEDURE_ID,
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7MiscPivot.query.xml b/snprc_ehr/resources/queries/snprc_ehr/HL7MiscPivot.query.xml
index e6171430c..00f5c1a87 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7MiscPivot.query.xml
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7MiscPivot.query.xml
@@ -2,7 +2,14 @@
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="HL7MiscPivot" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
                 <tableTitle>Misc Tests Pivot</tableTitle>
+                <columns>
+                    <column columnName="Key">
+                        <isKeyField>true</isKeyField>
+                        <isHidden>true</isHidden>
+                    </column>
+                </columns>
             </table>
         </tables>
     </metadata>
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7MiscPivot.sql b/snprc_ehr/resources/queries/snprc_ehr/HL7MiscPivot.sql
index 84226cedd..f80d03bf6 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7MiscPivot.sql
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7MiscPivot.sql
@@ -1,5 +1,6 @@
 SELECT obr.ANIMAL_ID as id,
        obr.OBSERVATION_DATE_TM as date,
+    obr.ANIMAL_ID || '-' || CAST(obr.OBSERVATION_DATE_TM AS VARCHAR) as key,
     obr.MESSAGE_ID,
     COALESCE (lp.ServiceId.ServiceName, obr.PROCEDURE_NAME) as PROCEDURE_NAME,
     obr.PROCEDURE_ID,
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7ParasitologyPivot.query.xml b/snprc_ehr/resources/queries/snprc_ehr/HL7ParasitologyPivot.query.xml
index c65b2bb0c..840a8df95 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7ParasitologyPivot.query.xml
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7ParasitologyPivot.query.xml
@@ -2,7 +2,14 @@
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="HL7ParasitologyPivot" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
                 <tableTitle>Parasitology Pivot</tableTitle>
+                <columns>
+                    <column columnName="Key">
+                        <isKeyField>true</isKeyField>
+                        <isHidden>true</isHidden>
+                    </column>
+                </columns>
             </table>
         </tables>
     </metadata>
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7ParasitologyPivot.sql b/snprc_ehr/resources/queries/snprc_ehr/HL7ParasitologyPivot.sql
index 6675a0dcd..7987d2e49 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7ParasitologyPivot.sql
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7ParasitologyPivot.sql
@@ -1,5 +1,6 @@
 SELECT obr.ANIMAL_ID as id,
        obr.OBSERVATION_DATE_TM as date,
+    obr.ANIMAL_ID || '-' || CAST(obr.OBSERVATION_DATE_TM AS VARCHAR) as key,
     obr.MESSAGE_ID,
     COALESCE (lp.ServiceId.ServiceName, obr.PROCEDURE_NAME) as PROCEDURE_NAME,
     obr.PROCEDURE_ID,
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7SurveillancePivot.query.xml b/snprc_ehr/resources/queries/snprc_ehr/HL7SurveillancePivot.query.xml
index 8c42a8fce..55907be7f 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7SurveillancePivot.query.xml
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7SurveillancePivot.query.xml
@@ -2,11 +2,16 @@
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="HL7SurveillancePivot" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
                 <tableTitle>Surveillance Pivot</tableTitle>
                 <columns>
                     <column columnName="PROCEDURE_NAME">
                         <isHidden>true</isHidden>
                     </column>
+                    <column columnName="Key">
+                        <isKeyField>true</isKeyField>
+                        <isHidden>true</isHidden>
+                    </column>
                 </columns>
             </table>
         </tables>
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7SurveillancePivot.sql b/snprc_ehr/resources/queries/snprc_ehr/HL7SurveillancePivot.sql
index f827ae555..2768f5b99 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7SurveillancePivot.sql
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7SurveillancePivot.sql
@@ -1,5 +1,6 @@
 select Id,
     date,
+    obr.ANIMAL_ID || '-' || CAST(obr.OBSERVATION_DATE_TM AS VARCHAR) as key,
     PROCEDURE_NAME,
     PROCEDURE_ID,
     COMMENT,
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7UnknownPivot.query.xml b/snprc_ehr/resources/queries/snprc_ehr/HL7UnknownPivot.query.xml
index 3d532dcfd..46896ed02 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7UnknownPivot.query.xml
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7UnknownPivot.query.xml
@@ -2,7 +2,14 @@
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="HL7UnknownPivot" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
                 <tableTitle>Unknown Panel Category Pivot</tableTitle>
+                <columns>
+                    <column columnName="Key">
+                        <isKeyField>true</isKeyField>
+                        <isHidden>true</isHidden>
+                    </column>
+                </columns>
             </table>
         </tables>
     </metadata>
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7UnknownPivot.sql b/snprc_ehr/resources/queries/snprc_ehr/HL7UnknownPivot.sql
index 9958bb49c..c557fc0fb 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7UnknownPivot.sql
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7UnknownPivot.sql
@@ -1,6 +1,7 @@
 SELECT
     obr.ANIMAL_ID as id,
     obr.OBSERVATION_DATE_TM as date,
+    obr.ANIMAL_ID || '-' || CAST(obr.OBSERVATION_DATE_TM AS VARCHAR) as key,
     obr.MESSAGE_ID,
     COALESCE (lp.ServiceId.ServiceName, obr.PROCEDURE_NAME) as PROCEDURE_NAME,
     obr.PROCEDURE_ID,
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7Urinalysis.query.xml b/snprc_ehr/resources/queries/snprc_ehr/HL7Urinalysis.query.xml
index 5e01645b2..5eeff14fc 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7Urinalysis.query.xml
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7Urinalysis.query.xml
@@ -2,7 +2,14 @@
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
             <table tableName="HL7UrinalysisPivot" tableDbType="NOT_IN_DB">
+                <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
                 <tableTitle>Urinalysis Pivot</tableTitle>
+                <columns>
+                    <column columnName="Key">
+                        <isKeyField>true</isKeyField>
+                        <isHidden>true</isHidden>
+                    </column>
+                </columns>
             </table>
         </tables>
     </metadata>
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7UrinalysisPivot.sql b/snprc_ehr/resources/queries/snprc_ehr/HL7UrinalysisPivot.sql
index 1ddf9af4f..0f20e91db 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7UrinalysisPivot.sql
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7UrinalysisPivot.sql
@@ -1,6 +1,7 @@
 SELECT
     obr.ANIMAL_ID as id,
     obr.OBSERVATION_DATE_TM as date,
+    obr.ANIMAL_ID || '-' || CAST(obr.OBSERVATION_DATE_TM AS VARCHAR) as key,
     obr.MESSAGE_ID,
     COALESCE (lp.ServiceId.ServiceName, obr.PROCEDURE_NAME) as PROCEDURE_NAME,
     obr.PROCEDURE_ID,
diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/table/SNPRC_EHRCustomizer.java b/snprc_ehr/src/org/labkey/snprc_ehr/table/SNPRC_EHRCustomizer.java
index 717039f96..f0c7079ba 100644
--- a/snprc_ehr/src/org/labkey/snprc_ehr/table/SNPRC_EHRCustomizer.java
+++ b/snprc_ehr/src/org/labkey/snprc_ehr/table/SNPRC_EHRCustomizer.java
@@ -123,6 +123,7 @@ public void doSharedCustomization(AbstractTableInfo ti)
         {
             ti.getMutableColumn("project").setLabel("Charge Id");
         }
+
     }
 
     public UserSchema getEHRUserSchema(AbstractTableInfo ds, String name)
@@ -202,6 +203,14 @@ public void doTableSpecificCustomizations(AbstractTableInfo ti)
         {
             customizeTasks(ti);
         }
+
+        // add assignments and age to hl7 pivot tables
+        if (ti.getName().toLowerCase().contains("hl7") && ti.getName().toLowerCase().contains("pivot")) {
+            UserSchema snprc_ehrSchema = getEHRUserSchema(ti, SNPRC_EHRSchema.NAME);
+            appendAssignmentAtTimeColumn(snprc_ehrSchema, ti, DATE_COLUMN);
+            appendAgeAtTimeColumn(snprc_ehrSchema, ti, DATE_COLUMN);
+        }
+
     }
 
     /**
@@ -225,6 +234,7 @@ private void addCalculatedColumns(AbstractTableInfo table)
             appendAssignmentAtTimeColumn(ehrSchema, table, DATE_COLUMN);
             appendAgeAtTimeColumn(ehrSchema, table, DATE_COLUMN);
         }
+
     }
 
     /**