Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/IndexButton.as
===================================================================
diff -u -r058ef2c126172a3ee7eeed3b1883a4b65dab9d8e -re81958af10d6f71738ab15ba4ee3df5d459cf578
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/IndexButton.as	(.../IndexButton.as)	(revision 058ef2c126172a3ee7eeed3b1883a4b65dab9d8e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/IndexButton.as	(.../IndexButton.as)	(revision e81958af10d6f71738ab15ba4ee3df5d459cf578)
@@ -120,9 +120,11 @@
 		else if (buttonText == "Index View") {
 			mm.drawIndexButtons = true;
 			mm.inSearchView = false;
+			mm.resetSearchTextField = true;
+
+			//mm.currentLearnerIndexNoRedraw = 1;
 			mm.setLessonProgressData(mm.progressArrBackup);
-			
-			//mm.currentLearnerIndex = mm.oldIndex;
+		
 		}
 		else {
 			mm.drawIndexButtons = false;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as
===================================================================
diff -u -r058ef2c126172a3ee7eeed3b1883a4b65dab9d8e -re81958af10d6f71738ab15ba4ee3df5d459cf578
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	(.../MonitorController.as)	(revision 058ef2c126172a3ee7eeed3b1883a4b65dab9d8e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	(.../MonitorController.as)	(revision e81958af10d6f71738ab15ba4ee3df5d459cf578)
@@ -416,6 +416,8 @@
 				_monitorModel.activeView.removeMovieClip();
 				_monitorModel.getMonitor.closeBranchView();
 			}
+			if (_monitorModel.getSelectedTab() == 2)
+				_monitorModel.resetLearnerIndexBar();
 			
 			_app.reloadLearningDesign(_monitorModel.getSequence(), Proxy.create(_monitorModel, _monitorModel.refreshAllData));
 		}else if(tgt.indexOf("help_btn") != -1){
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
diff -u -r058ef2c126172a3ee7eeed3b1883a4b65dab9d8e -re81958af10d6f71738ab15ba4ee3df5d459cf578
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision 058ef2c126172a3ee7eeed3b1883a4b65dab9d8e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision e81958af10d6f71738ab15ba4ee3df5d459cf578)
@@ -92,7 +92,8 @@
 	// state data
 	private var _isDesignDrawn:Boolean;
 	private var _showLearners:Boolean;
-	private var _inSearchView:Boolean;
+	private var _inSearchView:Boolean;
+	private var _resetSearchTextField:Boolean;
 	private var _endGate:MovieClip;
 	private var _learnerIndexView:MovieClip;
 	
@@ -152,6 +153,7 @@
 		_learnersLoaded = false;
 		lastIndexInitialised = false;
 		_inSearchView = false;
+		_resetSearchTextField = false;
 		
 		_currentLearnerIndex = 1;
 		_numPreferredIndexButtons = 10; // to be displayed at a time
@@ -448,6 +450,10 @@
 
 	}
 	
+	public function set currentLearnerIndexNoRedraw(idx:Number):Void {
+		_currentLearnerIndex = idx;
+	}
+	
 	public function set currentLearnerIndex(idx:Number):Void {
 		Debugger.log("in currentLearnerIndex idx: "+idx, Debugger.CRITICAL, "currentLearnerIndex", "MonitorModel");
 		_currentLearnerIndex = idx;
@@ -565,6 +571,23 @@
 		_searchResultsBackup = matchesArr;
 	}
 	
+	// invoked on refresh
+	public function resetLearnerIndexBar():Void {
+		_drawButtons = true;
+		if (_inSearchView)
+			_currentLearnerIndex = 1;
+		_inSearchView = false;
+		_resetSearchTextField = true;
+	}
+	
+	public function set resetSearchTextField(resetTextField:Boolean):Void {
+		_resetSearchTextField = resetTextField;
+	}
+	
+	public function get resetSearchTextField():Boolean {
+		return _resetSearchTextField;
+	}
+	
 	public function set oldIndex(idx:Number):Void {
 		_oldIndex = idx;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as
===================================================================
diff -u -r058ef2c126172a3ee7eeed3b1883a4b65dab9d8e -re81958af10d6f71738ab15ba4ee3df5d459cf578
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as	(.../LearnerIndexView.as)	(revision 058ef2c126172a3ee7eeed3b1883a4b65dab9d8e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as	(.../LearnerIndexView.as)	(revision e81958af10d6f71738ab15ba4ee3df5d459cf578)
@@ -366,7 +366,12 @@
 		idxTextField._editable = true;
 		idxTextField.type = "input";
 		idxTextField.autosize = "center"
-		idxTextField.text = (_textFieldContents == undefined) ? defaultString : _textFieldContents;
+		if (!mm.resetSearchTextField)
+			idxTextField.text = (_textFieldContents == undefined) ? defaultString : _textFieldContents;
+		else {
+			idxTextField.text = defaultString;
+			mm.resetSearchTextField = false;
+		}
 		nextPosition += idxTextField._width;
 		
 		idxTextField.onSetFocus = Delegate.create(this, textFieldHasFocus);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as
===================================================================
diff -u -r058ef2c126172a3ee7eeed3b1883a4b65dab9d8e -re81958af10d6f71738ab15ba4ee3df5d459cf578
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as	(.../LearnerTabView.as)	(revision 058ef2c126172a3ee7eeed3b1883a4b65dab9d8e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as	(.../LearnerTabView.as)	(revision e81958af10d6f71738ab15ba4ee3df5d459cf578)
@@ -317,11 +317,14 @@
 	}
 	
 	public function adjustLearnerPanel(mm:MonitorModel):Void {
-		
 		Debugger.log("adjustLearnerPanel called", Debugger.CRITICAL, "adjustLearnerPanel", "LearnerTabView");
 		var _scroll:ScrollPane = mm.getMonitor().getMV().getMonitorLearnerScp();
 		var s:Object = mm.getSize();
 		
+		if (mm.inSearchView){
+			_scroll.setSize(s.w-_scroll._x, s.h - 20);
+		}
+		
 		if (mm.numIndexButtons > 1 && !panelLowered) {
 			if (hAdjustment) {
 				_scroll.setSize(s.w-_scroll._x, s.h - 20);
@@ -373,13 +376,13 @@
 	}
 	
 	private function drawAllLearnersDesign(mm:MonitorModel, tabID:Number){
+		activitiesDrawn = 0;
 		var learnersPerPage:Number = mm.learnersPerPage;
 		currentLearnerIndex = (mm.currentLearnerIndex-1)*learnersPerPage;
 		maxLearnerIndex = (learnersPerPage*mm.currentLearnerIndex)-1;
 		learnersDrawnIndex = 0;
 		
 		drawNextLearner();
-
 	}
 	
 	private function drawNextLearner(){
@@ -572,7 +575,7 @@
 			
 		Debugger.log("_clone:" + _activityLayer_mc_clone + " xPOS=" + mc_to_clone._x + " yPOS=" + mc_to_clone._y + " _x=" + _activityLayer_mc_clone._x + " _y=" + _activityLayer_mc_clone._y, Debugger.CRITICAL, "cloneDesign", "LTV");
 
-	}
+	}
 
 	/**
 	 * Get the CSSStyleDeclaration objects for each component and apply them
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -r058ef2c126172a3ee7eeed3b1883a4b65dab9d8e -re81958af10d6f71738ab15ba4ee3df5d459cf578
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -r058ef2c126172a3ee7eeed3b1883a4b65dab9d8e -re81958af10d6f71738ab15ba4ee3df5d459cf578
Binary files differ