diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmObject.java b/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
index d71e58534..116ee7a12 100644
--- a/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
+++ b/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
@@ -83,9 +83,9 @@ import javax.persistence.Table;
     @NamedQuery(name = "CcmObject.findById",
                 query = "SELECT o FROM CcmObject o WHERE o.objectId = :id"),
     @NamedQuery(name = "CcmObject.findByUuid",
-                query = "SELECT o FROM CcmObject o WHERE o.uuid = :uuid"),
+                query = "SELECT o FROM CcmObject o WHERE o.uuid = :uuid ORDER BY o.objectId"),
     @NamedQuery(name = "CcmObject.findFirstByUuid",
-                query = "SELECT o FROM CcmObject o WHERE o.uuid = :uuid ORDER BY objectId")
+                query = "SELECT o FROM CcmObject o WHERE o.uuid = :uuid ORDER BY o.objectId")
 })
 @XmlRootElement(name = "ccm-object", namespace = CORE_XML_NS)
 //False warning (?). Because this class has been migrated from the old PDL style
diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java b/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java
index 4d1b9d0fb..a4bc3ecdf 100644
--- a/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java
+++ b/ccm-core/src/main/java/org/libreccm/core/CcmObjectRepository.java
@@ -128,7 +128,8 @@ public class CcmObjectRepository extends AbstractEntityRepository<Long, CcmObjec
      */
     public Optional<CcmObject> findFirstObjectByUuid(final String uuid) {
         final TypedQuery<CcmObject> query = getEntityManager().createNamedQuery(
-            "CcmObject.findFirstByUuid", CcmObject.class);
+            "CcmObject.findFirstByUuid", CcmObject.class
+        );
         query.setParameter("uuid", uuid);
 
         final List<CcmObject> result = query.getResultList();