Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -rfd5e4f5bc87d1f88622dff13d944a3bec845659a
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java	(.../ChatPedagogicalPlannerForm.java)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java	(.../ChatPedagogicalPlannerForm.java)	(revision fd5e4f5bc87d1f88622dff13d944a3bec845659a)
@@ -24,6 +24,7 @@
 package org.lamsfoundation.lams.tool.chat.web.forms;
 
 import org.lamsfoundation.lams.tool.chat.model.Chat;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.planner.PedagogicalPlannerForm;
 
 /**
@@ -42,7 +43,7 @@
 
     public void fillForm(Chat chat) {
 	if (chat != null) {
-	    setInstructions(chat.getInstructions());
+	    setInstructions(WebUtil.removeHTMLtags(chat.getInstructions()));
 	    setToolContentID(chat.getToolContentId());
 	}
     }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -rfd5e4f5bc87d1f88622dff13d944a3bec845659a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java	(.../QaPedagogicalPlannerAction.java)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java	(.../QaPedagogicalPlannerAction.java)	(revision fd5e4f5bc87d1f88622dff13d944a3bec845659a)
@@ -84,13 +84,13 @@
 		} else {
 		    if (questionIndex < qaContent.getQaQueContents().size()) {
 			QaQueContent qaQueContent = getQaService().getQuestionContentByDisplayOrder(
-				(long) questionIndex, qaContent.getUid());
+				(long) questionIndex + 1, qaContent.getUid());
 			qaQueContent.setQuestion(question);
 			getQaService().saveOrUpdateQaQueContent(qaQueContent);
 
 		    } else {
 			QaQueContent qaQueContent = new QaQueContent();
-			qaQueContent.setDisplayOrder(questionIndex);
+			qaQueContent.setDisplayOrder(questionIndex + 1);
 			qaQueContent.setIsOptional(false);
 			qaQueContent.setQaContent(qaContent);
 			qaQueContent.setQaContentId(qaContent.getQaContentId());
@@ -103,8 +103,8 @@
 	    if (questionIndex < qaContent.getQaQueContents().size()) {
 		getQaService().removeQuestionsFromCache(qaContent);
 		for (; questionIndex < qaContent.getQaQueContents().size(); questionIndex++) {
-		    QaQueContent qaQueContent = getQaService().getQuestionContentByDisplayOrder((long) questionIndex,
-			    qaContent.getUid());
+		    QaQueContent qaQueContent = getQaService().getQuestionContentByDisplayOrder(
+			    (long) questionIndex + 1, qaContent.getUid());
 		    getQaService().removeQaQueContent(qaQueContent);
 		}
 	    }