diff --git a/server/controllers/api/claim/publish/createPublishParams.js b/server/controllers/api/claim/publish/createPublishParams.js
index 44330277..897b7e53 100644
--- a/server/controllers/api/claim/publish/createPublishParams.js
+++ b/server/controllers/api/claim/publish/createPublishParams.js
@@ -47,7 +47,7 @@ const createPublishParams = (
     publishParams['thumbnail_url'] = thumbnail;
   }
   if (nsfw) {
-    publishParams.tags = 'mature';
+    publishParams.tags = ['mature'];
   }
   // add channel details if publishing to a channel
   if (channelName && channelClaimId) {
diff --git a/server/controllers/api/claim/update/index.js b/server/controllers/api/claim/update/index.js
index 68107e05..204b91f7 100644
--- a/server/controllers/api/claim/update/index.js
+++ b/server/controllers/api/claim/update/index.js
@@ -149,9 +149,19 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
         claim_address: primaryClaimAddress,
         channel_name: channelName,
         channel_id: channelId,
-        metadata,
+        title,
+        description,
+        author: details.title,
+        languages: ['en'],
+        license: license || '',
+        license_url: licenseUrl || '',
+        tags: [],
       };
 
+      if (nsfw) {
+        publishParams.tags = ['mature'];
+      }
+
       if (files.file) {
         if (thumbnailUpdate) {
           // publish new thumbnail
@@ -185,14 +195,14 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
 
       if (channelName) {
         return chainquery.claim.queries.getShortClaimIdFromLongClaimId(
-          result.certificateId,
+          publishResult.certificateId,
           channelName
         );
       } else {
         return chainquery.claim.queries
-          .getShortClaimIdFromLongClaimId(result.claimId, name, result)
+          .getShortClaimIdFromLongClaimId(publishResult.claimId, name, publishResult)
           .catch(() => {
-            return result.claimId.slice(0, 1);
+            return publishResult.claimId.slice(0, 1);
           });
       }
     })