diff --git a/productMods/js/visualization/entitycomparison/gui-event-manager.js b/productMods/js/visualization/entitycomparison/gui-event-manager.js
index 26f5f676..47a06909 100644
--- a/productMods/js/visualization/entitycomparison/gui-event-manager.js
+++ b/productMods/js/visualization/entitycomparison/gui-event-manager.js
@@ -13,19 +13,9 @@ $(document).ready(function() {
         
         $notificationContainer = $("#notification-container").notify();
         
-        var jsonObject = {
-                prepare : function(arg1){
-                    loadData(arg1);
-                }
-            };
-        
         graphContainer = $("#graphContainer");
         tableDiv = $('#paginatedTable');
 
-        // initial display of the grid when the page loads
-        init(graphContainer);
-        
-
         //click event handler for clear button
         $("a.clear-selected-entities").click(function(){
             clearRenderedObjects();
@@ -90,9 +80,6 @@ $(document).ready(function() {
                 updateCounter();                
             }
         });
-                            
-        //parse the json object and pass it to loadData
-        jsonObject.prepare(jQuery.parseJSON(jsonString));
         
         function performEntityCheckboxUnselectedActions(entity, checkboxValue, checkbox) {
             
@@ -114,6 +101,9 @@ $(document).ready(function() {
 
             renderLineGraph(renderedObjects, entity);
             labelToCheckedEntities[checkboxValue] = checkbox;
+            labelToCheckedEntities[checkboxValue].entity = entity;
+            
+//            console.log(labelToCheckedEntities[checkboxValue], entity);
             
             /*
              * To highlight the rows belonging to selected entities. 
@@ -164,11 +154,11 @@ $(document).ready(function() {
         
             });
             
-                    /*
-                     * When the elements in the paginated div
-                     * are clicked this event handler is called
-                     */
-            $("input.if_clicked_on_school").live('click', function () {
+            /*
+             * When the elements in the paginated div
+             * are clicked this event handler is called
+             */
+            $("input." + entityCheckboxSelectorDOMClass).live('click', function () {
         
                 var checkbox = $(this);
                 var checkboxValue = $(this).attr("value");
@@ -188,26 +178,40 @@ $(document).ready(function() {
         
             });
         }
-
-        /*
-        This will make sure that top 3 entites are selected by default when the page loads.
         
-        */      
-        $.each($("input.if_clicked_on_school"), function(index, checkbox) {
-                
-                    if (index > 2) {
-                        return false;
-                    }
-                
-                    $(this).attr('checked', true);
+        function initiateTemporalGraphRenderProcess(givenGraphContainer, jsonData) {
+        	
+            /*
+             * initial display of the grid when the page loads 
+             * */ 
+            init(givenGraphContainer);
+            
+            /*
+             * render the temporal graph per the sent content. 
+             * */
+            loadData(jQuery.parseJSON(jsonData));
+            
+            /*
+             * This will make sure that top 3 entities are selected by default when the page loads.
+            */      
+            $.each($("input." + entityCheckboxSelectorDOMClass), function(index, checkbox) {
                     
-                    var checkboxValue = $(this).attr("value");
-                    var entity = labelToEntityRecord[checkboxValue];
+                        if (index > 2) {
+                            return false;
+                        }
                     
-                    performEntityCheckboxSelectedActions(entity, checkboxValue, $(this));
-                    
-                    performEntityCheckboxClickedRedrawActions();
-                    
-                });
+                        $(this).attr('checked', true);
+                        
+                        var checkboxValue = $(this).attr("value");
+                        var entity = labelToEntityRecord[checkboxValue];
+                        
+                        performEntityCheckboxSelectedActions(entity, checkboxValue, $(this));
+                        
+                        performEntityCheckboxClickedRedrawActions();
+                        
+                    });
+        	
+        }
 
+        initiateTemporalGraphRenderProcess(graphContainer, jsonString);
 });
\ No newline at end of file
diff --git a/productMods/js/visualization/entitycomparison/util.js b/productMods/js/visualization/entitycomparison/util.js
index f1145d75..17fa067c 100644
--- a/productMods/js/visualization/entitycomparison/util.js
+++ b/productMods/js/visualization/entitycomparison/util.js
@@ -862,7 +862,7 @@ function generateCheckBoxes(label, checkedFlag, fontFlag){
 	
 	var checkbox = $('<input>');
 	checkbox.attr('type','checkbox');
-	checkbox.attr('class','if_clicked_on_school');
+	checkbox.attr('class', entityCheckboxSelectorDOMClass);
 	checkbox.attr('value', label);
 	if(checkedFlag == 1){
 		checkbox.attr('checked');
@@ -988,7 +988,7 @@ function prepareTableForDataTablePagination(jsonData){
 		var row = $('<tr>'); 
 		
 		var checkboxTD = $('<td>');
-		checkboxTD.html('<div class="disabled-checkbox-event-receiver">&nbsp;</div><input type="checkbox" class="if_clicked_on_school" value="' + index + '"'+'/>');
+		checkboxTD.html('<div class="disabled-checkbox-event-receiver">&nbsp;</div><input type="checkbox" class="' + entityCheckboxSelectorDOMClass + '" value="' + index + '"'+'/>');
 		
 		var labelTD =  $('<td>');
 		labelTD.css("width", "100px");
@@ -1118,7 +1118,7 @@ function getSize(map){
 
 function disableUncheckedEntities(){
 
-	$.each($("input[type=checkbox].if_clicked_on_school:not(:checked)"), function(index, val){
+	$.each($("input[type=checkbox]." + entityCheckboxSelectorDOMClass + ":not(:checked)"), function(index, val){
 		$(val).attr('disabled', true);
 		$(val).prev().show();
 	});
@@ -1147,7 +1147,7 @@ function disableUncheckedEntities(){
 
 function enableUncheckedEntities(){
 	
-	$.each($("input[type=checkbox].if_clicked_on_school:not(:checked)"), function(index, val){
+	$.each($("input[type=checkbox]." + entityCheckboxSelectorDOMClass + ":not(:checked)"), function(index, val){
 		$(val).attr('disabled', false);
 		$(val).prev().hide();
 	});
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
index 16d65c65..9ff09174 100644
--- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
+++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
@@ -32,6 +32,8 @@
                               "value": "Grants" }>
                               
 <#assign parameterOptions = [publicationParameter, grantParameter]>
+
+<#assign entityCheckboxSelectorDOMClass = "entity-selector-checkbox">
                                     
 <#-- Javascript files -->
 
@@ -84,6 +86,8 @@ var organizationVIVOProfileURL = "${organizationVivoProfileURL}";
 
 var loadingImageLink = contextPath + "/images/visualization/ajax-loader.gif";
 
+var entityCheckboxSelectorDOMClass = "${entityCheckboxSelectorDOMClass}";
+
 /*
 This has to be declared before making a call to GUI event manager JS.
 */