Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java,v
diff -u -r1.24 -r1.25
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	30 Apr 2014 22:49:49 -0000	1.24
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	7 Jul 2014 16:23:40 -0000	1.25
@@ -139,12 +139,30 @@
 	    // Add reflectList to sessionMap
 	    sessionMap.put(AssessmentConstants.ATTR_REFLECT_LIST, reflectList);
 	}
+	
+	//create list of questions to display in question drop down menu
+	Set<AssessmentQuestion> questionList = new TreeSet<AssessmentQuestion>();
+	boolean hasRandomQuestion = false;
+	for (QuestionReference reference : (Set<QuestionReference>)assessment.getQuestionReferences()) {
+	    hasRandomQuestion |= reference.isRandomQuestion();
+	}
+	//in case there is at least one random question - we need to show all questions in a drop down select
+	if (hasRandomQuestion) {
+	    questionList.addAll(assessment.getQuestions());
+	
+	//show only questions from question list otherwise
+	} else {
+	    for (QuestionReference reference : (Set<QuestionReference>) assessment.getQuestionReferences()) {
+		questionList.add(reference.getQuestion());
+	    }
+	}
 
 	// cache into sessionMap
 	boolean isGroupedActivity = service.isGroupedActivity(contentId);
 	sessionMap.put(AssessmentConstants.ATTR_IS_GROUPED_ACTIVITY, isGroupedActivity);
 	sessionMap.put(AssessmentConstants.ATTR_SUMMARY_LIST, summaryList);
 	sessionMap.put(AssessmentConstants.ATTR_ASSESSMENT, assessment);
+	sessionMap.put(AssessmentConstants.ATTR_QUESTION_LIST, questionList);
 	sessionMap.put(AssessmentConstants.ATTR_TOOL_CONTENT_ID, contentId);
 	sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, WebUtil.readStrParam(request,
 		AttributeNames.PARAM_CONTENT_FOLDER_ID));
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/summary.jsp,v
diff -u -r1.24 -r1.25
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	30 Apr 2014 22:49:50 -0000	1.24
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	7 Jul 2014 16:23:40 -0000	1.25
@@ -3,7 +3,6 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 <c:set var="assessment" value="${sessionMap.assessment}"/>
-<c:set var="isShrinkToFit" value="${(145 + fn:length(assessment.questions)*80) < 630}"/>
 
 <script type="text/javascript">
 	$(document).ready(function(){
@@ -13,7 +12,6 @@
 				datatype: "local",
 				height: 'auto',
 				width: 630,
-				shrinkToFit: ${isShrinkToFit},
 				
 			   	colNames:['#',
 						'userId',
@@ -255,7 +253,7 @@
 
 			<select id="questionUid" style="float: left">
 				<option selected="selected" value="-1"><fmt:message key="label.monitoring.summary.choose" /></option>
-    			<c:forEach var="question" items="${assessment.questions}">
+    			<c:forEach var="question" items="${sessionMap.questionList}">
 					<option value="${question.uid}"><c:out value="${question.title}" escapeXml="true"/></option>
 			   	</c:forEach>
 			</select>