Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java
===================================================================
diff -u -rcd0d0b28a7c27711a74ce2b41821f3ccf5c80df9 -rcdf0794ac8a26a5fe88b0db3a941994a41e8de97
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java	(.../ChatOutputFactory.java)	(revision cd0d0b28a7c27711a74ce2b41821f3ccf5c80df9)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java	(.../ChatOutputFactory.java)	(revision cdf0794ac8a26a5fe88b0db3a941994a41e8de97)
@@ -125,7 +125,7 @@
     }
 
     public ToolOutput getToolOutput(String name, IChatService chatService, Long toolSessionId, Long learnerId) {
-	if (isTextSearchConditionName(ChatConstants.TEXT_SEARCH_DEFINITION_NAME)) {
+	if (isTextSearchConditionName(name)) {
 	    // entry is loaded from DB
 	    Chat chat = chatService.getSessionBySessionId(toolSessionId).getChat();
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java
===================================================================
diff -u -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224 -rcdf0794ac8a26a5fe88b0db3a941994a41e8de97
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java	(.../ForumOutputFactory.java)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java	(.../ForumOutputFactory.java)	(revision cdf0794ac8a26a5fe88b0db3a941994a41e8de97)
@@ -149,7 +149,7 @@
 
     public ToolOutput getToolOutput(String name, IForumService forumService, Long toolSessionId, Long learnerId) {
 	ToolOutput toolOutput = null;
-	if (isTextSearchConditionName(ForumConstants.TEXT_SEARCH_DEFINITION_NAME)) {
+	if (isTextSearchConditionName(name)) {
 	    // a map of "topic creation date" -> "all learner's answers to that topic"
 	    Map<Date, Set<String>> answers = new HashMap<Date, Set<String>>();
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java
===================================================================
diff -u -r97aceb8f087c5d2613e004dc2be171ac8acae574 -rcdf0794ac8a26a5fe88b0db3a941994a41e8de97
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java	(.../QaOutputFactory.java)	(revision 97aceb8f087c5d2613e004dc2be171ac8acae574)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java	(.../QaOutputFactory.java)	(revision cdf0794ac8a26a5fe88b0db3a941994a41e8de97)
@@ -133,7 +133,7 @@
     }
 
     public ToolOutput getToolOutput(String name, IQaService qaService, Long toolSessionId, Long learnerId) {
-	if (isTextSearchConditionName(QaAppConstants.TEXT_SEARCH_DEFINITION_NAME)) {
+	if (isTextSearchConditionName(name)) {
 	    // user answers are loaded from the DB and array of strings is created
 
 	    QaSession session = qaService.retrieveQaSession(toolSessionId);
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java
===================================================================
diff -u -r625dccc46218d5cf4648d73a139af38f21c222ce -rcdf0794ac8a26a5fe88b0db3a941994a41e8de97
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java	(.../SurveyOutputFactory.java)	(revision 625dccc46218d5cf4648d73a139af38f21c222ce)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java	(.../SurveyOutputFactory.java)	(revision cdf0794ac8a26a5fe88b0db3a941994a41e8de97)
@@ -133,7 +133,7 @@
     }
 
     public ToolOutput getToolOutput(String name, ISurveyService surveyService, Long toolSessionId, Long learnerId) {
-	if (isTextSearchConditionName(SurveyConstants.TEXT_SEARCH_DEFINITION_NAME)) {
+	if (isTextSearchConditionName(name)) {
 	    // user answers are loaded from the DB and array of strings is created
 
 	    Survey survey = surveyService.getSurveyBySessionId(toolSessionId);