Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r5523969e2d7fc452301bf0a8403e5afbbae6c92a -re1f4bc88064ebab3efee85e7993a0f6dc0df773f
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 5523969e2d7fc452301bf0a8403e5afbbae6c92a)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision e1f4bc88064ebab3efee85e7993a0f6dc0df773f)
@@ -724,10 +724,12 @@
 			break;
 
 		case 'aes': {
-			tabContent.load(LAMS_URL + 'monitoring/tblmonitor/aes.do?'
-				+ '&aeToolContentIds='+ aeToolContentIds
-				+ '&aeToolTypes=' + aeToolTypes
-				+ '&aeActivityTitles=' + encodeURIComponent(aeActivityTitles));
+			tabContent.load(LAMS_URL + 'monitoring/tblmonitor/aes.do?',
+				{
+					aeToolContentIds: aeToolContentIds,
+					aeToolTypes: aeToolTypes,
+					aeActivityTitles: aeActivityTitles
+				});
 			searchStudentWidget.hide();
 		}
 			break;
@@ -926,64 +928,64 @@
 					},
 					plugins : {
 						tooltip : {
-						enabled : true,
-						callbacks: {
+							enabled : true,
+							callbacks: {
 								label : function(context) {
 									let index =  context.dataIndex,
 
 										rawData = context.chart.lessonCompletionChartRawData,
 										percent = context.dataset.data,
 
-									label = labels[index],
-									value = percent[index],
-									rawValue = rawData[index];
+										label = labels[index],
+										value = percent[index],
+										rawValue = rawData[index];
 
 									return " " + rawValue + " (" + value + "%)";
+								}
 							}
-						}
-					},
-					legend : {
-						position: 'bottom',
-						align: 'start',
-						labels : {
+						},
+						legend : {
+							position: 'bottom',
+							align: 'start',
+							labels : {
 								font : {
 									size: 15
 								},
-							generateLabels : function(chart) {
-								var data = chart.data;
-								if (data.labels.length && data.datasets.length) {
-									return data.labels.map(function(label, i) {
-										let meta = chart.getDatasetMeta(0),
-											style = meta.controller.getStyle(i),
-											value = data.datasets[0].data[i],
-											rawData = chart.lessonCompletionChartRawData || raw,
-											rawValue = rawData[i];
+								generateLabels : function(chart) {
+									var data = chart.data;
+									if (data.labels.length && data.datasets.length) {
+										return data.labels.map(function(label, i) {
+											let meta = chart.getDatasetMeta(0),
+												style = meta.controller.getStyle(i),
+												value = data.datasets[0].data[i],
+												rawData = chart.lessonCompletionChartRawData || raw,
+												rawValue = rawData[i];
 
-										return {
-											text: label + ": " + rawValue + " (" + value + "%)",
-											fillStyle: style.backgroundColor,
-											strokeStyle: style.borderColor,
-											lineWidth: 0,
-											hidden: isNaN(value) || meta.data[i].hidden,
+											return {
+												text: label + ": " + rawValue + " (" + value + "%)",
+												fillStyle: style.backgroundColor,
+												strokeStyle: style.borderColor,
+												lineWidth: 0,
+												hidden: isNaN(value) || meta.data[i].hidden,
 
-											// Extra data used for toggling the
-											// correct item
-											index: i
-										};
-									});
+												// Extra data used for toggling the
+												// correct item
+												index: i
+											};
+										});
+									}
+									return [];
 								}
-								return [];
 							}
 						}
-						}
 					}
 				}
 			});
 
 			lessonCompletionChart.lessonCompletionChartRawData = raw;
 			chartDiv.data('chart', lessonCompletionChart);
 		}
-		});
+	});
 }
 
 function checkScheduleDate(startDateString, endDateString) {