diff --git a/bvletools.user.js b/bvletools.user.js
index 68e8a442e2eb6820809fb4bcac0281c5b779cb92..f5967ebd0a5aacaf76a0ccc931c6e9c68952279a 100644
--- a/bvletools.user.js
+++ b/bvletools.user.js
@@ -156,8 +156,10 @@
 
 
                     // Append any non-existing contents to header
-                    if (data.studentEvents.length > 0) {
-                        var headerFirstObjectKeys = Object.keys(data.studentEvents[0]);
+                    var studentEvents = [].concat(data.studentEvents);
+
+                    if (studentEvents.length > 0) {
+                        var headerFirstObjectKeys = Object.keys(studentEvents[0]);
                         for(var i = 0; i < headerFirstObjectKeys.length; i++) {
                             var key = headerFirstObjectKeys[i];
                             if(!headerContentArrKeys.includes(key)) {
@@ -183,12 +185,12 @@
                     }
                     headerContent += "</tr>"
 
-                    if (data.studentEvents.length > 0) {
-                        for (var i = 0; i < data.studentEvents.length; i++) {
+                    if (studentEvents.length > 0) {
+                        for (var i = 0; i < studentEvents.length; i++) {
                             content += "<tr>"
-                            for (var j = 0; j < data.behaviourStudentEventHeader.length; j++) {
+                            for (var j = 0; j < headerContentArr.length; j++) {
                                 content += '<td>' +
-                                    data.studentEvents[i][toCamelCase(data.behaviourStudentEventHeader[j].fieldName = data.behaviourStudentEventHeader[j].fieldName == "" ? data.behaviourStudentEventHeader[j].displayName : data.behaviourStudentEventHeader[j].fieldName)] + '</td>';
+                                    studentEvents[i][toCamelCase(headerContentArr[j].fieldName = headerContentArr[j].fieldName == "" ? headerContentArr[j].displayName : headerContentArr[j].fieldName)] + '</td>';
                             }
                             content += "</tr>"
                         }
@@ -226,7 +228,7 @@
             });
         }
 
-        $(".calendar-toolbar")[0].append("<div class=\"form-group\">" +
+        $(".calendar-toolbar").append("<div class=\"form-group\">" +
             "<a id=\"rb9ButtonBehavRefresh\">Refresh Behaviour Table</a>" +
             "</div>");