diff --git a/application/Building/BuildingModel.php b/application/Building/BuildingModel.php
index 7f95bd80d..4c3cf5186 100644
--- a/application/Building/BuildingModel.php
+++ b/application/Building/BuildingModel.php
@@ -288,10 +288,8 @@ class BuildingModel {
        wv.value_string,
        wv.value_int,
        wv.value_text,
-       (wv.create) AS created_at,
-       wv.create_by AS created_by_user_id,
        wv.changed AS last_edited_at,
-       wv.edit_by AS last_edited_by_user_id
+       wv.changed_by AS last_edited_by_user_id
 FROM Workflowvalue wv
 JOIN Workflowitem wi ON wv.item_id = wi.id
 JOIN Building b ON wv.object_id = b.id";
@@ -309,7 +307,7 @@ JOIN Building b ON wv.object_id = b.id";
         }
 
         $sql .= " WHERE " . implode(" AND ", $where);
-        $sql .= " ORDER BY wv.edit DESC, wv.create DESC;";
+        $sql .= " ORDER BY wv.changed DESC;";
 
         $db = FronkDB::singleton();
         $res = $db->query($sql);