diff --git a/src/main/java/org/tdl/vireo/model/repo/impl/SubmissionRepoImpl.java b/src/main/java/org/tdl/vireo/model/repo/impl/SubmissionRepoImpl.java
index e50b7804e..f5502958c 100644
--- a/src/main/java/org/tdl/vireo/model/repo/impl/SubmissionRepoImpl.java
+++ b/src/main/java/org/tdl/vireo/model/repo/impl/SubmissionRepoImpl.java
@@ -380,9 +380,9 @@ public Long mapRow(ResultSet rs, int rowNum) throws SQLException {
             idToIndexMap.put(ids.get(i), i);
         }
 
+        submissions.forEach(submission -> mapColumnValues(submission, submissionListColumns));
+
         submissions.sort((s1, s2) -> {
-            mapColumnValues(s1, submissionListColumns);
-            mapColumnValues(s2, submissionListColumns);
             int index1 = idToIndexMap.get(s1.getId());
             int index2 = idToIndexMap.get(s2.getId());
             return Integer.compare(index1, index2);