diff --git a/ehr/resources/queries/study/HousingOverlaps.sql b/ehr/resources/queries/study/HousingOverlaps.sql
index a4efd7d90..2889b8eca 100644
--- a/ehr/resources/queries/study/HousingOverlaps.sql
+++ b/ehr/resources/queries/study/HousingOverlaps.sql
@@ -1,40 +1,21 @@
-/*
- * Copyright (c) 2011-2019 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
- */
-
 /**
   * This query is designed to find housing records that overlap.  In this query, the overlap to calculated based on both date and time
   * A record that ends at the same time that a second record begins is not considered an overlap.
-  */
-PARAMETERS(StartDate TIMESTAMP, EndDate TIMESTAMP, Room CHAR DEFAULT NULL, Cage CHAR DEFAULT NULL)
 
+  Modified by Kollil on 7/23/25 - Added Area field to the query and the rooms are filtered by area(s) selected, refer to tkt # 12894
+  */
 SELECT
-h.lsid,
-h.id,
-h.room,
-h.cage,
-h.date,
-h.enddate,
-h.reason,
-h.remark,
-h.qcstate
-
+    h.lsid,
+    h.id,
+    h.room.area as area, -- Added by Kollil
+    h.room,
+    h.cage,
+    h.date,
+    h.enddate,
+    h.reason,
+    h.remark,
+    h.qcstate
 FROM study.housing h
-
 WHERE
+    h.qcstate = 18
 
-(h.room = ROOM OR ROOM IS NULL or ROOM = '') AND
-(h.cage = CAGE OR CAGE IS NULL OR CAGE = '') AND
-
-/* entered startdate must be <= entered enddate */
-coalesce( STARTDATE , cast('1900-01-01 00:00:00.0' as timestamp)) <= coalesce(ENDDATE, now())
-and
-
-/* entered startdate must be less than record's enddate */
-coalesce( STARTDATE , cast('1900-01-01 00:00:00.0' as timestamp)) < coalesce(h.enddate, now())
-and
-
-/* entered enddate must be greater than record's startdate */
-coalesce(ENDDATE, now()) >= coalesce(h.date, now())
\ No newline at end of file
diff --git a/ehr/resources/queries/study/HousingOverlapsById.sql b/ehr/resources/queries/study/HousingOverlapsById.sql
deleted file mode 100644
index 6296f7ef7..000000000
--- a/ehr/resources/queries/study/HousingOverlapsById.sql
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2011-2019 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
- */
-
-PARAMETERS(StartDate TIMESTAMP, EndDate TIMESTAMP, Room CHAR DEFAULT NULL, Cage CHAR DEFAULT NULL)
-
-SELECT
-h.Id,
-cast(StartDate as timestamp) as date
-
-FROM study.housing h
-
-WHERE
-
-(h.room = ROOM OR ROOM IS NULL or ROOM = '') AND
-(h.cage = CAGE OR CAGE IS NULL OR CAGE = '') AND
-
-/* entered startdate must be <= enddate */
-coalesce( STARTDATE , cast('1900-01-01 00:00:00.0' as timestamp)) <= coalesce(ENDDATE, now())
-and
-
-/* entered startdate must be less than record's enddate */
-coalesce( STARTDATE , cast('1900-01-01 00:00:00.0' as timestamp)) < coalesce(h.enddate, now())
-and
-
-/* entered enddate must be greater than record's startdate */
-coalesce(ENDDATE, now()) >= coalesce(h.date, now())
-
-GROUP BY h.Id
\ No newline at end of file
diff --git a/ehr/resources/queries/study/HousingOverlapsById/.qview.xml b/ehr/resources/queries/study/HousingOverlapsById/.qview.xml
deleted file mode 100644
index 603b1f172..000000000
--- a/ehr/resources/queries/study/HousingOverlapsById/.qview.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
-    <columns>
-        <column name="id"/>
-        <column name="id/Dataset/Demographics/gender">
-            <properties>
-                <property name="columnTitle" value="Gender"/>
-            </properties>
-        </column>
-        <column name="id/Dataset/Demographics/calculated_status">
-            <properties>
-                <property name="columnTitle" value="Status"/>
-            </properties>
-        </column>
-        <!--<column name="Id/activeAssignments/projects">-->
-            <!--<properties>-->
-                <!--<property name="columnTitle" value="Active Assignments"/>-->
-            <!--</properties>-->
-        <!--</column>-->
-        <column name="id/Dataset/Demographics/dam">
-            <properties>
-                <property name="columnTitle" value="Dam"/>
-            </properties>
-        </column>
-        <column name="id/Dataset/Demographics/sire">
-            <properties>
-                <property name="columnTitle" value="Sire"/>
-            </properties>
-        </column>
-        <column name="id/Dataset/Demographics/origin"/>
-        <column name="id/Dataset/Demographics/birth">
-            <properties>
-                <property name="columnTitle" value="Birth"/>
-            </properties>
-        </column>
-        <column name="id/Dataset/Demographics/death">
-            <properties>
-                <property name="columnTitle" value="Death"/>
-            </properties>
-        </column>
-        <column name="Id/curLocation/room">
-            <properties>
-                <property name="columnTitle" value="Current Room"/>
-            </properties>
-        </column>
-        <column name="Id/curLocation/cage">
-            <properties>
-                <property name="columnTitle" value="Current Cage"/>
-            </properties>
-        </column>
-        <column name="Id/MostRecentWeight/MostRecentWeight">
-            <properties>
-                <property name="columnTitle" value="Current Weight (kg)"/>
-            </properties>
-        </column>
-        <column name="Id/MostRecentWeight/MostRecentWeightDate">
-            <properties>
-                <property name="columnTitle" value="Weight Date"/>
-            </properties>
-        </column>
-    </columns>
-    <sorts>
-        <sort column="id" descending="false"/>
-    </sorts>
-</customView>
\ No newline at end of file
diff --git a/ehr/resources/queries/study/HousingOverlapsByIdDateOnly.sql b/ehr/resources/queries/study/HousingOverlapsByIdDateOnly.sql
deleted file mode 100644
index a6fa7185e..000000000
--- a/ehr/resources/queries/study/HousingOverlapsByIdDateOnly.sql
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2012-2019 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
- */
-
-PARAMETERS(StartDate TIMESTAMP, EndDate TIMESTAMP, Room CHAR DEFAULT NULL, Cage CHAR DEFAULT NULL)
-
-SELECT
-h.Id,
-cast(StartDate as timestamp) as date
-
-FROM study.housing h
-
-WHERE
-
-(h.room = ROOM OR ROOM IS NULL or ROOM = '') AND
-(h.cage = CAGE OR CAGE IS NULL OR CAGE = '') AND
-
-/* entered startdate must be <= enddate */
-cast(coalesce(STARTDATE , cast('1900-01-01' as DATE)) as DATE) <= cast(coalesce(ENDDATE, now()) as DATE)
-and
-
-/* entered startdate must be less than record's enddate */
-cast(coalesce(STARTDATE , cast('1900-01-01' as DATE)) as DATE) < cast(coalesce(h.enddate, now()) as DATE)
-and
-
-/* entered enddate must be greater than record's startdate */
-cast(coalesce(ENDDATE, now()) as DATE) >= cast(coalesce(h.date, now()) as DATE)
-
-GROUP BY h.Id
\ No newline at end of file
diff --git a/ehr/resources/queries/study/HousingOverlapsByIdDateOnly/.qview.xml b/ehr/resources/queries/study/HousingOverlapsByIdDateOnly/.qview.xml
deleted file mode 100644
index 32b8acce5..000000000
--- a/ehr/resources/queries/study/HousingOverlapsByIdDateOnly/.qview.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView">
-    <columns>
-        <column name="id"/>
-        <column name="id/Dataset/Demographics/gender">
-            <properties>
-                <property name="columnTitle" value="Gender"/>
-            </properties>
-        </column>
-        <column name="id/Dataset/Demographics/calculated_status">
-            <properties>
-                <property name="columnTitle" value="Status"/>
-            </properties>
-        </column>
-        <column name="Id/activeAssignments/projects">
-            <properties>
-                <property name="columnTitle" value="Active Assignments"/>
-            </properties>
-        </column>
-        <column name="id/Dataset/Demographics/dam">
-            <properties>
-                <property name="columnTitle" value="Dam"/>
-            </properties>
-        </column>
-        <column name="id/Dataset/Demographics/sire">
-            <properties>
-                <property name="columnTitle" value="Sire"/>
-            </properties>
-        </column>
-        <column name="id/Dataset/Demographics/origin"/>
-        <column name="id/Dataset/Demographics/birth">
-            <properties>
-                <property name="columnTitle" value="Birth"/>
-            </properties>
-        </column>
-        <column name="id/Dataset/Demographics/death">
-            <properties>
-                <property name="columnTitle" value="Death"/>
-            </properties>
-        </column>
-        <column name="Id/curLocation/room">
-            <properties>
-                <property name="columnTitle" value="Current Room"/>
-            </properties>
-        </column>
-        <column name="Id/curLocation/cage">
-            <properties>
-                <property name="columnTitle" value="Current Cage"/>
-            </properties>
-        </column>
-        <column name="Id/MostRecentWeight/MostRecentWeight">
-            <properties>
-                <property name="columnTitle" value="Current Weight (kg)"/>
-            </properties>
-        </column>
-        <column name="Id/MostRecentWeight/MostRecentWeightDate">
-            <properties>
-                <property name="columnTitle" value="Weight Date"/>
-            </properties>
-        </column>
-    </columns>
-    <sorts>
-        <sort column="id" descending="false"/>
-    </sorts>
-</customView>
\ No newline at end of file
diff --git a/ehr/resources/queries/study/HousingOverlapsById.query.xml b/ehr/resources/queries/study/HousingOverlapsReport.query.xml
similarity index 82%
rename from ehr/resources/queries/study/HousingOverlapsById.query.xml
rename to ehr/resources/queries/study/HousingOverlapsReport.query.xml
index 1f1321218..1256b36ac 100644
--- a/ehr/resources/queries/study/HousingOverlapsById.query.xml
+++ b/ehr/resources/queries/study/HousingOverlapsReport.query.xml
@@ -1,17 +1,15 @@
 <query xmlns="http://labkey.org/data/xml/query">
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
-            <table tableName="HousingOverlapsById" tableDbType="TABLE">
+            <table tableName="HousingOverlapsReport" tableDbType="TABLE">
                 <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
                 <tableTitle>Housing Overlaps</tableTitle>
-                <description>This query identifies distinct animal IDs that overlapped with given housing records, accounting for date and time</description>
+                <description>This query identifies distinct housing records that overlapped with the given housing records, accounting for date and time</description>
                 <tableUrl />
                 <columns>
-                    <column columnName="Id">
+                    <column columnName="lsid">
                         <isKeyField>true</isKeyField>
-                    </column>
-                    <column columnName="date">
-                        <columnTitle>Start Date</columnTitle>
+                        <isHidden>true</isHidden>
                     </column>
                 </columns>
                 <buttonBarOptions position="both" includeStandardButtons="false">
diff --git a/ehr/resources/queries/study/HousingOverlapsReport.sql b/ehr/resources/queries/study/HousingOverlapsReport.sql
new file mode 100644
index 000000000..f2cb68596
--- /dev/null
+++ b/ehr/resources/queries/study/HousingOverlapsReport.sql
@@ -0,0 +1,27 @@
+PARAMETERS(StartDate TIMESTAMP, EndDate TIMESTAMP)
+
+SELECT
+    h.lsid,
+    h.id,
+    h.room,
+    h.cage,
+    h.date,
+    h.enddate,
+    h.reason,
+    h.remark,
+    h.qcstate
+
+FROM study.housing h
+
+WHERE
+
+/* entered startdate must be <= entered enddate */
+    coalesce( STARTDATE , cast('1900-01-01 00:00:00.0' as timestamp)) <= coalesce(ENDDATE, now())
+  and
+
+/* entered startdate must be less than record's enddate */
+    coalesce( STARTDATE , cast('1900-01-01 00:00:00.0' as timestamp)) < coalesce(h.enddate, now())
+  and
+
+/* entered enddate must be greater than record's startdate */
+    coalesce(ENDDATE, now()) >= coalesce(h.date, now())
\ No newline at end of file
diff --git a/ehr/resources/queries/study/HousingOverlapsReport/.qview.xml b/ehr/resources/queries/study/HousingOverlapsReport/.qview.xml
new file mode 100644
index 000000000..7edf3755c
--- /dev/null
+++ b/ehr/resources/queries/study/HousingOverlapsReport/.qview.xml
@@ -0,0 +1,6 @@
+<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+    <sorts>
+        <sort column="room"/>
+        <sort column="cage"/>
+    </sorts>
+</customView>
\ No newline at end of file
diff --git a/ehr/resources/queries/study/HousingOverlapsByIdDateOnly.query.xml b/ehr/resources/queries/study/HousingOverlapsReportDateOnly.query.xml
similarity index 79%
rename from ehr/resources/queries/study/HousingOverlapsByIdDateOnly.query.xml
rename to ehr/resources/queries/study/HousingOverlapsReportDateOnly.query.xml
index 967758d1c..ae23c19fe 100644
--- a/ehr/resources/queries/study/HousingOverlapsByIdDateOnly.query.xml
+++ b/ehr/resources/queries/study/HousingOverlapsReportDateOnly.query.xml
@@ -1,17 +1,15 @@
 <query xmlns="http://labkey.org/data/xml/query">
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
-            <table tableName="HousingOverlapsByIdDateOnly" tableDbType="TABLE">
+            <table tableName="HousingOverlapsReportDateOnly" tableDbType="TABLE">
                 <javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
-                <tableTitle>Housing Overlaps</tableTitle>
-                <description>This query identifies all distinct animal IDs that overlapped with housing records, accounting for date only, not date/time</description>
+                <tableTitle>Housing Overlaps (Date Only)</tableTitle>
+                <description>This query identifies overlapping housing records, accounting for date only, not date/time</description>
                 <tableUrl />
                 <columns>
-                    <column columnName="Id">
+                    <column columnName="lsid">
                         <isKeyField>true</isKeyField>
-                    </column>
-                    <column columnName="date">
-                        <columnTitle>Start Date</columnTitle>
+                        <isHidden>true</isHidden>
                     </column>
                 </columns>
                 <buttonBarOptions position="both" includeStandardButtons="false">
diff --git a/ehr/resources/queries/study/HousingOverlapsReportDateOnly.sql b/ehr/resources/queries/study/HousingOverlapsReportDateOnly.sql
new file mode 100644
index 000000000..65847cacd
--- /dev/null
+++ b/ehr/resources/queries/study/HousingOverlapsReportDateOnly.sql
@@ -0,0 +1,24 @@
+PARAMETERS(StartDate TIMESTAMP, EndDate TIMESTAMP)
+
+SELECT
+    h.lsid,
+    h.id,
+    h.room,
+    h.cage,
+    h.date,
+    h.enddate,
+    h.reason,
+    h.remark,
+    h.qcstate
+
+FROM study.housing h
+
+WHERE
+
+    (
+        (cast(COALESCE(STARTDATE, '1900-01-01') AS DATE) >= cast(h.date AS DATE) AND cast(COALESCE(STARTDATE, '1900-01-01') AS DATE) < cast(COALESCE(h.enddate, now()) AS DATE))
+            OR
+        (cast(COALESCE(ENDDATE, now()) AS DATE) > cast(h.date AS DATE) AND cast(COALESCE(ENDDATE, now()) AS DATE) <= cast(COALESCE(h.enddate, now()) AS DATE))
+            OR
+        (cast(COALESCE(STARTDATE, '1900-01-01') AS DATE) <= cast(h.date AS DATE) AND cast(COALESCE(ENDDATE, now()) AS DATE) >= cast(COALESCE(h.enddate, now()) AS DATE))
+        )
\ No newline at end of file
diff --git a/ehr/resources/views/housingOverlaps.html b/ehr/resources/views/housingOverlaps.html
index 9736656cc..48f211317 100644
--- a/ehr/resources/views/housingOverlaps.html
+++ b/ehr/resources/views/housingOverlaps.html
@@ -1,210 +1,278 @@
+<!--Created the html code on the onprc side by Kollil 7/23/2025 - Changing the query to add Area field as per the tkt request - 12894-->
+
 <script type="text/javascript" nonce="<%=scriptNonce%>">
 
-Ext4.onReady(function(){
-    var webpart = <%=webpartContext%>;
+    Ext4.onReady(function(){
+        const webpart = <%=webpartContext%>;
 
-    var qwpDiv = Ext4.DomHelper.insertAfter(webpart.wrapperDivId, {
-        tag: 'div',
-        id: 'qwp_' + Ext4.id()
-    });
+        const qwpDiv = Ext4.DomHelper.insertAfter(webpart.wrapperDivId, {
+            tag: 'div',
+            id: 'qwp_' + Ext4.id()
+        });
 
-    Ext4.QuickTips.init();
-    Ext4.create('Ext.form.Panel', {
-        border: false,
-        width: 550,
-        qwpDiv: qwpDiv,
-        style: 'margin-bottom: 20px;',
-        defaults: {
+        Ext4.QuickTips.init();
+        Ext4.create('Ext.form.Panel', {
             border: false,
-            labelWidth: 180,
-            width: 550
-        },
-        items: [{
-            html: 'This page allows you to find housing records that overlap, based on the criteria below.  For more detail, hover the mouse over the question mark next to the field label.',
-            style: 'padding-bottom: 10px'
-        },{
-            xtype: 'radiogroup',
-            itemId: 'searchType',
-            fieldLabel: 'Search Type',
-            helpPopup: 'If you select \'date and time\', then records will count as overlaps only if their date and time overlap.  If you pick \'date only\', then records will be count as overlaps if the animal was present on that day, not including time of day.  In the latter case, the animals might not technically have resided in the same cage at the time moment in time.',
-            columns: 1,
+            width: 550,
+            qwpDiv: qwpDiv,
+            style: 'margin-bottom: 20px;',
+            defaults: {
+                border: false,
+                labelWidth: 200,
+                width: 550
+            },
             items: [{
-                boxLabel: 'Consider Date And Time',
-                checked: true,
-                name: 'searchType',
-                inputValue: 'dateTime'
+                html: 'This page allows you to find housing records that overlap, based on the criteria below.  For more detail, hover the mouse over the question mark next to the field label.',
+                style: 'padding-bottom: 10px'
             },{
-                boxLabel: 'Consider Date Only',
-                name: 'searchType',
-                inputValue: 'date'
-            }],
-            listeners: {
-                change: function(btn){
-                    var panel = btn.up('panel');
-                    panel.onSearchTypeChange();
+                xtype: 'radiogroup',
+                itemId: 'searchType',
+                fieldLabel: 'Search Type',
+                helpPopup: 'If you select \'date and time\', then records will count as overlaps only if their date and time overlap.  If you pick \'date only\', then records will be count as overlaps if the animal was present on that day, not including time of day.  In the latter case, the animals might not technically have resided in the same cage at the time moment in time.',
+                columns: 1,
+                items: [{
+                    boxLabel: 'Consider Date And Time',
+                    checked: true,
+                    name: 'searchType',
+                    inputValue: 'dateTime'
+                },{
+                    boxLabel: 'Consider Date Only',
+                    name: 'searchType',
+                    inputValue: 'date'
+                }],
+                listeners: {
+                    change: function(btn){
+                        var panel = btn.up('panel');
+                        panel.onSearchTypeChange();
+                    }
                 }
-            }
-        },{
-            xtype: 'radiogroup',
-            itemId: 'groupingType',
-            fieldLabel: 'Grouping',
-            helpPopup: 'If you select \'individual records\', then the result will include one row per housing record, which could include multiple records per animal.  If you select \'grouped by Id\', then the result will include one row per animal Id, where each row could represent many different housing records.',
-            columns: 1,
-            items: [{
-                boxLabel: 'Show Individual Housing Records',
-                checked: !LABKEY.ActionURL.getParameter('groupById') ? true : false,
-                name: 'groupingType',
-                inputValue: 'individual'
             },{
-                boxLabel: 'Group Records By Id',
-                checked: LABKEY.ActionURL.getParameter('groupById') ? true : false,
-                name: 'groupingType',
-                inputValue: 'grouped'
-            }],
-            listeners: {
-                change: function(btn){
-                    var panel = btn.up('panel');
-                    panel.onGroupingChange();
+                xtype: 'radiogroup',
+                itemId: 'groupingType',
+                fieldLabel: 'Grouping',
+                helpPopup: 'If you select \'individual records\', then the result will include one row per housing record, which could include multiple records per animal.  If you select \'grouped by Id\', then the result will include one row per animal Id, where each row could represent many different housing records.',
+                columns: 1,
+                items: [{
+                    boxLabel: 'Show Individual Housing Records',
+                    checked: !LABKEY.ActionURL.getParameter('groupById') ? true : false,
+                    name: 'groupingType',
+                    inputValue: 'individual'
+                },{
+                    boxLabel: 'Group Records By Id',
+                    checked: LABKEY.ActionURL.getParameter('groupById') ? true : false,
+                    name: 'groupingType',
+                    inputValue: 'grouped'
+                }]
+            },{
+                xtype: 'xdatetime',
+                helpPopup: 'This will be used at the start of the interval.  It can be left blank to include all records.',
+                fieldLabel: 'Start',
+                itemId: 'startField'
+            },{
+                xtype: 'xdatetime',
+                helpPopup: 'This will be used at the end of the interval.  It can be left blank the current time will be used.',
+                fieldLabel: 'End',
+                itemId: 'endField'
+            },{
+                xtype: 'ehr-areafield',
+                itemId: 'areaField',
+                addAllSelector: true,
+                editable: true,
+                helpPopup: "Selects rooms in the room field that are located in the selected area(s). Not specifically added to query.",
+                fieldLabel: 'Select Rooms by Area(s)',
+                pairedWithRoomField: true,
+                getRoomField: function(){
+                    return this.up('panel').down('#roomField');
+                },
+                listeners: {
+                    change: function(field){
+                        const buildingField = field.up('panel').down('#buildingField');
+                        if (this.value?.length) { // check value first to avoid reset loop
+                            buildingField.reset();
+                        }
+                    }
                 }
-            }
-        },{
-            xtype: 'xdatetime',
-            helpPopup: 'This will be used at the start of the interval.  It can be left blank to include all records.',
-            fieldLabel: 'Start (optional)',
-            itemId: 'startField'
-        },{
-            xtype: 'xdatetime',
-            helpPopup: 'This will be used at the end of the interval.  It can be left blank the current time will be used.',
-            fieldLabel: 'End (optional)',
-            itemId: 'endField'
-        },{
-            xtype: 'ehr-roomfield',
-            helpPopup: 'If included, only records from this room will be used.  It can be left blank.',
-            fieldLabel: 'Room (optional)',
-            multiSelect: false,
-            value: LABKEY.ActionURL.getParameter('room'),
-            itemId: 'roomField'
-            //hidden: LABKEY.ActionURL.getParameter('groupById') ? true : false
-        },{
-            xtype: 'textfield',
-            helpPopup: 'If included, only records from this cage will be used.  It can be left blank.',
-            fieldLabel: 'Cage (optional)',
-            itemId: 'cageField'
-            //hidden: LABKEY.ActionURL.getParameter('groupById') ? true : false
-        }],
-        dockedItems: {
-            xtype: 'toolbar',
-            dock: 'bottom',
-            ui: 'footer',
-            items: [{
-                xtype: 'tbfill'
             },{
-                xtype: 'button',
-                text: 'Submit',
-                handler: function(btn){
-                    btn.up('panel').onSubmit();
+                xtype: 'ehr-buildingfield',
+                itemId: 'buildingField',
+                addAllSelector: true,
+                editable: true,
+                helpPopup: "Selects rooms in the room field that are located in the selected building(s). Not specifically added to query.",
+                fieldLabel: 'Select Rooms by Building(s)',
+                pairedWithRoomField: true,
+                getRoomField: function(){
+                    return this.up('panel').down('#roomField');
+                },
+                listeners: {
+                    change: function(field){
+                        const areaField = field.up('panel').down('#areaField');
+                        if (this.value?.length) { // check value first to avoid reset loop
+                            areaField.reset();
+                        }
+                    }
                 }
-            }]
-        },
-        onGroupingChange: function(){
-            var type = this.down('#groupingType').getValue().groupingType;
-//            var room = this.down('#roomField');
-//            var cage = this.down('#cageField');
-//
-//            if (type == 'grouped'){
-//                room.setVisible(false);
-//                room.setValue(null);
-//                cage.setVisible(false);
-//                cage.setValue(null);
-//            }
-//            else {
-//                room.setVisible(true);
-//                cage.setVisible(true);
-//            }
-
-        },
-        onSearchTypeChange: function(){
-            var type = this.down('#searchType').getValue().searchType;
-            var start = this.down('#startField');
-            var end = this.down('#endField');
-
-            var xtype = 'datefield';
-            if(type == 'date'){
-                if (start.xtype == 'datefield')
-                    return;
-
-                xtype = 'datefield';
-            }
-            else {
-                if (start.xtype == 'xdatetime')
-                    return;
+            },{
+                xtype: 'ehr-roomfield',
+                itemId: 'roomField',
+                helpPopup: 'If included, only records from this room will be used.  It can be left blank.',
+                fieldLabel: 'Room(s)',
+                multiSelect: true,
+                listeners: {
+                    change: function(field){
+                        const areaField = field.up('panel').down('#areaField');
+                        areaField.reset();
 
-                xtype = 'xdatetime'
-            }
+                        const buildingField = field.up('panel').down('#buildingField');
+                        buildingField.reset();
+                    }
+                }
+            },{
+                xtype: 'textfield',
+                helpPopup: 'If included, only records from this cage will be used.  It can be left blank.',
+                fieldLabel: 'Cage',
+                itemId: 'cageField'
+            }],
+            dockedItems: {
+                xtype: 'toolbar',
+                dock: 'bottom',
+                ui: 'footer',
+                items: [{
+                    xtype: 'tbfill'
+                },{
+                    xtype: 'button',
+                    text: 'Submit',
+                    handler: function(btn){
+                        btn.up('panel').onSubmit();
+                    }
+                }]
+            },
+            onSearchTypeChange: function(){
+                const type = this.down('#searchType').getValue().searchType;
+                const start = this.down('#startField');
+                const end = this.down('#endField');
 
-            this.remove(start);
-            this.remove(end);
+                let xtype = 'datefield';
+                if(type === 'date'){
+                    if (start.xtype === 'datefield')
+                        return;
 
-            this.insert(3, {
-                xtype: xtype,
-                helpPopup: 'This will be used at the start of the interval.  It can be left blank to include all records.',
-                fieldLabel: 'Start (optional - leave blank for all)',
-                itemId: 'startField'
-            });
+                    xtype = 'datefield';
+                }
+                else {
+                    if (start.xtype === 'xdatetime')
+                        return;
 
-            this.insert(4, {
-                xtype: xtype,
-                helpPopup: 'This will be used at the end of the interval.  It can be left blank the current time will be used.',
-                fieldLabel: 'End (optional - leave blank for all)',
-                itemId: 'endField'
-            });
-
-            this.doLayout();
-        },
-        onSubmit: function(){
-            var type = this.down('#searchType').getValue().searchType;
-            var grouping = this.down('#groupingType').getValue().groupingType;
-            var start = this.down('#startField').getValue();
-            var end = this.down('#endField').getValue();
-            var room = this.down('#roomField').getValue();
-            var cage = this.down('#cageField').getValue();
-
-            var title = 'Overlapping Housing Records';
-            var queryName = 'HousingOverlaps';
-            if (grouping == 'grouped'){
-                queryName += 'ById';
-                title = 'Overlapping Ids';
-            }
+                    xtype = 'xdatetime'
+                }
+
+                this.remove(start);
+                this.remove(end);
 
-            if (type == 'date')
-                queryName += 'DateOnly';
+                this.insert(3, {
+                    xtype: xtype,
+                    helpPopup: 'This will be used at the start of the interval.  It can be left blank to include all records.',
+                    fieldLabel: 'Start',
+                    itemId: 'startField'
+                });
 
-            var config = {
-                frame: 'portal',
-                renderTo: this.qwpDiv.id,
-                schemaName: 'study',
-                queryName: queryName,
-                title: title
-            };
+                this.insert(4, {
+                    xtype: xtype,
+                    helpPopup: 'This will be used at the end of the interval.  It can be left blank the current time will be used.',
+                    fieldLabel: 'End',
+                    itemId: 'endField'
+                });
+
+                this.doLayout();
+            },
+            onSubmit: function(){
+                const type = this.down('#searchType').getValue().searchType;
+                const grouping = this.down('#groupingType').getValue().groupingType;
+                const groupById = (grouping === 'grouped');
+                const start = this.down('#startField').getValue();
+                const end = this.down('#endField').getValue();
+                const rooms = this.down('#roomField').getValue();
+                const cage = this.down('#cageField').getValue();
+
+                const title = 'Overlapping Housing Records';
+                let queryName = 'HousingOverlapsReport';
+
+                if (type === 'date')
+                    queryName += 'DateOnly';
+
+                const config = {
+                    frame: 'portal',
+                    renderTo: this.qwpDiv.id,
+                    title: title,
+                    schemaName: 'study'
+                };
+
+                if (!groupById) {
+                    config.queryName = queryName;
+                }
+                else {
+                    // Group by Id - have to build custom SQL
+                    config.sql = 'SELECT i.Id, \n' +
+                            'i.Id.Dataset.Demographics.gender, \n' +
+                            'i.Id.Demographics.species, \n' +
+                            'i.Id.Demographics.calculated_status, \n' +
+                            'i.Id.Demographics.birth, \n' +
+                            'i.Id.Demographics.death, \n' +
+                            'i.Id.curLocation.room AS CurrentRoom, \n' +
+                            'i.Id.curLocation.cage AS CurrentCage, \n' +
+                            'i.Id.MostRecentWeight.MostRecentWeight, \n' +
+                            'i.Id.MostRecentWeight.MostRecentWeightDate \n' +
+                            'FROM ('
 
-            var params = {
-                StartDate: start,
-                EndDate: end
-            };
+                    if (type === 'date') {
+                        config.sql += 'SELECT Id FROM HousingOverlapsReportDateOnly';
+                    }
+                    else {
+                        config.sql += 'SELECT Id FROM HousingOverlapsReport';
+                    }
 
-            if (room)
-                params.Room = room;
-            if (cage)
-                params.Cage = cage;
+                    if ((rooms && rooms.length) || cage) {
+                        config.sql += ' WHERE ';
 
-            if (!LABKEY.Utils.isEmptyObj(params))
-                config.parameters = params;
+                        let filterSql = '';
+                        if (rooms && rooms.length)
+                            filterSql = 'room IN (' + rooms.map(item => `'${item}'`).join(", ") + ')';
 
-            LDK.Utils.getReadOnlyQWP(config);
-        }
+                        if (cage) {
+                            if (filterSql)
+                                filterSql += ' AND ';
 
-    }).render(webpart.wrapperDivId);
+                            filterSql += "cage = '" + cage + "'";
+                        }
 
-});
+                        if (filterSql?.length)
+                            config.sql += filterSql;
+                    }
 
+                    config.sql += ' GROUP BY Id) i';
+                }
+
+                const params = {
+                    StartDate: start,
+                    EndDate: end
+                };
+
+                const filterArray = [];
+
+                if (rooms && !groupById)
+                    filterArray.push(LABKEY.Filter.create('room', rooms.join(';'), LABKEY.Filter.Types.EQUALS_ONE_OF));
+
+                if (cage && !groupById)
+                    filterArray.push(LABKEY.Filter.create('cage', cage));
+
+                if (!LABKEY.Utils.isEmptyObj(params))
+                    config.parameters = params;
+
+                if (filterArray.length)
+                    config.filterArray = filterArray;
+
+                LDK.Utils.getReadOnlyQWP(config);
+            }
+
+        }).render(webpart.wrapperDivId);
+    });
 </script>
\ No newline at end of file
diff --git a/ehr/resources/web/ehr/ehr_api.lib.xml b/ehr/resources/web/ehr/ehr_api.lib.xml
index 59f74effe..ead5f3356 100644
--- a/ehr/resources/web/ehr/ehr_api.lib.xml
+++ b/ehr/resources/web/ehr/ehr_api.lib.xml
@@ -63,6 +63,7 @@
         <script path="ehr/form/field/ProtocolField.js"/>
         <script path="ehr/form/field/CageField.js"/>
         <script path="ehr/form/field/RoomField.js"/>
+        <script path="ehr/form/field/BuildingField.js"/>
         <script path="ehr/form/field/AreaField.js"/>
         <script path="ehr/form/field/AnimalGroupField.js"/>
         <script path="ehr/form/field/RoomFieldSingle.js"/>
diff --git a/ehr/resources/web/ehr/form/field/BuildingField.js b/ehr/resources/web/ehr/form/field/BuildingField.js
new file mode 100644
index 000000000..ea9f75cb9
--- /dev/null
+++ b/ehr/resources/web/ehr/form/field/BuildingField.js
@@ -0,0 +1,59 @@
+Ext4.define('EHR.form.field.BuildingField', {
+    extend: 'Ext.ux.CheckCombo',
+    alias: 'widget.ehr-buildingfield',
+
+    fieldLabel: 'Building',
+    nullCaption: '[Blank]',
+    editable: false,
+    expandToFitContent: true,
+    addAllSelector: true,
+    typeAhead: true,
+
+    initComponent: function(){
+        Ext4.apply(this, {
+            displayField:'name',
+            valueField: 'name',
+            queryMode: 'local',
+            store: Ext4.create('LABKEY.ext4.data.Store', {
+                schemaName: 'ehr_lookups',
+                queryName: 'buildings',
+                sort: 'name',
+                filterArray: [LABKEY.Filter.create('dateDisabled', true, LABKEY.Filter.Types.ISBLANK)],
+                autoLoad: true
+            })
+        });
+
+        this.callParent(arguments);
+
+        if (this.pairedWithRoomField)
+            this.addRoomListeners();
+    },
+
+
+    addRoomListeners: function(){
+        this.on('select', function(field, records){
+            if (!records.length)
+                return;
+
+            var buildings = [];
+            Ext4.Array.forEach(records, function(r){
+                buildings.push(r.get('name'));
+            }, this);
+
+            var roomField = this.getRoomField();
+            roomField.suspendEvents();
+            roomField.selectByBuildings(buildings);
+            roomField.resumeEvents();
+        }, this);
+
+        this.on('render', function(field){
+            var val = field.getValue();
+            val = Ext4.isArray(val) || !val ? val : [val];
+
+            var roomField = this.getRoomField();
+            roomField.suspendEvents();
+            roomField.selectByBuildings(val);
+            roomField.resumeEvents();
+        }, this);
+    }
+});
\ No newline at end of file
diff --git a/ehr/resources/web/ehr/form/field/RoomField.js b/ehr/resources/web/ehr/form/field/RoomField.js
index 28bf62cf2..8c14a8bc7 100644
--- a/ehr/resources/web/ehr/form/field/RoomField.js
+++ b/ehr/resources/web/ehr/form/field/RoomField.js
@@ -19,7 +19,7 @@ Ext4.define('EHR.form.field.RoomField', {
                 type: 'labkey-store',
                 schemaName: 'ehr_lookups',
                 queryName: 'rooms',
-                columns: 'room,room_sortValue,area',
+                columns: 'room,room_sortValue,area,building',
                 sort: 'room_sortValue',
                 filterArray: this.getStoreFilterArray(),
                 autoLoad: true
@@ -76,6 +76,35 @@ Ext4.define('EHR.form.field.RoomField', {
         }
     },
 
+    selectByBuildings: function(buildings){
+        if (!this.rendered || !this.store){
+            this.on('afterrender', function(field){
+                field.selectByBuildings(buildings);
+            }, this, {single: true});
+
+            return;
+        }
+
+        this.store.clearFilter();
+        if (!this.store.getCount()){
+            this.store.on('load', function(store){
+                this.selectByBuildings(buildings);
+            }, this, {single: true});
+        }
+        else {
+            if (buildings && buildings.length){
+                var values = [];
+                this.store.each(function(rec){
+                    if (buildings.indexOf(rec.get('building')) != -1){
+                        values.push(rec.get('room'));
+                    }
+                }, this);
+
+                this.setValue(values);
+            }
+        }
+    },
+
     filterByAreas: function(areas){
         this.store.clearFilter();
         if (!this.rendered){