diff --git a/ccm-cms/src/main/java/org/librecms/assets/Organization.java b/ccm-cms/src/main/java/org/librecms/assets/Organization.java
index 44d843ea1..24e83d609 100644
--- a/ccm-cms/src/main/java/org/librecms/assets/Organization.java
+++ b/ccm-cms/src/main/java/org/librecms/assets/Organization.java
@@ -18,7 +18,6 @@
  */
 package org.librecms.assets;
 
-
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import org.hibernate.envers.Audited;
@@ -111,11 +110,13 @@ public class Organization extends ContactableEntity {
 
     @Override
     public String toString(final String data) {
-
-        return super.toString(String.format(
-            "name = \"%s\"%s",
-            name,
-            data));
+        return super.toString(
+            String.format(
+                ", name = \"%s\"%s",
+                name,
+                data
+            )
+        );
     }
 
 }
diff --git a/ccm-cms/src/main/java/org/librecms/assets/Person.java b/ccm-cms/src/main/java/org/librecms/assets/Person.java
index d96bca1fe..1344e8987 100644
--- a/ccm-cms/src/main/java/org/librecms/assets/Person.java
+++ b/ccm-cms/src/main/java/org/librecms/assets/Person.java
@@ -201,20 +201,23 @@ public class Person extends ContactableEntity {
     @Override
     public String toString(final String data) {
 
-        return super.toString(String.format(
-            //            "surname = \"%s\", +"
-            "personNames = \"%s\", "
-                //                + "givenName = \"%s\", "
-                //                + "prefix = \"%s\", "
-                //                + "suffix = \"%s\", "
-                + "birthdate = %s%s",
-            Objects.toString(personNames),
-            //            surname,
-            //            givenName,
-            //            prefix,
-            //            suffix,
-            Objects.toString(birthdate),
-            data));
+        return super.toString(
+            String.format(
+                //            "surname = \"%s\", +"
+                ", personNames = \"%s\", "
+                    //                + "givenName = \"%s\", "
+                    //                + "prefix = \"%s\", "
+                    //                + "suffix = \"%s\", "
+                    + "birthdate = %s%s",
+                Objects.toString(personNames),
+                //            surname,
+                //            givenName,
+                //            prefix,
+                //            suffix,
+                Objects.toString(birthdate),
+                data
+            )
+        );
     }
 
 }
diff --git a/ccm-cms/src/main/java/org/librecms/assets/PersonName.java b/ccm-cms/src/main/java/org/librecms/assets/PersonName.java
index 9e2b113b3..2246aea9d 100644
--- a/ccm-cms/src/main/java/org/librecms/assets/PersonName.java
+++ b/ccm-cms/src/main/java/org/librecms/assets/PersonName.java
@@ -134,19 +134,27 @@ public class PersonName implements Serializable {
         return obj instanceof PersonName;
     }
 
+    @Override
+    public final String toString() {
+        return toString("");
+    }
+
     public String toString(final String data) {
 
-        return String.format("%s{ "
-                                 + "surname = \"%s\", "
-                                 + "givenName = \"%s\", "
-                                 + "prefix = \"%s\", "
-                                 + "suffix = \"%s\"%s"
-                                 + " }",
-                             super.toString(),
-                             surname,
-                             givenName,
-                             prefix,
-                             suffix);
+        return String.format(
+            "%s{ "
+                + "surname = \"%s\", "
+                + "givenName = \"%s\", "
+                + "prefix = \"%s\", "
+                + "suffix = \"%s\"%s"
+                + " }",
+            super.toString(),
+            surname,
+            givenName,
+            prefix,
+            suffix,
+            data
+        );
     }
 
 }