diff --git a/gs/data.gs b/gs/data.gs
index fc8f6871c..f6adfe6d9 100644
--- a/gs/data.gs
+++ b/gs/data.gs
@@ -23,13 +23,16 @@ function concatNamelessComboLists() {
 }
 
 function refreshParsed() {
-    var urlTypes = ["viewUrl", "addUrl", "homeUrl", "forumUrl", "issuesUrl", "email", "donateUrl", "tags"];
-    for (var i = 0, urlTypesLength = urlTypes.length; i < urlTypesLength; i++) {
-        var colIndexParsedUrlType = getColIndex(sParsed, urlTypes[i]);
+    var parsedFields = ["tags", "viewUrl", "addUrl", "homeUrl", "forumUrl", "issuesUrl", "email", "donateUrl"];
+    for (var i = 0, parsedFieldsLength = parsedFields.length; i < parsedFieldsLength; i++) {
+        var colIndexParsedUrlType = getColIndex(sParsed, parsedFields[i]);
         var colRangeParsedUrlType = sParsed.getRange(colIndexParsedUrlType + "2:" + colIndexParsedUrlType);
         colRangeParsedUrlType.clearContent();
         var colTopParsedUrlType = sParsed.getRange(colIndexParsedUrlType + "2");
-        switch (urlTypes[i]) {
+        switch (parsedFields[i]) {
+            case "tags":
+                colTopParsedUrlType.setValue("=createHtmlArrayTags()");
+                break;
             case "viewUrl":
                 colTopParsedUrlType.setValue("=createHtmlArrayLinkButton(\"viewUrl\",INDIRECT(\"Data!\"&SUBSTITUTE(ADDRESS(1,MATCH(" + colIndexParsedUrlType + "1,Data!A1:1,0),4),\"1\",\"2\")&\":\"&SUBSTITUTE(ADDRESS(1,MATCH(" + colIndexParsedUrlType + "1,Data!A1:1,0),4),\"1\",\"\")),Data!A2:A)");
                 break;
@@ -52,9 +55,6 @@ function refreshParsed() {
             case "donateUrl":
                 colTopParsedUrlType.setValue("=createHtmlArrayLinkButton(\"donateUrl\",INDIRECT(\"Data!\"&SUBSTITUTE(ADDRESS(1,MATCH(" + colIndexParsedUrlType + "1,Data!A1:1,0),4),\"1\",\"2\")&\":\"&SUBSTITUTE(ADDRESS(1,MATCH(" + colIndexParsedUrlType + "1,Data!A1:1,0),4),\"1\",\"\")),Data!A2:A)");
                 break;
-            case "tags":
-                colTopParsedUrlType.setValue("=createHtmlArrayTags()");
-                break;
             default:
         }
         var colDataParsedUrlType = colRangeParsedUrlType.getDisplayValues();
@@ -85,7 +85,7 @@ function refreshPublic() {
                 }
                 break;
             case "links":
-                colTopPublicPublicField.setValue("=ARRAYFORMULA(IF(Parsed!A2:A=\"\",\"\",\"<p>\"&Parsed!A2:A&Parsed!B2:B&Parsed!C2:C&Parsed!D2:D&Parsed!E2:E&Parsed!F2:F&Parsed!G2:G&\"</p>\"))");
+                colTopPublicPublicField.setValue("=ARRAYFORMULA(IF(Parsed!B2:B=\"\",\"\",\"<p>\"&Parsed!B2:B&Parsed!C2:C&Parsed!D2:D&Parsed!E2:E&Parsed!F2:F&Parsed!G2:G&Parsed!H2:H&\"</p>\"))");
                 break;
             case "related":
                 colTopPublicPublicField.setValue("=createHtmlArrayRelatedLists(INDIRECT(\"Data!\"&SUBSTITUTE(ADDRESS(1,MATCH(\"related\",Data!A1:1,0),4),\"1\",\"2\")&\":\"&SUBSTITUTE(ADDRESS(1,MATCH(\"related\",Data!A1:1,0),4),\"1\",\"\")))");
diff --git a/gs/html-factory.gs b/gs/html-factory.gs
index bc8eaf046..c2f5cf56e 100644
--- a/gs/html-factory.gs
+++ b/gs/html-factory.gs
@@ -41,6 +41,7 @@ function createHtmlArrayTags() {
     var tagsHtml = new Array();
     var colIndexDataTags = getColIndicesWithHeaderSubstring(sData, "tag");
     for (var i = 0, colIndexDataTagsLength = colIndexDataTags.length; i < colIndexDataTagsLength; i++) {}
+    tagsHtml.push(0);
     return tagsHtml;
 }
 
@@ -70,10 +71,11 @@ function createHtmlArrayRelatedLists(related) {
             return "";
         } else {
             var relatedArray = related.split(',');
-            var relatedHtml = "";
+            var relatedHtml = "<p>";
             for (var i = 0, relatedArrayLength = relatedArray.length; i < relatedArrayLength; i++) {
                 relatedHtml += "<a href=\"#" + trimUrlSlugArray(relatedArray[i]) + "\" class=\"related\"><span class=\"related\">" + relatedArray[i] + "</span></a>";
             }
+            relatedHtml += "</p>";
             return relatedHtml;
         }
     }