diff --git a/tools/jsdoc/plugins/hifi.js b/tools/jsdoc/plugins/hifi.js
index 7c643d398c..5092e8b809 100644
--- a/tools/jsdoc/plugins/hifi.js
+++ b/tools/jsdoc/plugins/hifi.js
@@ -94,20 +94,20 @@ exports.handlers = {
             if (e.doclet.hifiInterface) {
                 rows.push("Interface Scripts");
             }
-            if (e.doclet.hifiAssignmentClient) {
-                rows.push("Assignment Client Scripts");
-            }
             if (e.doclet.hifiClientEntity) {
                 rows.push("Client Entity Scripts");
             }
             if (e.doclet.hifiServerEntity) {
                 rows.push("Server Entity Scripts");
             }
+            if (e.doclet.hifiAssignmentClient) {
+                rows.push("Assignment Client Scripts");
+            }
 
             // Append an Available In: table at the end of the namespace description.
             if (rows.length > 0) {
-                var table = "<br><br><table><td>Available In:<td>" + rows.join("<td>") + "</table>";
-                e.doclet.description = e.doclet.description + table;
+                var table = "<br><br><table><tr><th>Available in:</th><td>" + rows.join("</td><td>") + "</td></tr></table>";
+                e.doclet.description = (e.doclet.description ? e.doclet.description : "") + table;
             }
         }
     }
@@ -124,7 +124,7 @@ exports.defineTags = function (dictionary) {
     });
 
     // @hifi-assignment-client
-    dictionary.defineTag("hifi-assigment-client", {
+    dictionary.defineTag("hifi-assignment-client", {
         onTagged: function (doclet, tag) {
             doclet.hifiAssignmentClient = true;
         }