diff --git a/frontend/pages/article.ejs b/frontend/pages/article.ejs
index d8dbeb8..6615cc7 100644
--- a/frontend/pages/article.ejs
+++ b/frontend/pages/article.ejs
@@ -23,7 +23,7 @@
 					<h1><%= article.title %></h1>
 					<% if (article.description != null) { %><h3><%= article.description.slice(0, 97) %>...</h3><% } %>
 					<h5><%= pageviews %> Views</h5>
-					<p>Tags: <% for (tag of article.tags) { %><a href="<%- vars.domain %>/tags/<%= tag %>"><%= toTitleCase(tag) %></a> <% } %></p>
+					<% if (article.tags != null) { %><p>Tags: <% for (tag of article.tags) { %><a href="<%- vars.domain %>/tags/<%= tag %>"><%= toTitleCase(tag) %></a> <% } %></p><% } %>
 				</div>
 				<div class="author">
 					<img src="<%- vars.asset_prefix %><%= cms.siteDetails[0].favicon.path %>" />
diff --git a/frontend/pages/articles.ejs b/frontend/pages/articles.ejs
index 2764ae4..3eb56d7 100644
--- a/frontend/pages/articles.ejs
+++ b/frontend/pages/articles.ejs
@@ -25,7 +25,7 @@
 						<h3><%= article.title %></h3>
 					</a>
 					<% if (article.description != null) { %><h4><%= article.description.slice(0, 97) %>...</h4><% } %>
-					<p><a href="<%- vars.domain %>/tags/<%= article.tags[0].toLowerCase() %>"><%= article.tags[0] %></a> / <% var date = new Date(article.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((article.author != "") && (article.author != null)) { %> / <%= article.author %><% } %></p>
+					<p><% if (article.tags != null) { %><a href="<%- vars.domain %>/tags/<%= article.tags[0].toLowerCase() %>"><%= article.tags[0] %></a> / <% } %><% var date = new Date(article.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((article.author != "") && (article.author != null)) { %> / <%= article.author %><% } %></p>
 				</div>
 			</div>
 			<% } %>
diff --git a/frontend/pages/artwork.ejs b/frontend/pages/artwork.ejs
index d3fe49b..e2755c6 100644
--- a/frontend/pages/artwork.ejs
+++ b/frontend/pages/artwork.ejs
@@ -21,7 +21,7 @@
 			<div class="left">
 				<div class="info">
 					<h1><%= artwork.title %></h1>
-					<p>Tags: <% for (tag of artwork.tags) { %><a href="<%- vars.domain %>/tags/<%= tag %>"><%= toTitleCase(tag) %></a> <% } %></p>
+					<% if (artwork.tags != null) { %><p>Tags: <% for (tag of artwork.tags) { %><a href="<%- vars.domain %>/tags/<%= tag %>"><%= toTitleCase(tag) %></a> <% } %></p><% } %>
 				</div>
 				<div class="author">
 					<img src="<%- vars.asset_prefix %><%= cms.siteDetails[0].favicon.path %>" />
diff --git a/frontend/pages/artworks.ejs b/frontend/pages/artworks.ejs
index 3dfa2f4..713e04c 100644
--- a/frontend/pages/artworks.ejs
+++ b/frontend/pages/artworks.ejs
@@ -24,7 +24,7 @@
 					<a href="<%- vars.domain %>/artworks/<%= artwork.slug %>">
 						<h3><%= artwork.title %></h3>
 					</a>
-					<p><a href="<%- vars.domain %>/tags/<%= article.tags[0].toLowerCase() %>"><%= article.tags[0] %></a> / <% var date = new Date(article.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((article.author != "") && (article.author != null)) { %> / <%= article.author %><% } %></p>
+					<p><% if (artwork.tags != null) { %><a href="<%- vars.domain %>/tags/<%= artwork.tags[0].toLowerCase() %>"><%= artwork.tags[0] %></a> / <% } %><% var date = new Date(article.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((article.author != "") && (article.author != null)) { %> / <%= article.author %><% } %></p>
 				</div>
 			</div>
 			<% } %>
diff --git a/frontend/pages/index.ejs b/frontend/pages/index.ejs
index b0b1187..988cd0b 100644
--- a/frontend/pages/index.ejs
+++ b/frontend/pages/index.ejs
@@ -44,7 +44,7 @@
 						<h3><%= article.title %></h3>
 					</a>
 					<% if (article.description != null) { %><h4><%= article.description.slice(0, 97) %>...</h4><% } %>
-					<p><a href="<%- vars.domain %>/tags/<%= article.tags[0].toLowerCase() %>"><%= article.tags[0] %></a> / <% var date = new Date(article.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((article.author != "") && (article.author != null)) { %> / <%= article.author %><% } %></p>
+					<p><% if (article.tags != null) { %><a href="<%- vars.domain %>/tags/<%= article.tags[0].toLowerCase() %>"><%= article.tags[0] %></a> / <% } %><% var date = new Date(article.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((article.author != "") && (article.author != null)) { %> / <%= article.author %><% } %></p>
 				</div>
 			</div>
 			<% } %>
@@ -60,7 +60,7 @@
 					<a href="<%- vars.domain %>/artworks/<%= artwork.slug %>">
 						<h3><%= artwork.title %></h3>
 					</a>
-					<p><a href="<%- vars.domain %>/tags/<%= artwork.tags[0].toLowerCase() %>"><%= artwork.tags[0] %></a> / <% var date = new Date(artwork.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((artwork.author != "") && (artwork.author != null)) { %> / <%= artwork.author %><% } %></p>
+					<p><% if (artwork.tags != null) { %><a href="<%- vars.domain %>/tags/<%= artwork.tags[0].toLowerCase() %>"><%= artwork.tags[0] %></a> / <% } %><% var date = new Date(artwork.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((artwork.author != "") && (artwork.author != null)) { %> / <%= artwork.author %><% } %></p>
 				</div>
 			</div>
 			<% } %>
diff --git a/frontend/pages/search.ejs b/frontend/pages/search.ejs
index 34fd9f6..417eee7 100644
--- a/frontend/pages/search.ejs
+++ b/frontend/pages/search.ejs
@@ -61,7 +61,7 @@
 						<h3>Article: <%= article.title %></h3>
 					</a>
 					<% if (article.description != null) { %><h4><%= article.description.slice(0, 97) %>...</h4><% } %>
-					<p><a href="<%- vars.domain %>/tags/<%= article.tags[0].toLowerCase() %>"><%= article.tags[0] %></a> / <% var date = new Date(article.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((article.author != "") && (article.author != null)) { %> / <%= article.author %><% } %></p>
+					<p><% if (tags != null) { %><a href="<%- vars.domain %>/tags/<%= article.tags[0].toLowerCase() %>"><%= article.tags[0] %></a> / <% } %><% var date = new Date(article.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((article.author != "") && (article.author != null)) { %> / <%= article.author %><% } %></p>
 				</div>
 			</div>
 			<% }); %>
@@ -92,7 +92,7 @@
 					<a href="<%- vars.domain %>/artworks/<%= artwork.slug %>">
 						<h3>Artwork: <%= artwork.title %></h3>
 					</a>
-					<p><a href="<%- vars.domain %>/tags/<%= article.tags[0].toLowerCase() %>"><%= article.tags[0] %></a> / <% var date = new Date(article.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((article.author != "") && (article.author != null)) { %> / <%= article.author %><% } %></p>
+					<p><% if (artwork.tags != null) { %><a href="<%- vars.domain %>/tags/<%= artwork.tags[0].toLowerCase() %>"><%= artwork.tags[0] %></a> / <% } %><% var date = new Date(article.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((article.author != "") && (article.author != null)) { %> / <%= article.author %><% } %></p>
 				</div>
 			</div>
 			<% }); %>
diff --git a/frontend/pages/tag.ejs b/frontend/pages/tag.ejs
index 8f57501..39b6513 100644
--- a/frontend/pages/tag.ejs
+++ b/frontend/pages/tag.ejs
@@ -3,7 +3,11 @@
 <head>
 	<%- include('../partials/head.ejs'); %>
 	<% const filteredArticles = cms.articles.filter(article => {
-		return article.tags.includes(tag);
+		if (article.tags == null) {
+			return false;
+		} else {
+			return article.tags.includes(tag);
+		};
 	});
 	function ifYesterday(date) { 
 		var yesterday = new Date();
@@ -28,7 +32,7 @@
 						<h3><%= article.title %></h3>
 					</a>
 					<h4><%= article.description.slice(0, 97) %>...</h4>
-					<p><a href="<%- vars.domain %>/tags/<%= article.tags[0].toLowerCase() %>"><%= article.tags[0] %></a> / <% var date = new Date(article._created * 1000); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %></p>
+					<p><% if (article.tags != null) { %><a href="<%- vars.domain %>/tags/<%= article.tags[0].toLowerCase() %>"><%= article.tags[0] %></a> / <% } %><% var date = new Date(article._created * 1000); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %></p>
 				</div>
 			</div>
 			<% }); } else { %>No articles found<% } %>
diff --git a/frontend/pages/tags.ejs b/frontend/pages/tags.ejs
index 0dc2da9..34ae1ac 100644
--- a/frontend/pages/tags.ejs
+++ b/frontend/pages/tags.ejs
@@ -9,11 +9,13 @@
 	}
 	var tags = {};
 	for (article of cms.articles) {
-		for (tag of article.tags) {
-			if (!tags[tag]) {
-				tags[tag] = [];
+		if (article.tags) {
+			for (tag of article.tags) {
+				if (!tags[tag]) {
+					tags[tag] = [];
+				};
+				tags[tag].push(article);
 			};
-			tags[tag].push(article);
 		};
 	};
 	function toTitleCase(str) {
diff --git a/frontend/partials/suggested.ejs b/frontend/partials/suggested.ejs
index 88c46df..4fe6c5d 100644
--- a/frontend/partials/suggested.ejs
+++ b/frontend/partials/suggested.ejs
@@ -14,7 +14,7 @@ function ifYesterday(date) {
 					<h3><%= article.title %></h3>
 				</a>
 				<% if (article.description != null) { %><h4><%= article.description.slice(0, 97) %>...</h4><% } %>
-				<p><a href="<%- vars.domain %>/tags/<%= article.tags[0].toLowerCase() %>"><%= article.tags[0] %></a> / <% var date = new Date(article.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((article.author != "") && (article.author != null)) { %> / <%= article.author %><% } %></p>
+				<p><% if (article.tags != null) { %><a href="<%- vars.domain %>/tags/<%= article.tags[0].toLowerCase() %>"><%= article.tags[0] %></a> / <% } %><% var date = new Date(article.date); if (date.isToday()) { %>Today<% } else if (ifYesterday(date)) { %>Yesterday<% } else { %><%= date.toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) %><% } %><% if ((article.author != "") && (article.author != null)) { %> / <%= article.author %><% } %></p>
 			</div>
 		</div>
 		<% } %>