Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/PedagogicalPlannerAction.java
===================================================================
diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -25,12 +25,10 @@
 package org.lamsfoundation.lams.tool.chat.web.actions;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -74,33 +72,10 @@
 	ChatPedagogicalPlannerForm plannerForm = (ChatPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Chat chat = getChatService().getChatByContentId(toolContentID);
-	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
-	if (command == null) {
-	    plannerForm.fillForm(chat);
-	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	    plannerForm.setContentFolderID(contentFolderId);
-	    return mapping.findForward(ChatConstants.SUCCESS);
-	} else {
-	    try {
-		String onlineInstructions = chat.getOnlineInstructions();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter writer = response.getWriter();
-
-		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
-		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
-		    String responseText = (StringUtils.isEmpty(chat.getOnlineInstructions()) ? "NO" : "OK") + '&'
-			    + activityIndex;
-		    writer.print(responseText);
-
-		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
-		    writer.print(onlineInstructions);
-		}
-	    } catch (IOException e) {
-		PedagogicalPlannerAction.logger.error(e);
-	    }
-	    return null;
-	}
-
+	plannerForm.fillForm(chat);
+	String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	plannerForm.setContentFolderID(contentFolderId);
+	return mapping.findForward(ChatConstants.SUCCESS);
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_chat/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_chat/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_chat/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -18,7 +18,7 @@
 	<%@ include file="/common/messages.jsp"%>
 	<h4 class="space-left"><fmt:message key="label.authoring.basic.instructions" /></h4>
 	<html:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" styleId="pedagogicalPlannerForm" method="post">
-		<html:hidden property="toolContentID" />
+		<html:hidden property="toolContentID" styleId="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r714b22913925e248cb17afd96dc3f1d3754b8c1c -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 714b22913925e248cb17afd96dc3f1d3754b8c1c)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -26,7 +26,6 @@
 package org.lamsfoundation.lams.tool.forum.web.actions;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -1140,33 +1139,11 @@
 	ForumPedagogicalPlannerForm plannerForm = (ForumPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Forum forum = getForumManager().getForumByContentId(toolContentID);
-	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
-	if (command == null) {
-	    plannerForm.fillForm(forum);
-	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	    plannerForm.setContentFolderID(contentFolderId);
-	    return mapping.findForward("success");
-	} else {
-	    try {
-		String onlineInstructions = forum.getOnlineInstructions();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter writer = response.getWriter();
+	plannerForm.fillForm(forum);
+	String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	plannerForm.setContentFolderID(contentFolderId);
+	return mapping.findForward("success");
 
-		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
-		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
-		    String responseText = (StringUtils.isEmpty(forum.getOnlineInstructions()) ? "NO" : "OK") + '&'
-			    + activityIndex;
-		    writer.print(responseText);
-
-		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
-		    writer.print(onlineInstructions);
-		}
-	    } catch (IOException e) {
-		AuthoringAction.log.error(e);
-	    }
-	    return null;
-	}
-
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
+++ lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -74,7 +74,7 @@
 	<%@ include file="/common/messages.jsp"%>
 	
 	<html:form action="/authoring/saveOrUpdatePedagogicalPlannerForm.do" styleId="pedagogicalPlannerForm" method="post">
-		<html:hidden property="toolContentID" />
+		<html:hidden property="toolContentID" styleId="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerAction.java
===================================================================
diff -u -r8a0ce21a725377050cc155f9edb0edad71ac2fd4 -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerAction.java	(.../McPedagogicalPlannerAction.java)	(revision 8a0ce21a725377050cc155f9edb0edad71ac2fd4)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerAction.java	(.../McPedagogicalPlannerAction.java)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -25,7 +25,6 @@
 package org.lamsfoundation.lams.tool.mc.web;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -69,33 +68,12 @@
 	    HttpServletResponse response) {
 	McPedagogicalPlannerForm plannerForm = (McPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
-	McContent qaContent = getMcService().retrieveMc(toolContentID);
-	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
-	if (command == null) {
-	    plannerForm.fillForm(qaContent, getMcService());
-	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	    plannerForm.setContentFolderID(contentFolderId);
-	    return mapping.findForward(McAppConstants.SUCCESS);
-	} else {
-	    try {
-		String onlineInstructions = qaContent.getOnlineInstructions();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter writer = response.getWriter();
+	McContent mcContent = getMcService().retrieveMc(toolContentID);
+	plannerForm.fillForm(mcContent, getMcService());
+	String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	plannerForm.setContentFolderID(contentFolderId);
+	return mapping.findForward(McAppConstants.SUCCESS);
 
-		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
-		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
-		    String responseText = (StringUtils.isEmpty(qaContent.getOnlineInstructions()) ? "NO" : "OK") + '&'
-			    + activityIndex;
-		    writer.print(responseText);
-
-		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
-		    writer.print(onlineInstructions);
-		}
-	    } catch (IOException e) {
-		McPedagogicalPlannerAction.logger.error(e);
-	    }
-	    return null;
-	}
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
+++ lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -100,7 +100,7 @@
 	<html:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" styleId="pedagogicalPlannerForm" method="post">
 		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 		
-		<html:hidden property="toolContentID" />
+		<html:hidden property="toolContentID" styleId="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java
===================================================================
diff -u -r4c9365155a19f048af7f0465ced0b965141292d5 -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java	(.../QaPedagogicalPlannerAction.java)	(revision 4c9365155a19f048af7f0465ced0b965141292d5)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java	(.../QaPedagogicalPlannerAction.java)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -25,7 +25,6 @@
 package org.lamsfoundation.lams.tool.qa.web;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -62,33 +61,10 @@
 	QaPedagogicalPlannerForm plannerForm = (QaPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	QaContent qaContent = getQaService().retrieveQa(toolContentID);
-	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
-	if (command == null) {
-	    plannerForm.fillForm(qaContent);
-	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	    plannerForm.setContentFolderID(contentFolderId);
-	    return mapping.findForward(QaAppConstants.SUCCESS);
-	} else {
-	    try {
-		String onlineInstructions = qaContent.getOnlineInstructions();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter writer = response.getWriter();
-
-		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
-		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
-		    String responseText = (StringUtils.isEmpty(qaContent.getOnlineInstructions()) ? "NO" : "OK") + '&'
-			    + activityIndex;
-		    writer.print(responseText);
-
-		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
-		    writer.print(onlineInstructions);
-		}
-	    } catch (IOException e) {
-		QaPedagogicalPlannerAction.logger.error(e);
-	    }
-	    return null;
-	}
-
+	plannerForm.fillForm(qaContent);
+	String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	plannerForm.setContentFolderID(contentFolderId);
+	return mapping.findForward(QaAppConstants.SUCCESS);
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
+++ lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -70,7 +70,7 @@
 	<%@ include file="/common/messages.jsp"%>
 	<h4 class="space-left"><fmt:message key="label.questions"/></h4>
 	<html:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" styleId="pedagogicalPlannerForm" method="post">
-		<html:hidden property="toolContentID" />
+		<html:hidden property="toolContentID" styleId="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -24,7 +24,6 @@
 package org.lamsfoundation.lams.tool.rsrc.web.action;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.sql.Timestamp;
@@ -1217,36 +1216,15 @@
 	return errors;
     }
 
-    public ActionForward initPedagogicalPlannerForm(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+    public ActionForward initPedagogicalPlannerForm(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
 	ResourcePedagogicalPlannerForm plannerForm = (ResourcePedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Resource taskList = getResourceService().getResourceByContentId(toolContentID);
-	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
-	if (command == null) {
-	    plannerForm.fillForm(taskList);
-	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	    plannerForm.setContentFolderID(contentFolderId);
-	    return mapping.findForward(ResourceConstants.SUCCESS);
-	} else {
-	    try {
-		String onlineInstructions = taskList.getOnlineInstructions();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter writer = response.getWriter();
-
-		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
-		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
-		    String responseText = (StringUtils.isEmpty(taskList.getOnlineInstructions()) ? "NO" : "OK") + '&' + activityIndex;
-		    writer.print(responseText);
-
-		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
-		    writer.print(onlineInstructions);
-		}
-	    } catch (IOException e) {
-		AuthoringAction.log.error(e);
-	    }
-	    return null;
-	}
-
+	plannerForm.fillForm(taskList);
+	String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	plannerForm.setContentFolderID(contentFolderId);
+	return mapping.findForward(ResourceConstants.SUCCESS);
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
Index: lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
+++ lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -76,7 +76,7 @@
 <body id="body">
 	<%@ include file="/common/messages.jsp"%>
 	<html:form enctype="multipart/form-data" action="/authoring/saveOrUpdatePedagogicalPlannerForm.do" styleId="pedagogicalPlannerForm" method="post">
-		<html:hidden property="toolContentID" />
+		<html:hidden property="toolContentID" styleId="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/PedagogicalPlannerAction.java
===================================================================
diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -25,12 +25,10 @@
 package org.lamsfoundation.lams.tool.mindmap.web.actions;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -74,32 +72,11 @@
 	MindmapPedagogicalPlannerForm plannerForm = (MindmapPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Mindmap mindmap = getMindmapService().getMindmapByContentId(toolContentID);
-	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
-	if (command == null) {
-	    plannerForm.fillForm(mindmap);
-	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	    plannerForm.setContentFolderID(contentFolderId);
-	    return mapping.findForward(MindmapConstants.SUCCESS);
-	} else {
-	    try {
-		String onlineInstructions = mindmap.getOnlineInstructions();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter writer = response.getWriter();
+	plannerForm.fillForm(mindmap);
+	String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	plannerForm.setContentFolderID(contentFolderId);
+	return mapping.findForward(MindmapConstants.SUCCESS);
 
-		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
-		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
-		    String responseText = (StringUtils.isEmpty(mindmap.getOnlineInstructions()) ? "NO" : "OK") + '&'
-			    + activityIndex;
-		    writer.print(responseText);
-
-		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
-		    writer.print(onlineInstructions);
-		}
-	    } catch (IOException e) {
-		PedagogicalPlannerAction.logger.error(e);
-	    }
-	    return null;
-	}
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_mindmap/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_mindmap/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_mindmap/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -18,7 +18,7 @@
 	<%@ include file="/common/messages.jsp"%>
 	<h4 class="space-left" style="float:left"><fmt:message key="label.authoring.basic.instructions" /></h4>
 	<html:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" styleId="pedagogicalPlannerForm" method="post">
-		<html:hidden property="toolContentID" />
+		<html:hidden property="toolContentID" styleId="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerAction.java
===================================================================
diff -u -r0e74773075ee5caec97c424a716df82265e1ba48 -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerAction.java	(.../NbPedagogicalPlannerAction.java)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbPedagogicalPlannerAction.java	(.../NbPedagogicalPlannerAction.java)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -25,12 +25,10 @@
 package org.lamsfoundation.lams.tool.noticeboard.web;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -73,33 +71,11 @@
 	NbPedagogicalPlannerForm plannerForm = (NbPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	NoticeboardContent noticeboard = getNoticeboardService().retrieveNoticeboard(toolContentID);
-	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
-	if (command == null) {
-	    plannerForm.fillForm(noticeboard);
-	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	    plannerForm.setContentFolderID(contentFolderId);
-	    return mapping.findForward("success");
-	} else {
-	    try {
-		String onlineInstructions = noticeboard.getOnlineInstructions();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter writer = response.getWriter();
+	plannerForm.fillForm(noticeboard);
+	String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	plannerForm.setContentFolderID(contentFolderId);
+	return mapping.findForward("success");
 
-		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
-		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
-		    String responseText = (StringUtils.isEmpty(noticeboard.getOnlineInstructions()) ? "NO" : "OK")
-			    + '&' + activityIndex;
-		    writer.print(responseText);
-
-		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
-		    writer.print(onlineInstructions);
-		}
-	    } catch (IOException e) {
-		NbPedagogicalPlannerAction.logger.error(e);
-	    }
-	    return null;
-	}
-
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_nb/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r0e74773075ee5caec97c424a716df82265e1ba48 -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_nb/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
+++ lams_tool_nb/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -17,7 +17,7 @@
 <body style="width: 550px">
 	<h4 class="space-left"><fmt:message key="basic.content" /></h4>
 	<html:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" styleId="pedagogicalPlannerForm" method="post">
-		<html:hidden property="toolContentID" />
+		<html:hidden property="toolContentID" styleId="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/PedagogicalPlannerAction.java
===================================================================
diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -25,12 +25,10 @@
 package org.lamsfoundation.lams.tool.notebook.web.actions;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -74,32 +72,10 @@
 	NotebookPedagogicalPlannerForm plannerForm = (NotebookPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Notebook notebook = getNotebookService().getNotebookByContentId(toolContentID);
-	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
-	if (command == null) {
-	    plannerForm.fillForm(notebook);
-	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	    plannerForm.setContentFolderID(contentFolderId);
-	    return mapping.findForward(NotebookConstants.SUCCESS);
-	} else {
-	    try {
-		String onlineInstructions = notebook.getOnlineInstructions();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter writer = response.getWriter();
-
-		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
-		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
-		    String responseText = (StringUtils.isEmpty(notebook.getOnlineInstructions()) ? "NO" : "OK") + '&'
-			    + activityIndex;
-		    writer.print(responseText);
-
-		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
-		    writer.print(onlineInstructions);
-		}
-	    } catch (IOException e) {
-		PedagogicalPlannerAction.logger.error(e);
-	    }
-	    return null;
-	}
+	plannerForm.fillForm(notebook);
+	String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	plannerForm.setContentFolderID(contentFolderId);
+	return mapping.findForward(NotebookConstants.SUCCESS);
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_notebook/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -18,7 +18,7 @@
 	<%@ include file="/common/messages.jsp"%>
 	<h4 class="space-left" style="float:left"><fmt:message key="label.authoring.basic.instructions" /></h4>
 	<html:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" styleId="pedagogicalPlannerForm" method="post">
-		<html:hidden property="toolContentID" />
+		<html:hidden property="toolContentID" styleId="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/SubmitFilesPedagogicalPlannerAction.java
===================================================================
diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/SubmitFilesPedagogicalPlannerAction.java	(.../SubmitFilesPedagogicalPlannerAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/SubmitFilesPedagogicalPlannerAction.java	(.../SubmitFilesPedagogicalPlannerAction.java)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -25,12 +25,10 @@
 package org.lamsfoundation.lams.tool.sbmt.web;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -75,32 +73,10 @@
 	SubmitFilesPedagogicalPlannerForm plannerForm = (SubmitFilesPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	SubmitFilesContent submitFiles = getSubmitFilesService().getSubmitFilesContent(toolContentID);
-	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
-	if (command == null) {
-	    plannerForm.fillForm(submitFiles);
-	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	    plannerForm.setContentFolderID(contentFolderId);
-	    return mapping.findForward(SbmtConstants.SUCCESS);
-	} else {
-	    try {
-		String onlineInstructions = submitFiles.getOnlineInstruction();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter writer = response.getWriter();
-
-		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
-		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
-		    String responseText = (StringUtils.isEmpty(submitFiles.getOnlineInstruction()) ? "NO" : "OK") + '&'
-			    + activityIndex;
-		    writer.print(responseText);
-
-		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
-		    writer.print(onlineInstructions);
-		}
-	    } catch (IOException e) {
-		SubmitFilesPedagogicalPlannerAction.logger.error(e);
-	    }
-	    return null;
-	}
+	plannerForm.fillForm(submitFiles);
+	String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	plannerForm.setContentFolderID(contentFolderId);
+	return mapping.findForward(SbmtConstants.SUCCESS);
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -17,7 +17,7 @@
 <body style="width: 550px">
 	<h4 class="space-left"><fmt:message key="label.authoring.basic.instruction" /></h4>
 	<html:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" styleId="pedagogicalPlannerForm" method="post">
-		<html:hidden property="toolContentID" />
+		<html:hidden property="toolContentID" styleId="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/PedagogicalPlannerAction.java
===================================================================
diff -u -r8f7975d272f91acc26c785848d82d26d6b5dd357 -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision 8f7975d272f91acc26c785848d82d26d6b5dd357)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -25,7 +25,6 @@
 package org.lamsfoundation.lams.tool.scribe.web.actions;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -73,33 +72,10 @@
 	ScribePedagogicalPlannerForm plannerForm = (ScribePedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Scribe scribe = getScribeService().getScribeByContentId(toolContentID);
-	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
-	if (command == null) {
-	    plannerForm.fillForm(scribe);
-	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	    plannerForm.setContentFolderID(contentFolderId);
-	    return mapping.findForward("success");
-	} else {
-	    try {
-		String onlineInstructions = scribe.getOnlineInstructions();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter writer = response.getWriter();
-
-		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
-		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
-		    String responseText = (StringUtils.isEmpty(scribe.getOnlineInstructions()) ? "NO" : "OK") + '&'
-			    + activityIndex;
-		    writer.print(responseText);
-
-		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
-		    writer.print(onlineInstructions);
-		}
-	    } catch (IOException e) {
-		LamsDispatchAction.log.error(e);
-	    }
-	    return null;
-	}
-
+	plannerForm.fillForm(scribe);
+	String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	plannerForm.setContentFolderID(contentFolderId);
+	return mapping.findForward("success");
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_scribe/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_scribe/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
+++ lams_tool_scribe/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -53,7 +53,7 @@
 </lams:head>
 <body id="body">
 	<html:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" styleId="pedagogicalPlannerForm" method="post">
-		<html:hidden property="toolContentID" />
+		<html:hidden property="toolContentID" styleId="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java
===================================================================
diff -u -r714b22913925e248cb17afd96dc3f1d3754b8c1c -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 714b22913925e248cb17afd96dc3f1d3754b8c1c)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -24,7 +24,6 @@
 package org.lamsfoundation.lams.tool.taskList.web.action;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
@@ -1064,31 +1063,8 @@
 	TaskListPedagogicalPlannerForm plannerForm = (TaskListPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	TaskList taskList = getTaskListService().getTaskListByContentId(toolContentID);
-	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
-	if (command == null) {
-	    plannerForm.fillForm(taskList);
-	    return mapping.findForward("success");
-	} else {
-	    try {
-		String onlineInstructions = taskList.getOnlineInstructions();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter writer = response.getWriter();
-
-		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
-		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
-		    String responseText = (StringUtils.isEmpty(taskList.getOnlineInstructions()) ? "NO" : "OK") + '&'
-			    + activityIndex;
-		    writer.print(responseText);
-
-		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
-		    writer.print(onlineInstructions);
-		}
-	    } catch (IOException e) {
-		AuthoringAction.log.error(e);
-	    }
-	    return null;
-	}
-
+	plannerForm.fillForm(taskList);
+	return mapping.findForward("success");
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
+++ lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -57,7 +57,7 @@
 	<%@ include file="/common/messages.jsp"%>
 	<h4 class="space-left"><fmt:message key="planner.item.title"/></h4>
 	<html:form action="/authoring/saveOrUpdatePedagogicalPlannerForm.do" styleId="pedagogicalPlannerForm" method="post">
-		<html:hidden property="toolContentID" />
+		<html:hidden property="toolContentID" styleId="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerAction.java
===================================================================
diff -u -r8c2289edbab42fcc74a5172d3b565c631ca4ba58 -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerAction.java	(.../VotePedagogicalPlannerAction.java)	(revision 8c2289edbab42fcc74a5172d3b565c631ca4ba58)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerAction.java	(.../VotePedagogicalPlannerAction.java)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -25,7 +25,6 @@
 package org.lamsfoundation.lams.tool.vote.web;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -62,33 +61,10 @@
 	VotePedagogicalPlannerForm plannerForm = (VotePedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	VoteContent voteContent = getVoteService().retrieveVote(toolContentID);
-	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
-	if (command == null) {
-	    plannerForm.fillForm(voteContent);
-	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	    plannerForm.setContentFolderID(contentFolderId);
-	    return mapping.findForward(VoteAppConstants.SUCCESS);
-	} else {
-	    try {
-		String onlineInstructions = voteContent.getOnlineInstructions();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter writer = response.getWriter();
-
-		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
-		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
-		    String responseText = (StringUtils.isEmpty(voteContent.getOnlineInstructions()) ? "NO" : "OK")
-			    + '&' + activityIndex;
-		    writer.print(responseText);
-
-		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
-		    writer.print(onlineInstructions);
-		}
-	    } catch (IOException e) {
-		VotePedagogicalPlannerAction.logger.error(e);
-	    }
-	    return null;
-	}
-
+	plannerForm.fillForm(voteContent);
+	String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	plannerForm.setContentFolderID(contentFolderId);
+	return mapping.findForward(VoteAppConstants.SUCCESS);
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
+++ lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -71,7 +71,7 @@
 <body id="body">
 	<%@ include file="/common/messages.jsp"%>
 	<html:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" styleId="pedagogicalPlannerForm" method="post">
-		<html:hidden property="toolContentID" />
+		<html:hidden property="toolContentID" styleId="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/PedagogicalPlannerAction.java
===================================================================
diff -u -re66bdae723516ab13d4a6f81e5f598018f6dbe58 -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision e66bdae723516ab13d4a6f81e5f598018f6dbe58)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/PedagogicalPlannerAction.java	(.../PedagogicalPlannerAction.java)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -25,12 +25,10 @@
 package org.lamsfoundation.lams.tool.wiki.web.actions;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -73,32 +71,10 @@
 	WikiPedagogicalPlannerForm plannerForm = (WikiPedagogicalPlannerForm) form;
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	Wiki wiki = getWikiService().getWikiByContentId(toolContentID);
-	String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true);
-	if (command == null) {
-	    plannerForm.fillForm(wiki);
-	    String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	    plannerForm.setContentFolderID(contentFolderId);
-	    return mapping.findForward("success");
-	} else {
-	    try {
-		String onlineInstructions = wiki.getOnlineInstructions();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter writer = response.getWriter();
-
-		if (AttributeNames.COMMAND_CHECK_EDITING_ADVICE.equals(command)) {
-		    Integer activityIndex = WebUtil.readIntParam(request, AttributeNames.PARAM_ACTIVITY_INDEX);
-		    String responseText = (StringUtils.isEmpty(wiki.getOnlineInstructions()) ? "NO" : "OK") + '&'
-			    + activityIndex;
-		    writer.print(responseText);
-
-		} else if (AttributeNames.COMMAND_GET_EDITING_ADVICE.equals(command)) {
-		    writer.print(onlineInstructions);
-		}
-	    } catch (IOException e) {
-		PedagogicalPlannerAction.logger.error(e);
-	    }
-	    return null;
-	}
+	plannerForm.fillForm(wiki);
+	String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	plannerForm.setContentFolderID(contentFolderId);
+	return mapping.findForward("success");
     }
 
     public ActionForward saveOrUpdatePedagogicalPlannerForm(ActionMapping mapping, ActionForm form,
Index: lams_tool_wiki/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -rfd8292deb95c595b3d948e003dd9ff1807f7b569
--- lams_tool_wiki/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_wiki/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision fd8292deb95c595b3d948e003dd9ff1807f7b569)
@@ -34,7 +34,7 @@
 	</logic:messagesPresent>	
 	
 	<html:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" styleId="pedagogicalPlannerForm" method="post">
-		<html:hidden property="toolContentID" />
+		<html:hidden property="toolContentID" styleId="toolContentID" />
 		<html:hidden property="valid" styleId="valid" />
 		<html:hidden property="callID" styleId="callID" />
 		<html:hidden property="activityOrderNumber" styleId="activityOrderNumber" />