diff --git a/ehr/api-src/org/labkey/api/ehr/demographics/AbstractDemographicsProvider.java b/ehr/api-src/org/labkey/api/ehr/demographics/AbstractDemographicsProvider.java
index 7ef0c069c..8701854fb 100644
--- a/ehr/api-src/org/labkey/api/ehr/demographics/AbstractDemographicsProvider.java
+++ b/ehr/api-src/org/labkey/api/ehr/demographics/AbstractDemographicsProvider.java
@@ -116,16 +116,10 @@ public Map<String, Map<String, Object>> getProperties(DefaultSchema defaultSchem
             public void exec(ResultSet object) throws SQLException
             {
                 Results rs = new ResultsImpl(object, cols);
+                String id = ti.getColumn("Id").getStringValue(rs);
 
-                String id = rs.getString(FieldKey.fromString(ti.getColumn("Id").getAlias()));
-
-                Map<String, Object> map = ret.get(id);
-                if (map == null)
-                    map = new TreeMap<>();
-
+                Map<String, Object> map = ret.computeIfAbsent(id, (x)->new TreeMap<>());
                 processRow(rs, cols, map);
-
-                ret.put(id, map);
             }
         });
         if (debugEnabled)
diff --git a/ehr/api-src/org/labkey/api/ehr/demographics/WeightsDemographicsProvider.java b/ehr/api-src/org/labkey/api/ehr/demographics/WeightsDemographicsProvider.java
index a66eb0cd0..df9f2d58d 100644
--- a/ehr/api-src/org/labkey/api/ehr/demographics/WeightsDemographicsProvider.java
+++ b/ehr/api-src/org/labkey/api/ehr/demographics/WeightsDemographicsProvider.java
@@ -85,16 +85,10 @@ public Map<String, Map<String, Object>> getProperties(DefaultSchema defaultSchem
                 public void exec(ResultSet object) throws SQLException
                 {
                     Results rs = new ResultsImpl(object, cols);
+                    String id = ti.getColumn("Id").getStringValue(rs);
 
-                    String id = rs.getString(FieldKey.fromString(ti.getColumn("Id").getAlias()));
-
-                    Map<String, Object> map = ret.get(id);
-                    if (map == null)
-                        map = new HashMap<>();
-
+                    Map<String, Object> map = ret.computeIfAbsent(id, (x)->new HashMap<>());
                     processRow(rs, cols, map);
-
-                    ret.put(id, map);
                 }
             });
         }