diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InternetArticleExtendedPropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InternetArticleExtendedPropertiesStep.java
index 9fe6497..de78d5d 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InternetArticleExtendedPropertiesStep.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InternetArticleExtendedPropertiesStep.java
@@ -97,13 +97,13 @@ public class InternetArticleExtendedPropertiesStep
         propertiesStepModel.setIssn(getPublication().getIssn());
         propertiesStepModel.setLastAccessed(
             Optional
-                .of(getPublication().getLastAccessed())
+                .ofNullable(getPublication().getLastAccessed())
                 .map(date -> isoDateFormatter.format(date))
                 .orElse(null)
         );
         propertiesStepModel.setPublicationDate(
             Optional
-                .of(getPublication().getPublicationDate())
+                .ofNullable(getPublication().getPublicationDate())
                 .map(date -> isoDateFormatter.format(date))
                 .orElse(null)
         );
@@ -147,7 +147,7 @@ public class InternetArticleExtendedPropertiesStep
         final String publicationDateParam,
         @FormParam("urn")
         final String urn,
-        @FormParam("doe")
+        @FormParam("doi")
         final String doi
     ) {
         try {
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/internetarticle/edit-extendedproperties.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/internetarticle/edit-extended-properties.xhtml
similarity index 100%
rename from sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/internetarticle/edit-extendedproperties.xhtml
rename to sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/internetarticle/edit-extended-properties.xhtml
diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/internetarticle/edit-internetarticle.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/internetarticle/edit-internetarticle.xhtml
index 634d6c3..eade813 100644
--- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/internetarticle/edit-internetarticle.xhtml
+++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/internetarticle/edit-internetarticle.xhtml
@@ -122,7 +122,7 @@
                             confirmLabel="#{SciPublicationsUiMessageBundle['internetarticle.basicproperties.organization.confirm']}"
                             dialogId="remove-organization-dialog"
                             dialogTitle="#{SciPublicationsUiMessageBundle['internetarticle.basicproperties.organization.title']}"
-                            message="#{SciPublicationsUiMessageBundle.getMessage('internetarticle.basicproperties.organization.message', [CmsSelectedDocumentModel.name, SciCmsInternetArticlePropertiesStepModel.organization])}"
+                            message="#{SciPublicationsUiMessageBundle.getMessage('internetarticle.basicproperties.organization.message', [CmsSelectedDocumentModel.itemName, SciCmsInternetArticlePropertiesStepModel.organizationName])}"
                             />
                     </c:if>
                 </c:otherwise>