diff --git a/server.js b/server.js
index 468d8f5bf..4c4cb6f63 100644
--- a/server.js
+++ b/server.js
@@ -52,11 +52,7 @@ const splitTextStyleAndMetadata = (brew)=>{
 		const index = brew.text.indexOf('```\n\n');
 		const metadataSection = brew.text.slice(12, index - 1);
 		const metadata = yaml.load(metadataSection);
-		brew.title = metadata.title;
-		brew.description = metadata.description;
-		brew.tags = metadata.tags;
-		brew.systems = metadata.systems;
-		brew.renderer = metadata.renderer;
+		Object.assign(brew, _.pick(metadata, ['title', 'description', 'tags', 'systems', 'renderer']));
 		brew.text = brew.text.slice(index + 5);
 	}
 	if(brew.text.startsWith('```css')) {
diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 019d15334..f846c6d87 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -20,13 +20,7 @@ const mergeBrewText = (brew)=>{
 			`\`\`\`\n\n` +
 			`${text}`;
 	}
-	const metadata = {
-		title       : brew.title,
-		description : brew.description,
-		tags        : brew.tags,
-		systems     : brew.systems,
-		renderer    : brew.renderer
-	};
+	const metadata = _.pick(brew, ['title', 'description', 'tags', 'systems', 'renderer']);
 	text = `\`\`\`metadata\n` +
 		`${yaml.dump(metadata)}\n` +
 		`\`\`\`\n\n` +