Index: lams_central/src/flash/main.as
===================================================================
diff -u -rdaecac74cb05229ec5a23f5386979303c66fcd9a -rf19b88891438e209aa0874cb30375215825d6082
--- lams_central/src/flash/main.as	(.../main.as)	(revision daecac74cb05229ec5a23f5386979303c66fcd9a)
+++ lams_central/src/flash/main.as	(.../main.as)	(revision f19b88891438e209aa0874cb30375215825d6082)
@@ -46,6 +46,10 @@
 if(StringUtils.isEmpty(actColour)){
 	_root.actColour = "true";
 }
+
+if(StringUtils.isEmpty(requestSrc)) {
+	_root.requestSrc = null;
+}
 					   
 
 //Set stage alignment to top left and prent scaling
Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rd6b0e9aab86f9c21bfdab4b2715ac854a0be21b6 -rf19b88891438e209aa0874cb30375215825d6082
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rd6b0e9aab86f9c21bfdab4b2715ac854a0be21b6 -rf19b88891438e209aa0874cb30375215825d6082
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as
===================================================================
diff -u -rd6b0e9aab86f9c21bfdab4b2715ac854a0be21b6 -rf19b88891438e209aa0874cb30375215825d6082
--- lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision d6b0e9aab86f9c21bfdab4b2715ac854a0be21b6)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision f19b88891438e209aa0874cb30375215825d6082)
@@ -849,11 +849,14 @@
 		Cursor.showCursor(ApplicationParent.C_DEFAULT);
 	}
 	
-	private function searchForFile(snode:XMLNode, filename:String, nodeIsParent:Boolean){
+	private function searchForFile(snode:XMLNode, filename:String, isParentNode:Boolean){
 		
-		var _nodeIsParent = nodeIsParent;
-		if(_nodeIsParent == null) { _nodeIsParent = false; }
+		var _isParentNode:Boolean = isParentNode;
 		
+		if(_isParentNode == null) {
+			_isParentNode = false;
+		}
+		
 		Debugger.log('Searching for file (' + snode.childNodes.length + '): ' + filename,Debugger.GEN,'openFile','org.lamsfoundation.lams.WorkspaceDialog');
 		var cnode:XMLNode;
 		
@@ -881,7 +884,10 @@
 			} while(cnode != null);
 			
 			if(_workspaceModel.currentMode == Workspace.MODE_SAVE || _workspaceModel.currentMode == Workspace.MODE_SAVEAS){
-				doWorkspaceDispatch(nodeIsParent);
+				if(!_isParentNode)
+					doWorkspaceDispatch(false);
+				else
+					doWorkspaceDispatch(false, snode)
 			}
 			return false;
 			
@@ -947,27 +953,30 @@
 	 * @param   useResourceID //if its true then we will send the resorceID of teh item selected in the tree - usually this means we are overwriting something
 	 * @return  
 	 */
-	public function doWorkspaceDispatch(useResourceID:Boolean){
+	public function doWorkspaceDispatch(useResourceID:Boolean, snode:XMLNode){
 		//ObjectUtils.printObject();
+		var _snode = snode;
+		if(_snode == null) {
+			_snode = treeview.selectedNode;		// item selected in tree
+		}
 		
-		var snode = treeview.selectedNode;		// item selected in tree
-		
-		if(snode == null){
+		if(_snode == null){
 			// set to file item found in search
-			snode = _resultDTO.file;
+			_snode = _resultDTO.file;
 		}
 		
 		if(useResourceID){
 			//its an LD
-			_resultDTO.selectedResourceID = Number(snode.attributes.data.resourceID);
-			_resultDTO.targetWorkspaceFolderID = Number(snode.attributes.data.workspaceFolderID);
+			_resultDTO.selectedResourceID = Number(_snode.attributes.data.resourceID);
+			_resultDTO.targetWorkspaceFolderID = Number(_snode.attributes.data.workspaceFolderID);
 		}else{
 			//its a folder
 			_resultDTO.selectedResourceID  = null;
-			_resultDTO.targetWorkspaceFolderID = Number(snode.attributes.data.resourceID);
+			_resultDTO.targetWorkspaceFolderID = Number(_snode.attributes.data.resourceID);
 			
 		}
 		
+		Debugger.log("SNode: " + _snode.attributes.data.name + ", Target WorkspceFolder ID: " + _resultDTO.targetWorkspaceFolderID + " , useResourceID: " + useResourceID + " , selectedResourceID: " + _resultDTO.selectedResourceID, Debugger.CRITICAL, "doWorkspaceDispatch", "WorkspaceDialog");
 		_resultDTO.resourceName = resourceTitle_txi.text;
 		_resultDTO.resourceDescription = resourceDesc_txa.text;
 		_resultDTO.resourceLicenseText = license_txa.text;