diff --git a/app/controllers/bgroup.py b/app/controllers/bgroup.py
index 249d41a0cca1a56ed85487e626c566dbfaf1555b..fe014aba60d2aab0e378690ce3717a1990d61d86 100644
--- a/app/controllers/bgroup.py
+++ b/app/controllers/bgroup.py
@@ -69,25 +69,25 @@ class BuildingBGroupController(RestController):
             SELECT
                 id,
                 building_bgroup.building_id,
-                string_agg(street_address || ' ' || zipcode, ', ') AS address_list
+                place_name AS address_list
             FROM groups.building_bgroup
             JOIN vw_building_address ON (building_bgroup.building_id = vw_building_address.building_id)
             WHERE bgroup_id = {}
-            GROUP BY building_bgroup.building_id, id
+            GROUP BY building_bgroup.building_id, id, place_name
         '''.format(bgroup_id)
 
-        # Query for buildings that are not in the materialized view aka Baltimore right now
+        # Query for buildings that are not in the materialized view aka Baltimore right now TODO: remove this query
         alt_query = '''
-        SELECT
-            bg.id as id,
-            bg.building_id,
-            string_agg(concat(a.house_number, ' ', a.street_name) || ' ' || zipcode, ', ') AS address_list
-        FROM groups.building_bgroup bg
-        JOIN public.building b on bg.building_id = b.id
-        join public.building_address ba on b.id = ba.building_id
-        join public.address a on ba.address_id = a.id
-        WHERE bgroup_id = {}
-        GROUP BY bg.building_id, bg.id;
+            SELECT
+                bg.id as id,
+                bg.building_id,
+                string_agg(concat(a.house_number, ' ', a.street_name) || ' ' || zipcode, ', ') AS address_list
+            FROM groups.building_bgroup bg
+            JOIN public.building b on bg.building_id = b.id
+            join public.building_address ba on b.id = ba.building_id
+            join public.address a on ba.address_id = a.id
+            WHERE bgroup_id = {}
+            GROUP BY bg.building_id, bg.id;
          '''.format(bgroup_id)
 
         results = self.db.session.execute(query).fetchall()