diff --git a/nirc_ehr/resources/etls/physicalExam.xml b/nirc_ehr/resources/etls/physicalExam.xml
index cd1b5c1b..e60c6c5b 100644
--- a/nirc_ehr/resources/etls/physicalExam.xml
+++ b/nirc_ehr/resources/etls/physicalExam.xml
@@ -4,7 +4,7 @@
     <description>Physical Exam data</description>
     <transforms>
         <transform id="step1" type="org.labkey.di.pipeline.TransformTask">
-            <description>Copy to pairings target</description>
+            <description>Copy to physical exam target</description>
             <source schemaName="dbo" queryName="q_physicalExam"/>
             <destination schemaName="study" queryName="physicalExam"
                          bulkLoad="true" batchSize="5000" targetOption="merge">
diff --git a/nirc_ehr/resources/queries/dbo/q_cases.sql b/nirc_ehr/resources/queries/dbo/q_cases.sql
index dd5a957f..79c6d9f7 100644
--- a/nirc_ehr/resources/queries/dbo/q_cases.sql
+++ b/nirc_ehr/resources/queries/dbo/q_cases.sql
@@ -8,21 +8,9 @@ SELECT * FROM (
                    THEN 'unknown'
                ELSE (trim(anmEvt.STAFF_ID.STAFF_FIRST_NAME)
                    || '|' || trim(anmEvt.STAFF_ID.STAFF_LAST_NAME)) END)               AS performedby,
-           (CASE
-                WHEN anmEvt.EVENT_ID = 1580
-                    THEN 'Open Remark: ' ||
-                         (CASE WHEN anmCmt.TEXT IS NULL THEN 'None' ELSE anmCmt.TEXT END) ||
-                         '; Open Diagnosis: ' ||
-                         (CASE WHEN anmEvt.DIAGNOSIS IS NULL THEN 'None' ELSE anmEvt.DIAGNOSIS END)
-               END) AS openRemark,
-           (CASE
-                WHEN anmEvt.EVENT_ID = 1677
-                    THEN 'Close Remark: ' ||
-                         (CASE WHEN anmCmt.TEXT IS NULL THEN 'None' ELSE anmCmt.TEXT END) ||
-                         '; Close Diagnosis: ' ||
-                         (CASE WHEN anmEvt.DIAGNOSIS IS NULL THEN 'None' ELSE anmEvt.DIAGNOSIS END)
-               END) AS closeRemark,
-          COALESCE(dea.deathDate, dep.eventDate)                                 AS enddate,
+           (CASE WHEN anmEvt.EVENT_ID = 1580 THEN ('Open Remark: ' || COALESCE(anmCmt.TEXT, 'None') || '; Open Diagnosis: ' || COALESCE(anmEvt.DIAGNOSIS, 'None')) ELSE NULL END)      AS openRemark,
+           (CASE WHEN anmEvt.EVENT_ID = 1677 THEN ('Close Remark: ' || COALESCE(anmCmt.TEXT, 'None') || '; Close Diagnosis: ' || COALESCE(anmEvt.DIAGNOSIS, 'None')) ELSE NULL END)      AS closeRemark,
+           COALESCE(dea.deathDate, dep.eventDate)                                 AS enddate,
           anmEvt.EVENT_ID.NAME                                                   AS category,
           CASE
               WHEN anmEvt.ATTACHMENT_PATH IS NOT NULL THEN
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/.qview.xml
index a7dbceb0..b08797c3 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/.qview.xml
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/.qview.xml
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,7 +21,6 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Area 11.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Area 11.qview.xml
index da8b8ce3..edcb23f8 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Area 11.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Area 11.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 11"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 11"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Area 51.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Area 51.qview.xml
index 4abfd59c..d1274dc7 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Area 51.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Area 51.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 51"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 51"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 10.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 10.qview.xml
index 44edca78..2aa85356 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 10.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 10.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10"/>
+        <filter column="Id/curLocation/room/floor/building/building/Description" operator="eq" value="Building 10"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 10C.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 10C.qview.xml
index 1bb31c10..81368966 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 10C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 10C.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 27.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 27.qview.xml
index a9d64107..b3694232 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 27.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 27.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 27"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 27"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 28.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 28.qview.xml
index b7c61c08..7cd8a6de 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 28.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 28.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 28"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 28"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 29.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 29.qview.xml
index dd71b417..6798f6c4 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 29.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 29.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 29"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 29"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 30.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 30.qview.xml
index 774909ff..8225a433 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 30.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 30.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 30"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 30"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 31.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 31.qview.xml
index 87e955c2..2bdc6ca1 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 31.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 31.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 31C.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 31C.qview.xml
index ae99331d..e86d068c 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 31C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 31C.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 31D.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 31D.qview.xml
index b9e39d2f..c75ade95 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 31D.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 31D.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31D"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31D"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 32.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 32.qview.xml
index bd1c26cf..4fafe490 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 32.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 32.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 32"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 32"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 34.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 34.qview.xml
index a36fdf61..19c17011 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 34.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 34.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 34"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 34"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 37.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 37.qview.xml
index bb68753a..d22bd89e 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 37.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 37.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 37"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 37"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 41.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 41.qview.xml
index 19862483..5eaf22eb 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 41.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 41.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 41"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 41"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 42.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 42.qview.xml
index c7bf32ff..5598b7c4 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 42.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 42.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 42"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 42"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 43.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 43.qview.xml
index 79108e7d..d864dbea 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 43.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 43.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 43"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 43"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 44.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 44.qview.xml
index 3d603234..3c0e4c64 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 44.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 44.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 44"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 44"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 45.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 45.qview.xml
index e2481c77..49d52f63 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 45.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 45.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 45"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 45"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 46.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 46.qview.xml
index 658e1193..9944c43b 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 46.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 46.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 46"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 46"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 50.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 50.qview.xml
index 8f32422b..7e867284 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 50.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 50.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 50"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 50"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 52.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 52.qview.xml
index ca879a03..78608080 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 52.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 52.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 52"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 52"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 53.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 53.qview.xml
index 83c77d53..7c632311 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 53.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 53.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 53"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 53"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 54A.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 54A.qview.xml
index 8babff4b..b2f3a2b2 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 54A.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 54A.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54A"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54A"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 54B.qview.xml b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 54B.qview.xml
index 6bc01e82..449c6ac6 100644
--- a/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 54B.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeBehaviorCases/Building 54B.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54B"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54B"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/.qview.xml
index a7dbceb0..b08797c3 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/.qview.xml
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/.qview.xml
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,7 +21,6 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Area 11.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Area 11.qview.xml
index da8b8ce3..edcb23f8 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Area 11.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Area 11.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 11"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 11"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Area 51.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Area 51.qview.xml
index 4abfd59c..d1274dc7 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Area 51.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Area 51.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 51"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 51"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 10.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 10.qview.xml
index 44edca78..1bf05759 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 10.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 10.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 10C.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 10C.qview.xml
index 1bb31c10..81368966 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 10C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 10C.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 27.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 27.qview.xml
index a9d64107..b3694232 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 27.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 27.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 27"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 27"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 28.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 28.qview.xml
index b7c61c08..7cd8a6de 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 28.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 28.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 28"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 28"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 29.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 29.qview.xml
index dd71b417..6798f6c4 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 29.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 29.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 29"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 29"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 30.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 30.qview.xml
index 774909ff..8225a433 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 30.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 30.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 30"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 30"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 31.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 31.qview.xml
index 87e955c2..2bdc6ca1 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 31.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 31.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 31C.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 31C.qview.xml
index ae99331d..e86d068c 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 31C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 31C.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 31D.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 31D.qview.xml
index b9e39d2f..c75ade95 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 31D.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 31D.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31D"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31D"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 32.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 32.qview.xml
index bd1c26cf..4fafe490 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 32.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 32.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 32"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 32"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 34.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 34.qview.xml
index a36fdf61..19c17011 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 34.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 34.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 34"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 34"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 37.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 37.qview.xml
index bb68753a..d22bd89e 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 37.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 37.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 37"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 37"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 41.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 41.qview.xml
index 19862483..5eaf22eb 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 41.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 41.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 41"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 41"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 42.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 42.qview.xml
index c7bf32ff..5598b7c4 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 42.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 42.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 42"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 42"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 43.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 43.qview.xml
index 79108e7d..d864dbea 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 43.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 43.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 43"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 43"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 44.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 44.qview.xml
index 3d603234..3c0e4c64 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 44.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 44.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 44"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 44"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 45.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 45.qview.xml
index e2481c77..49d52f63 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 45.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 45.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 45"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 45"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 46.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 46.qview.xml
index 658e1193..9944c43b 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 46.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 46.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 46"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 46"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 50.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 50.qview.xml
index 8f32422b..7e867284 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 50.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 50.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 50"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 50"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 52.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 52.qview.xml
index ca879a03..78608080 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 52.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 52.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 52"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 52"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 53.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 53.qview.xml
index 83c77d53..7c632311 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 53.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 53.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 53"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 53"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 54A.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 54A.qview.xml
index 8babff4b..b2f3a2b2 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 54A.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 54A.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54A"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54A"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 54B.qview.xml b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 54B.qview.xml
index 6bc01e82..449c6ac6 100644
--- a/nirc_ehr/resources/queries/study/activeClinicalCases/Building 54B.qview.xml	
+++ b/nirc_ehr/resources/queries/study/activeClinicalCases/Building 54B.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54B"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54B"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/alopecia/.qview.xml b/nirc_ehr/resources/queries/study/alopecia/.qview.xml
index 5cf997f7..a34144d7 100644
--- a/nirc_ehr/resources/queries/study/alopecia/.qview.xml
+++ b/nirc_ehr/resources/queries/study/alopecia/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/arrival/.qview.xml b/nirc_ehr/resources/queries/study/arrival/.qview.xml
index 1fe35f91..81c4e233 100644
--- a/nirc_ehr/resources/queries/study/arrival/.qview.xml
+++ b/nirc_ehr/resources/queries/study/arrival/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/.qview.xml
index 27cbbe4b..b08797c3 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/.qview.xml
+++ b/nirc_ehr/resources/queries/study/behaviorCases/.qview.xml
@@ -1,7 +1,11 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,7 +21,6 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Area 11.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Area 11.qview.xml
index da8b8ce3..edcb23f8 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Area 11.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Area 11.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 11"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 11"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Area 51.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Area 51.qview.xml
index 4abfd59c..d1274dc7 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Area 51.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Area 51.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 51"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 51"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 10.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 10.qview.xml
index 44edca78..1bf05759 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 10.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 10.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 10C.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 10C.qview.xml
index 1bb31c10..81368966 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 10C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 10C.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 27.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 27.qview.xml
index a9d64107..b3694232 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 27.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 27.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 27"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 27"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 28.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 28.qview.xml
index b7c61c08..7cd8a6de 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 28.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 28.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 28"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 28"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 29.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 29.qview.xml
index dd71b417..6798f6c4 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 29.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 29.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 29"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 29"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 30.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 30.qview.xml
index 774909ff..8225a433 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 30.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 30.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 30"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 30"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 31.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 31.qview.xml
index 87e955c2..2bdc6ca1 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 31.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 31.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 31C.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 31C.qview.xml
index ae99331d..e86d068c 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 31C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 31C.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 31D.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 31D.qview.xml
index b9e39d2f..c75ade95 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 31D.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 31D.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31D"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31D"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 32.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 32.qview.xml
index bd1c26cf..4fafe490 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 32.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 32.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 32"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 32"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 34.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 34.qview.xml
index a36fdf61..19c17011 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 34.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 34.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 34"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 34"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 37.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 37.qview.xml
index bb68753a..d22bd89e 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 37.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 37.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 37"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 37"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 41.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 41.qview.xml
index 19862483..5eaf22eb 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 41.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 41.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 41"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 41"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 42.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 42.qview.xml
index c7bf32ff..5598b7c4 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 42.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 42.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 42"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 42"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 43.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 43.qview.xml
index 79108e7d..d864dbea 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 43.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 43.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 43"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 43"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 44.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 44.qview.xml
index 3d603234..3c0e4c64 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 44.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 44.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 44"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 44"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 45.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 45.qview.xml
index e2481c77..49d52f63 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 45.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 45.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 45"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 45"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 46.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 46.qview.xml
index 658e1193..9944c43b 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 46.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 46.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 46"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 46"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 50.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 50.qview.xml
index 8f32422b..7e867284 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 50.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 50.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 50"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 50"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 52.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 52.qview.xml
index ca879a03..78608080 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 52.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 52.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 52"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 52"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 53.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 53.qview.xml
index 83c77d53..7c632311 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 53.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 53.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 53"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 53"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 54A.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 54A.qview.xml
index 8babff4b..b2f3a2b2 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 54A.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 54A.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54A"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54A"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorCases/Building 54B.qview.xml b/nirc_ehr/resources/queries/study/behaviorCases/Building 54B.qview.xml
index 6bc01e82..449c6ac6 100644
--- a/nirc_ehr/resources/queries/study/behaviorCases/Building 54B.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorCases/Building 54B.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54B"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54B"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/.qview.xml
index f007448a..a48d5a51 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/.qview.xml
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Area 11.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Area 11.qview.xml
index 170c2fc6..02bbb1cf 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Area 11.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Area 11.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 11"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 11"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Area 51.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Area 51.qview.xml
index 500340ff..f1e9bde1 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Area 51.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Area 51.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 51"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 51"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 10.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 10.qview.xml
index baae82e9..6c5a2dfb 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 10.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 10.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 10C.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 10C.qview.xml
index a24fe82a..0ebcf0ad 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 10C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 10C.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 27.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 27.qview.xml
index e0a1bc21..27607545 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 27.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 27.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 27"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 27"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 28.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 28.qview.xml
index 0c54baa8..2ed3cc19 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 28.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 28.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 28"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 28"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 29.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 29.qview.xml
index 2cc1a93c..e40c6bf5 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 29.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 29.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 29"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 29"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 30.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 30.qview.xml
index 446ee7a2..8220278d 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 30.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 30.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 30"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 30"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 31.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 31.qview.xml
index 236f3485..96f771c3 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 31.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 31.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 31C.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 31C.qview.xml
index dafbd043..17a41c20 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 31C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 31C.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 31D.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 31D.qview.xml
index ad0e8138..5d65614b 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 31D.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 31D.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31D"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31D"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 32.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 32.qview.xml
index cf6d82ad..284f6849 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 32.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 32.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 32"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 32"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 34.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 34.qview.xml
index 55b578a8..2ec27831 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 34.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 34.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 34"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 34"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 37.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 37.qview.xml
index 8b4cd622..4880b023 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 37.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 37.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 37"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 37"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 41.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 41.qview.xml
index 27a3b4cb..fca1205d 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 41.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 41.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 41"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 41"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 42.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 42.qview.xml
index 2ffd3947..2b2ed756 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 42.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 42.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 42"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 42"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 43.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 43.qview.xml
index 0a1d68e2..065334b8 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 43.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 43.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 43"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 43"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 44.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 44.qview.xml
index 09bf5911..db70e105 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 44.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 44.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 44"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 44"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 45.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 45.qview.xml
index 89c5fbb8..36036ee6 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 45.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 45.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 45"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 45"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 46.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 46.qview.xml
index 7fc98624..d13731e1 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 46.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 46.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 46"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 46"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 50.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 50.qview.xml
index 1af229c1..d9d616f3 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 50.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 50.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 50"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 50"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 52.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 52.qview.xml
index fed3ee58..49b3e351 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 52.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 52.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 52"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 52"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 53.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 53.qview.xml
index 7969d672..4bdb49b9 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 53.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 53.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 53"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 53"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 54A.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 54A.qview.xml
index 15d80661..ce9d4e18 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 54A.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 54A.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54A"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54A"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/behaviorObservations/Building 54B.qview.xml b/nirc_ehr/resources/queries/study/behaviorObservations/Building 54B.qview.xml
index 966111fc..d0c9046f 100644
--- a/nirc_ehr/resources/queries/study/behaviorObservations/Building 54B.qview.xml	
+++ b/nirc_ehr/resources/queries/study/behaviorObservations/Building 54B.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54B"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54B"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/blood/.qview.xml b/nirc_ehr/resources/queries/study/blood/.qview.xml
index 73ee97c3..2d2db6f9 100644
--- a/nirc_ehr/resources/queries/study/blood/.qview.xml
+++ b/nirc_ehr/resources/queries/study/blood/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/breeder/.qview.xml b/nirc_ehr/resources/queries/study/breeder/.qview.xml
index 2e2a0afc..63ccae39 100644
--- a/nirc_ehr/resources/queries/study/breeder/.qview.xml
+++ b/nirc_ehr/resources/queries/study/breeder/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/cases/.qview.xml b/nirc_ehr/resources/queries/study/cases/.qview.xml
index 27cbbe4b..340d7701 100644
--- a/nirc_ehr/resources/queries/study/cases/.qview.xml
+++ b/nirc_ehr/resources/queries/study/cases/.qview.xml
@@ -1,7 +1,10 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
diff --git a/nirc_ehr/resources/queries/study/cases/Active Behavior Cases.qview.xml b/nirc_ehr/resources/queries/study/cases/Active Behavior Cases.qview.xml
index 0f3bf9fc..8333562d 100644
--- a/nirc_ehr/resources/queries/study/cases/Active Behavior Cases.qview.xml	
+++ b/nirc_ehr/resources/queries/study/cases/Active Behavior Cases.qview.xml	
@@ -1,10 +1,10 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
         <column name="caseHistory"/>
         <column name="Id"/>
         <column name="Id/Demographics/species"/>
-        <column name="Id/curLocation/cage/room/fullRoom"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
         <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
diff --git a/nirc_ehr/resources/queries/study/cases/Active Clinical Cases.qview.xml b/nirc_ehr/resources/queries/study/cases/Active Clinical Cases.qview.xml
index 66d5aea1..6081418c 100644
--- a/nirc_ehr/resources/queries/study/cases/Active Clinical Cases.qview.xml	
+++ b/nirc_ehr/resources/queries/study/cases/Active Clinical Cases.qview.xml	
@@ -1,13 +1,11 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
         <column name="caseHistory"/>
         <column name="Id"/>
-        <column name="Id/curLocation/cage">
-            <properties>
-                <property name="columnTitle" value="Location"/>
-            </properties>
-        </column>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="Id/activeProjectAssignments/project"/>
         <column name="Id/activeProtocolAssignments/protocolDisplayName">
             <properties>
diff --git a/nirc_ehr/resources/queries/study/cases/All Behavior Cases.qview.xml b/nirc_ehr/resources/queries/study/cases/All Behavior Cases.qview.xml
index d460044b..261b1bb0 100644
--- a/nirc_ehr/resources/queries/study/cases/All Behavior Cases.qview.xml	
+++ b/nirc_ehr/resources/queries/study/cases/All Behavior Cases.qview.xml	
@@ -1,10 +1,10 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
         <column name="caseHistory"/>
         <column name="Id"/>
         <column name="Id/Demographics/species"/>
-        <column name="Id/curLocation/cage/room/fullRoom"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
         <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
diff --git a/nirc_ehr/resources/queries/study/cases/All Clinical Cases.qview.xml b/nirc_ehr/resources/queries/study/cases/All Clinical Cases.qview.xml
index 70c5f5bb..73fb0b26 100644
--- a/nirc_ehr/resources/queries/study/cases/All Clinical Cases.qview.xml	
+++ b/nirc_ehr/resources/queries/study/cases/All Clinical Cases.qview.xml	
@@ -1,13 +1,11 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
         <column name="caseHistory"/>
         <column name="Id"/>
-        <column name="Id/curLocation/cage">
-            <properties>
-                <property name="columnTitle" value="Location"/>
-            </properties>
-        </column>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="Id/activeProjectAssignments/project"/>
         <column name="Id/activeProtocolAssignments/protocolDisplayName">
             <properties>
diff --git a/nirc_ehr/resources/queries/study/chemistryResults/.qview.xml b/nirc_ehr/resources/queries/study/chemistryResults/.qview.xml
index 9381f3c8..11ef289a 100644
--- a/nirc_ehr/resources/queries/study/chemistryResults/.qview.xml
+++ b/nirc_ehr/resources/queries/study/chemistryResults/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="Id"/>
         <column name="date"/>
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/.qview.xml
index 27cbbe4b..b08797c3 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/.qview.xml
+++ b/nirc_ehr/resources/queries/study/clinicalCases/.qview.xml
@@ -1,7 +1,11 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,7 +21,6 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Area 11.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Area 11.qview.xml
index da8b8ce3..edcb23f8 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Area 11.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Area 11.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 11"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 11"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Area 51.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Area 51.qview.xml
index 4abfd59c..d1274dc7 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Area 51.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Area 51.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 51"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 51"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 10.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 10.qview.xml
index 44edca78..1bf05759 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 10.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 10.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 10C.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 10C.qview.xml
index 1bb31c10..81368966 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 10C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 10C.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 27.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 27.qview.xml
index a9d64107..b3694232 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 27.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 27.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 27"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 27"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 28.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 28.qview.xml
index b7c61c08..7cd8a6de 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 28.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 28.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 28"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 28"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 29.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 29.qview.xml
index dd71b417..6798f6c4 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 29.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 29.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 29"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 29"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 30.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 30.qview.xml
index 774909ff..8225a433 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 30.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 30.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 30"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 30"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 31.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 31.qview.xml
index 87e955c2..2bdc6ca1 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 31.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 31.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 31C.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 31C.qview.xml
index ae99331d..e86d068c 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 31C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 31C.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 31D.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 31D.qview.xml
index b9e39d2f..c75ade95 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 31D.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 31D.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31D"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31D"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 32.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 32.qview.xml
index bd1c26cf..4fafe490 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 32.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 32.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 32"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 32"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 34.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 34.qview.xml
index a36fdf61..19c17011 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 34.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 34.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 34"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 34"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 37.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 37.qview.xml
index bb68753a..d22bd89e 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 37.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 37.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 37"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 37"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 41.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 41.qview.xml
index 19862483..5eaf22eb 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 41.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 41.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 41"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 41"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 42.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 42.qview.xml
index c7bf32ff..5598b7c4 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 42.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 42.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 42"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 42"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 43.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 43.qview.xml
index 79108e7d..d864dbea 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 43.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 43.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 43"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 43"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 44.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 44.qview.xml
index 3d603234..3c0e4c64 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 44.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 44.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 44"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 44"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 45.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 45.qview.xml
index e2481c77..49d52f63 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 45.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 45.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 45"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 45"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 46.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 46.qview.xml
index 658e1193..9944c43b 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 46.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 46.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 46"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 46"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 50.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 50.qview.xml
index 8f32422b..7e867284 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 50.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 50.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 50"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 50"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 52.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 52.qview.xml
index ca879a03..78608080 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 52.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 52.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 52"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 52"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 53.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 53.qview.xml
index 83c77d53..7c632311 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 53.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 53.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 53"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 53"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 54A.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 54A.qview.xml
index 8babff4b..b2f3a2b2 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 54A.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 54A.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54A"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54A"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalCases/Building 54B.qview.xml b/nirc_ehr/resources/queries/study/clinicalCases/Building 54B.qview.xml
index 6bc01e82..449c6ac6 100644
--- a/nirc_ehr/resources/queries/study/clinicalCases/Building 54B.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalCases/Building 54B.qview.xml	
@@ -1,7 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="caseCheck"/>
+        <column name="caseHistory"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="reviewdate"/>
         <column name="enddate"/>
@@ -17,12 +21,11 @@
                 <property name="columnTitle" value="Status"/>
             </properties>
         </column>
-        <column name="caseHistory"/>
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54B"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54B"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/.qview.xml
index d044aafc..7b1fc1ad 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/.qview.xml
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Area 11.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Area 11.qview.xml
index bc281c45..d6bc3899 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Area 11.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Area 11.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 11"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 11"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Area 51.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Area 51.qview.xml
index a53c398c..afba1b7f 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Area 51.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Area 51.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 51"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 51"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 10.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 10.qview.xml
index 766836fc..81afb770 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 10.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 10.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 10C.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 10C.qview.xml
index db495ee2..cd80d91a 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 10C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 10C.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 27.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 27.qview.xml
index bafb41c1..40176cae 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 27.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 27.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 27"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 27"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 28.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 28.qview.xml
index d65b4a09..081bda66 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 28.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 28.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 28"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 28"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 29.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 29.qview.xml
index 14869430..e1a5e466 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 29.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 29.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 29"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 29"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 30.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 30.qview.xml
index c95af3ee..2a1d8320 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 30.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 30.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 30"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 30"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 31.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 31.qview.xml
index 98c186b3..3a35f29c 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 31.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 31.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 31C.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 31C.qview.xml
index db72f9f8..ee6575a1 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 31C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 31C.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 31D.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 31D.qview.xml
index 462d2d2f..8189627a 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 31D.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 31D.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31D"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31D"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 32.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 32.qview.xml
index c89e0869..c6c4d4e9 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 32.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 32.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 32"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 32"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 34.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 34.qview.xml
index 4f654ba7..159b5cdf 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 34.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 34.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 34"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 34"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 37.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 37.qview.xml
index 91a399ea..0cb4ba29 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 37.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 37.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 37"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 37"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 41.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 41.qview.xml
index a07d8706..ecf54530 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 41.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 41.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 41"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 41"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 42.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 42.qview.xml
index 94e97d5c..9ce6c0ac 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 42.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 42.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 42"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 42"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 43.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 43.qview.xml
index e590f5a6..c7cb4d66 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 43.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 43.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 43"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 43"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 44.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 44.qview.xml
index 58b5db55..71daaac1 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 44.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 44.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 44"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 44"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 45.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 45.qview.xml
index 52a9e3c7..6f5e9341 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 45.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 45.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 45"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 45"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 46.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 46.qview.xml
index 971a3545..536923d5 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 46.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 46.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 46"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 46"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 50.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 50.qview.xml
index 2b1161bf..8a45fabc 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 50.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 50.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 50"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 50"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 52.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 52.qview.xml
index f937e30c..a87ccca5 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 52.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 52.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 52"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 52"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 53.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 53.qview.xml
index 1e6ba4cc..d4432809 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 53.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 53.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 53"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 53"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 54A.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 54A.qview.xml
index 8412bc14..2dbdacfa 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 54A.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 54A.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54A"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54A"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinicalObservations/Building 54B.qview.xml b/nirc_ehr/resources/queries/study/clinicalObservations/Building 54B.qview.xml
index dcf3bde9..ed146742 100644
--- a/nirc_ehr/resources/queries/study/clinicalObservations/Building 54B.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinicalObservations/Building 54B.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="area"/>
         <column name="observation"/>
@@ -12,6 +15,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54B"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54B"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/.qview.xml
index f007448a..a48d5a51 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/.qview.xml
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Area 11.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Area 11.qview.xml
index 170c2fc6..02bbb1cf 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Area 11.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Area 11.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 11"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 11"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Area 51.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Area 51.qview.xml
index 500340ff..f1e9bde1 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Area 51.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Area 51.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 51"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 51"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 10.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 10.qview.xml
index baae82e9..6c5a2dfb 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 10.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 10.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 10C.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 10C.qview.xml
index a24fe82a..0ebcf0ad 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 10C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 10C.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 27.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 27.qview.xml
index e0a1bc21..27607545 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 27.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 27.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 27"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 27"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 28.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 28.qview.xml
index 0c54baa8..2ed3cc19 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 28.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 28.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 28"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 28"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 29.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 29.qview.xml
index 2cc1a93c..e40c6bf5 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 29.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 29.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 29"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 29"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 30.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 30.qview.xml
index 446ee7a2..8220278d 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 30.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 30.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 30"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 30"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 31.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 31.qview.xml
index 236f3485..96f771c3 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 31.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 31.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 31C.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 31C.qview.xml
index dafbd043..17a41c20 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 31C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 31C.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 31D.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 31D.qview.xml
index ad0e8138..5d65614b 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 31D.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 31D.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31D"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31D"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 32.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 32.qview.xml
index cf6d82ad..284f6849 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 32.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 32.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 32"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 32"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 34.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 34.qview.xml
index 55b578a8..2ec27831 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 34.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 34.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 34"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 34"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 37.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 37.qview.xml
index 8b4cd622..4880b023 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 37.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 37.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 37"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 37"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 41.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 41.qview.xml
index 27a3b4cb..fca1205d 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 41.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 41.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 41"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 41"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 42.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 42.qview.xml
index 2ffd3947..2b2ed756 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 42.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 42.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 42"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 42"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 43.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 43.qview.xml
index 0a1d68e2..065334b8 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 43.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 43.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 43"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 43"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 44.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 44.qview.xml
index 09bf5911..db70e105 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 44.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 44.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 44"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 44"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 45.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 45.qview.xml
index 89c5fbb8..36036ee6 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 45.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 45.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 45"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 45"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 46.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 46.qview.xml
index 7fc98624..d13731e1 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 46.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 46.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 46"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 46"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 50.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 50.qview.xml
index 1af229c1..d9d616f3 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 50.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 50.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 50"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 50"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 52.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 52.qview.xml
index fed3ee58..49b3e351 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 52.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 52.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 52"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 52"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 53.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 53.qview.xml
index 7969d672..4bdb49b9 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 53.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 53.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 53"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 53"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 54A.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 54A.qview.xml
index 15d80661..ce9d4e18 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 54A.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 54A.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54A"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54A"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 54B.qview.xml b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 54B.qview.xml
index 966111fc..d0c9046f 100644
--- a/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 54B.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observationsSummary/Building 54B.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="category"/>
         <column name="area"/>
@@ -13,6 +16,6 @@
         <column name="QCState"/>
     </columns>
     <filters>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54B"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54B"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/clinremarks/.qview.xml b/nirc_ehr/resources/queries/study/clinremarks/.qview.xml
index 4eade6c9..903f88d2 100644
--- a/nirc_ehr/resources/queries/study/clinremarks/.qview.xml
+++ b/nirc_ehr/resources/queries/study/clinremarks/.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="performedby"/>
         <column name="remark"/>
diff --git a/nirc_ehr/resources/queries/study/clinremarks/Behavior.qview.xml b/nirc_ehr/resources/queries/study/clinremarks/Behavior.qview.xml
index 973c4236..24f5a400 100644
--- a/nirc_ehr/resources/queries/study/clinremarks/Behavior.qview.xml
+++ b/nirc_ehr/resources/queries/study/clinremarks/Behavior.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="performedby"/>
         <column name="remark"/>
diff --git a/nirc_ehr/resources/queries/study/clinremarks/Clinical.qview.xml b/nirc_ehr/resources/queries/study/clinremarks/Clinical.qview.xml
index 0809cf4a..6cb37716 100644
--- a/nirc_ehr/resources/queries/study/clinremarks/Clinical.qview.xml
+++ b/nirc_ehr/resources/queries/study/clinremarks/Clinical.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="performedby"/>
         <column name="remark"/>
diff --git a/nirc_ehr/resources/queries/study/deaths/.qview.xml b/nirc_ehr/resources/queries/study/deaths/.qview.xml
index f2b218cc..5bc1b28b 100644
--- a/nirc_ehr/resources/queries/study/deaths/.qview.xml
+++ b/nirc_ehr/resources/queries/study/deaths/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/demographics/.qview.xml b/nirc_ehr/resources/queries/study/demographics/.qview.xml
index 5cb7c6e2..73dc6ca0 100644
--- a/nirc_ehr/resources/queries/study/demographics/.qview.xml
+++ b/nirc_ehr/resources/queries/study/demographics/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/departure/.qview.xml b/nirc_ehr/resources/queries/study/departure/.qview.xml
index 3ede84a5..d7bdb042 100644
--- a/nirc_ehr/resources/queries/study/departure/.qview.xml
+++ b/nirc_ehr/resources/queries/study/departure/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/drug/.qview.xml b/nirc_ehr/resources/queries/study/drug/.qview.xml
index 7c9d6eb1..7c4fbfdd 100644
--- a/nirc_ehr/resources/queries/study/drug/.qview.xml
+++ b/nirc_ehr/resources/queries/study/drug/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/exemptions/.qview.xml b/nirc_ehr/resources/queries/study/exemptions/.qview.xml
index c8f9284e..5c625c06 100644
--- a/nirc_ehr/resources/queries/study/exemptions/.qview.xml
+++ b/nirc_ehr/resources/queries/study/exemptions/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/flags/.qview.xml b/nirc_ehr/resources/queries/study/flags/.qview.xml
index 05349f54..dba554d8 100644
--- a/nirc_ehr/resources/queries/study/flags/.qview.xml
+++ b/nirc_ehr/resources/queries/study/flags/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView" label="All Flags">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" label="All Flags" canOverride="true">
     <columns>
         <column name="Id"/>
         <column name="date"/>
diff --git a/nirc_ehr/resources/queries/study/grossPathology/.qview.xml b/nirc_ehr/resources/queries/study/grossPathology/.qview.xml
index b575931a..abe813d5 100644
--- a/nirc_ehr/resources/queries/study/grossPathology/.qview.xml
+++ b/nirc_ehr/resources/queries/study/grossPathology/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/housing/.qview.xml b/nirc_ehr/resources/queries/study/housing/.qview.xml
index 6f2dad49..be455e89 100644
--- a/nirc_ehr/resources/queries/study/housing/.qview.xml
+++ b/nirc_ehr/resources/queries/study/housing/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/housing/Active Housing.qview.xml b/nirc_ehr/resources/queries/study/housing/Active Housing.qview.xml
index 5a18deda..9c05c737 100644
--- a/nirc_ehr/resources/queries/study/housing/Active Housing.qview.xml	
+++ b/nirc_ehr/resources/queries/study/housing/Active Housing.qview.xml	
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="Id"/>
         <column name="date"/>
diff --git a/nirc_ehr/resources/queries/study/necropsy/.qview.xml b/nirc_ehr/resources/queries/study/necropsy/.qview.xml
index 125f555f..6eea6283 100644
--- a/nirc_ehr/resources/queries/study/necropsy/.qview.xml
+++ b/nirc_ehr/resources/queries/study/necropsy/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/notes/.qview.xml b/nirc_ehr/resources/queries/study/notes/.qview.xml
index 369449fb..1ca2417c 100644
--- a/nirc_ehr/resources/queries/study/notes/.qview.xml
+++ b/nirc_ehr/resources/queries/study/notes/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/obs/.qview.xml b/nirc_ehr/resources/queries/study/obs/.qview.xml
index 809110f1..71aa27b0 100644
--- a/nirc_ehr/resources/queries/study/obs/.qview.xml
+++ b/nirc_ehr/resources/queries/study/obs/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/.qview.xml
index 5d3d219a..b91d5d4c 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/.qview.xml
+++ b/nirc_ehr/resources/queries/study/observationSchedule/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="observationRecord"/>
         <column name="Id"/>
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Area 11.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Area 11.qview.xml
index 01670ac0..0049449c 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Area 11.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Area 11.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 11"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 11"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Area 51.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Area 51.qview.xml
index b762ee27..2a792616 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Area 51.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Area 51.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 51"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 51"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 10.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 10.qview.xml
index fc29cc88..0730aded 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 10.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 10.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 10C.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 10C.qview.xml
index 49981c8a..921c9a0f 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 10C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 10C.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 27.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 27.qview.xml
index 0d16f854..01bb6824 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 27.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 27.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 27"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 27"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 28.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 28.qview.xml
index bf89edba..ebeef38a 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 28.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 28.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 28"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 28"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 29.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 29.qview.xml
index 03950cd5..ffbf8571 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 29.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 29.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 29"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 29"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 30.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 30.qview.xml
index b02c47bc..b0c0052a 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 30.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 30.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 30"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 30"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 31.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 31.qview.xml
index 0093d5a5..28e5f72a 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 31.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 31.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 31C.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 31C.qview.xml
index 98f69455..f9d36e56 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 31C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 31C.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 31D.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 31D.qview.xml
index ccd75a5e..f4724dd4 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 31D.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 31D.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31D"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31D"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 32.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 32.qview.xml
index f25bb6ce..3c7b8bc7 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 32.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 32.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 32"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 32"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 34.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 34.qview.xml
index f8139b57..9258df69 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 34.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 34.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 34"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 34"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 37.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 37.qview.xml
index 29150bc9..80b0bc5c 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 37.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 37.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 37"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 37"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 41.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 41.qview.xml
index 01751eb4..3858990a 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 41.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 41.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 41"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 41"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 42.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 42.qview.xml
index 62ec797e..2d323bc9 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 42.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 42.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 42"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 42"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 43.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 43.qview.xml
index 1decf968..6cd00cd8 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 43.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 43.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 43"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 43"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 44.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 44.qview.xml
index 66160960..cf80abb4 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 44.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 44.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 44"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 44"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 45.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 45.qview.xml
index 4c1fbe44..f76ad482 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 45.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 45.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 45"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 45"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 46.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 46.qview.xml
index 03ecbd24..47724249 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 46.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 46.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 46"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 46"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 50.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 50.qview.xml
index c20f1db4..2d1b266f 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 50.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 50.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 50"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 50"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 52.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 52.qview.xml
index 414af148..8082c4ca 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 52.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 52.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 52"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 52"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 53.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 53.qview.xml
index 1cece263..8a020777 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 53.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 53.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 53"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 53"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 54A.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 54A.qview.xml
index b2b14e75..1a245ff3 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 54A.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 54A.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54A"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54A"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observationSchedule/Building 54B.qview.xml b/nirc_ehr/resources/queries/study/observationSchedule/Building 54B.qview.xml
index d8c69c7d..3ab71fc1 100644
--- a/nirc_ehr/resources/queries/study/observationSchedule/Building 54B.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observationSchedule/Building 54B.qview.xml	
@@ -15,6 +15,6 @@
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54B"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54B"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/observation_order/.qview.xml b/nirc_ehr/resources/queries/study/observation_order/.qview.xml
index 511375dc..2b94bef4 100644
--- a/nirc_ehr/resources/queries/study/observation_order/.qview.xml
+++ b/nirc_ehr/resources/queries/study/observation_order/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="Id"/>
         <column name="date"/>
diff --git a/nirc_ehr/resources/queries/study/observation_order/Active Behavior Orders.qview.xml b/nirc_ehr/resources/queries/study/observation_order/Active Behavior Orders.qview.xml
index 6d5251c5..286a225a 100644
--- a/nirc_ehr/resources/queries/study/observation_order/Active Behavior Orders.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observation_order/Active Behavior Orders.qview.xml	
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="Id"/>
         <column name="date"/>
diff --git a/nirc_ehr/resources/queries/study/observation_order/Active Clinical Orders.qview.xml b/nirc_ehr/resources/queries/study/observation_order/Active Clinical Orders.qview.xml
index 9f2855ed..8c9ed329 100644
--- a/nirc_ehr/resources/queries/study/observation_order/Active Clinical Orders.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observation_order/Active Clinical Orders.qview.xml	
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="Id"/>
         <column name="date"/>
diff --git a/nirc_ehr/resources/queries/study/observation_order/Behavior Orders.qview.xml b/nirc_ehr/resources/queries/study/observation_order/Behavior Orders.qview.xml
index 19fbac02..60c6039c 100644
--- a/nirc_ehr/resources/queries/study/observation_order/Behavior Orders.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observation_order/Behavior Orders.qview.xml	
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="Id"/>
         <column name="date"/>
diff --git a/nirc_ehr/resources/queries/study/observation_order/Clinical Orders.qview.xml b/nirc_ehr/resources/queries/study/observation_order/Clinical Orders.qview.xml
index 8fa59905..03f570c7 100644
--- a/nirc_ehr/resources/queries/study/observation_order/Clinical Orders.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observation_order/Clinical Orders.qview.xml	
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="Id"/>
         <column name="date"/>
diff --git a/nirc_ehr/resources/queries/study/pairingSummary/.qview.xml b/nirc_ehr/resources/queries/study/pairingSummary/.qview.xml
index dadb3727..f0fdcf4a 100644
--- a/nirc_ehr/resources/queries/study/pairingSummary/.qview.xml
+++ b/nirc_ehr/resources/queries/study/pairingSummary/.qview.xml
@@ -1,10 +1,13 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <columns>
         <column name="updatePairing"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="otherIds"/>
         <column name="date"/>
         <column name="enddate"/>
diff --git a/nirc_ehr/resources/queries/study/pairingSummary/Active Pairing.qview.xml b/nirc_ehr/resources/queries/study/pairingSummary/Active Pairing.qview.xml
index da9a5db9..14e0dfe7 100644
--- a/nirc_ehr/resources/queries/study/pairingSummary/Active Pairing.qview.xml	
+++ b/nirc_ehr/resources/queries/study/pairingSummary/Active Pairing.qview.xml	
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
@@ -8,6 +8,9 @@
     <columns>
         <column name="updatePairing"/>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="otherIds"/>
         <column name="date"/>
         <column name="enddate"/>
diff --git a/nirc_ehr/resources/queries/study/pairingSummary/Pairing History.qview.xml b/nirc_ehr/resources/queries/study/pairingSummary/Pairing History.qview.xml
index 138a5df0..1a11617f 100644
--- a/nirc_ehr/resources/queries/study/pairingSummary/Pairing History.qview.xml	
+++ b/nirc_ehr/resources/queries/study/pairingSummary/Pairing History.qview.xml	
@@ -1,9 +1,12 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="otherIds"/>
         <column name="date"/>
         <column name="enddate"/>
diff --git a/nirc_ehr/resources/queries/study/pairings/.qview.xml b/nirc_ehr/resources/queries/study/pairings/.qview.xml
index 96d113cc..ad348ca7 100644
--- a/nirc_ehr/resources/queries/study/pairings/.qview.xml
+++ b/nirc_ehr/resources/queries/study/pairings/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/physicalExam/.qview.xml b/nirc_ehr/resources/queries/study/physicalExam/.qview.xml
index bb36b1b2..dcb71d63 100644
--- a/nirc_ehr/resources/queries/study/physicalExam/.qview.xml
+++ b/nirc_ehr/resources/queries/study/physicalExam/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/prc/.qview.xml b/nirc_ehr/resources/queries/study/prc/.qview.xml
index 5657664c..15443a0f 100644
--- a/nirc_ehr/resources/queries/study/prc/.qview.xml
+++ b/nirc_ehr/resources/queries/study/prc/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/prcOverdue/.qview.xml b/nirc_ehr/resources/queries/study/prcOverdue/.qview.xml
index c9734218..b8bf120c 100644
--- a/nirc_ehr/resources/queries/study/prcOverdue/.qview.xml
+++ b/nirc_ehr/resources/queries/study/prcOverdue/.qview.xml
@@ -1,9 +1,9 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="procedureRecord"/>
         <column name="Id"/>
         <column name="Id/Demographics/species"/>
-        <column name="Id/curLocation/room"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
         <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="procedure"/>
diff --git a/nirc_ehr/resources/queries/study/prcOverdueNotification/.qview.xml b/nirc_ehr/resources/queries/study/prcOverdueNotification/.qview.xml
index 13124c1a..c647e7ba 100644
--- a/nirc_ehr/resources/queries/study/prcOverdueNotification/.qview.xml
+++ b/nirc_ehr/resources/queries/study/prcOverdueNotification/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="daysOverdue" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/.qview.xml
index 2f1a2f17..4604b778 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/.qview.xml
+++ b/nirc_ehr/resources/queries/study/prcSchedule/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="procedureRecord"/>
         <column name="Id"/>
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Area 11.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Area 11.qview.xml
index 11653e8f..2aef3b2a 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Area 11.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Area 11.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 11"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 11"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Area 51.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Area 51.qview.xml
index 53fe28bd..f97a2045 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Area 51.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Area 51.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 51"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 51"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 10.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 10.qview.xml
index db8a5c4c..6c5eaa23 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 10.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 10.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 10C.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 10C.qview.xml
index dc93c8f4..614726e9 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 10C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 10C.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 27.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 27.qview.xml
index d3a8ca7e..8bdd55cf 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 27.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 27.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 27"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 27"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 28.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 28.qview.xml
index 9e21ed4e..e42b1c07 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 28.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 28.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 28"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 28"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 29.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 29.qview.xml
index 26167e03..6d5dc4ea 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 29.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 29.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 29"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 29"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 30.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 30.qview.xml
index 66309087..e1bc3c71 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 30.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 30.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 30"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 30"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 31.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 31.qview.xml
index 848d038e..e44e698c 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 31.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 31.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 31C.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 31C.qview.xml
index 51e61ceb..0a00bd57 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 31C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 31C.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31C"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31C"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 31D.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 31D.qview.xml
index 9cd95094..98001ff8 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 31D.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 31D.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31D"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31D"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 32.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 32.qview.xml
index b5ec59a5..9dba6f2c 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 32.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 32.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 32"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 32"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 34.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 34.qview.xml
index 942b358e..cd9c2189 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 34.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 34.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 34"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 34"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 37.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 37.qview.xml
index d242a4d0..4690ac7d 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 37.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 37.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 37"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 37"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 41.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 41.qview.xml
index 53495e8f..c7de5092 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 41.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 41.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 41"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 41"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 42.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 42.qview.xml
index dbfaa8b3..132d6944 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 42.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 42.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 42"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 42"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 43.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 43.qview.xml
index e92f4b68..c75574b9 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 43.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 43.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 43"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 43"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 44.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 44.qview.xml
index 6366b342..e14ac0c2 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 44.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 44.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 44"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 44"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 45.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 45.qview.xml
index b2119abe..77159288 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 45.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 45.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 45"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 45"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 46.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 46.qview.xml
index 0416d53e..37d8849b 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 46.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 46.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 46"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 46"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 50.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 50.qview.xml
index 0b418a1d..c454e30f 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 50.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 50.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 50"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 50"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 52.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 52.qview.xml
index 9a4bf06a..f65d6185 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 52.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 52.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 52"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 52"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 53.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 53.qview.xml
index 3a42bfb0..7b1c4a04 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 53.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 53.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 53"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 53"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 54A.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 54A.qview.xml
index 5fc4ac5f..671bbcc5 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 54A.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 54A.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54A"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54A"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prcSchedule/Building 54B.qview.xml b/nirc_ehr/resources/queries/study/prcSchedule/Building 54B.qview.xml
index d0950628..2d51bae1 100644
--- a/nirc_ehr/resources/queries/study/prcSchedule/Building 54B.qview.xml	
+++ b/nirc_ehr/resources/queries/study/prcSchedule/Building 54B.qview.xml	
@@ -17,7 +17,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54B"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54B"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/prc_order/.qview.xml b/nirc_ehr/resources/queries/study/prc_order/.qview.xml
index 34a39832..5540d87e 100644
--- a/nirc_ehr/resources/queries/study/prc_order/.qview.xml
+++ b/nirc_ehr/resources/queries/study/prc_order/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
         <sort column="Id/curLocation/room"/>
@@ -7,7 +7,7 @@
     <columns>
         <column name="Id"/>
         <column name="Id/Demographics/species"/>
-        <column name="Id/curLocation/room"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
         <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="procedure"/>
diff --git a/nirc_ehr/resources/queries/study/prc_order_report/.qview.xml b/nirc_ehr/resources/queries/study/prc_order_report/.qview.xml
index 2f0377e8..d0d6e1ef 100644
--- a/nirc_ehr/resources/queries/study/prc_order_report/.qview.xml
+++ b/nirc_ehr/resources/queries/study/prc_order_report/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
         <sort column="Id/curLocation/room"/>
diff --git a/nirc_ehr/resources/queries/study/protocolAssignment/Active Assignments.qview.xml b/nirc_ehr/resources/queries/study/protocolAssignment/Active Assignments.qview.xml
index f0ac941b..1f07c5a4 100644
--- a/nirc_ehr/resources/queries/study/protocolAssignment/Active Assignments.qview.xml	
+++ b/nirc_ehr/resources/queries/study/protocolAssignment/Active Assignments.qview.xml	
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <filters>
         <filter column="enddate" operator="isblank"/>
     </filters>
diff --git a/nirc_ehr/resources/queries/study/serology/.qview.xml b/nirc_ehr/resources/queries/study/serology/.qview.xml
index 046afe3a..2effb187 100644
--- a/nirc_ehr/resources/queries/study/serology/.qview.xml
+++ b/nirc_ehr/resources/queries/study/serology/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/tissueDisposition/.qview.xml b/nirc_ehr/resources/queries/study/tissueDisposition/.qview.xml
index e74fdbb1..6289bd39 100644
--- a/nirc_ehr/resources/queries/study/tissueDisposition/.qview.xml
+++ b/nirc_ehr/resources/queries/study/tissueDisposition/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/.qview.xml
index ae1cbb85..a3312c3b 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/.qview.xml
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="treatmentRecord"/>
         <column name="Id"/>
diff --git a/nirc_ehr/resources/queries/study/treatment_order/.qview.xml b/nirc_ehr/resources/queries/study/treatment_order/.qview.xml
index ccd54744..c4e3c2f3 100644
--- a/nirc_ehr/resources/queries/study/treatment_order/.qview.xml
+++ b/nirc_ehr/resources/queries/study/treatment_order/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="Id"/>
         <column name="Id/Demographics/species"/>
diff --git a/nirc_ehr/resources/queries/study/treatment_order/Behavior Active Treatment Orders.qview.xml b/nirc_ehr/resources/queries/study/treatment_order/Behavior Active Treatment Orders.qview.xml
index 77cd9939..a495f9e6 100644
--- a/nirc_ehr/resources/queries/study/treatment_order/Behavior Active Treatment Orders.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatment_order/Behavior Active Treatment Orders.qview.xml	
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <filters>
         <filter column="isActive" operator="eq" value="true"/>
         <filter column="category" operator="eq" value="Behavior"/>
diff --git a/nirc_ehr/resources/queries/study/treatment_order/Clinical Active Treatment Orders.qview.xml b/nirc_ehr/resources/queries/study/treatment_order/Clinical Active Treatment Orders.qview.xml
index b85e1ee5..6fc59ae9 100644
--- a/nirc_ehr/resources/queries/study/treatment_order/Clinical Active Treatment Orders.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatment_order/Clinical Active Treatment Orders.qview.xml	
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <filters>
         <filter column="isActive" operator="eq" value="true"/>
         <filter column="category" operator="eq" value="Clinical"/>
diff --git a/nirc_ehr/resources/queries/study/vitals/.qview.xml b/nirc_ehr/resources/queries/study/vitals/.qview.xml
index b71185b5..84490249 100644
--- a/nirc_ehr/resources/queries/study/vitals/.qview.xml
+++ b/nirc_ehr/resources/queries/study/vitals/.qview.xml
@@ -1,4 +1,4 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
diff --git a/nirc_ehr/resources/queries/study/weight/.qview.xml b/nirc_ehr/resources/queries/study/weight/.qview.xml
index c9d46064..b27ffe46 100644
--- a/nirc_ehr/resources/queries/study/weight/.qview.xml
+++ b/nirc_ehr/resources/queries/study/weight/.qview.xml
@@ -1,9 +1,12 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="weight"/>
         <column name="units"/>
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/notification/NotificationHelper.java b/nirc_ehr/src/org/labkey/nirc_ehr/notification/NotificationHelper.java
index 08c76d63..1db441e0 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/notification/NotificationHelper.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/notification/NotificationHelper.java
@@ -34,11 +34,11 @@ public static String getNotificationGridCell(Container c, String value, @Nullabl
 
         if (isHeader)
         {
-            return "<th style=\"" + NOTIFICATION_GRID_TD_STYLE + additionalStyle + "\"><b>" + formattedValue + "</b></th>";
+            return "<th style=\"" + NOTIFICATION_GRID_TD_STYLE + (additionalStyle == null ? "" : additionalStyle) + "\"><b>" + formattedValue + "</b></th>";
         }
         else
         {
-            return "<td style=\"" + NOTIFICATION_GRID_TD_STYLE + additionalStyle + "\">" + formattedValue + "</td>";
+            return "<td style=\"" + NOTIFICATION_GRID_TD_STYLE + (additionalStyle == null ? "" : additionalStyle) + "\">" + formattedValue + "</td>";
         }
     }