diff --git a/server.js b/server.js
index 46cdad4..1d1fc7a 100644
--- a/server.js
+++ b/server.js
@@ -65,7 +65,7 @@ app.get('/', function(req, res){
     var devIndexQry = 
         "select coreId, coreName, locationDesc, max(published_at) as MaxPub, max(status) as MaxStatus " +
         "from Alerts otbl " +
-        "where published_at = (select min(published_at) from Alerts where coreId = otbl.coreId) " + 
+        "where coreName = (select max(coreName) from Alerts where coreId = otbl.coreId) " + 
         "group by coreId, coreName, locationDesc;";
     db.all(devIndexQry, function(err, rows){
         if(err !== null) {
@@ -88,7 +88,7 @@ app.get('/core/edit/:id', function(req, res){
     var coreId = req.params.id;
     console.log("GET /core/edit/" + coreId + ", " + JSON.stringify(d, 4));
 
-    db.all("select coreName, locationDesc from Alerts where coreId = ? limit 1;", coreId, function(err, rows){
+    db.all("select max(coreName), max(locationDesc) from Alerts where coreId = ? group by coreId;", coreId, function(err, rows){
     if(err !== null) {
         console.log(err);
     } else {
@@ -138,7 +138,7 @@ app.get('/core/:id', function(req, res){
     var d = new Date();
     var coreId = req.params.id;
     console.log("GET /core/" + coreId + ", " + JSON.stringify(d, 4));
-    db.all("SELECT coreId, published_at, status, coreName FROM Alerts WHERE coreId = ? ORDER BY published_at DESC LIMIT 30;", coreId, function(err, rows){
+    db.all("SELECT coreId, published_at, status, max(coreName) FROM Alerts WHERE coreId = ? ORDER BY published_at DESC LIMIT 30;", coreId, function(err, rows){
         if(err !== null) {
             console.log(err);
         } else {