Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java
===================================================================
diff -u -r7e4c0870acdbc0f8835aae86d648796392d0e62c -rca9bfb3f1b523e53197504a9e9d741185d27220c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java	(.../VoteUtils.java)	(revision 7e4c0870acdbc0f8835aae86d648796392d0e62c)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java	(.../VoteUtils.java)	(revision ca9bfb3f1b523e53197504a9e9d741185d27220c)
@@ -257,10 +257,9 @@
         }
         
         logger.debug("trimmed noHtmlNoNewLineStr: " + noHtmlNoNewLineStr.trim());
-        if (noHtmlNoNewLineStr.trim().equals(""))
+        if (noHtmlNoNewLineStr.trim().length()==0)
         {
-            logger.debug("nomination text is just composed of html markup..." +
-            		"returning html formatted text");
+            logger.debug("nomination text is just composed of html markup, returning html formatted text");
             if (htmlText.length() > 50)
                 return htmlText.substring(0,51);
             else
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java
===================================================================
diff -u -rf6956d3b109f928cb5529b00da8228d5e25f7a16 -rca9bfb3f1b523e53197504a9e9d741185d27220c
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java	(.../VoteOutputFactory.java)	(revision f6956d3b109f928cb5529b00da8228d5e25f7a16)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java	(.../VoteOutputFactory.java)	(revision ca9bfb3f1b523e53197504a9e9d741185d27220c)
@@ -24,10 +24,8 @@
 package org.lamsfoundation.lams.tool.vote.service;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -37,6 +35,7 @@
 import org.lamsfoundation.lams.tool.OutputType;
 import org.lamsfoundation.lams.tool.ToolOutput;
 import org.lamsfoundation.lams.tool.ToolOutputDefinition;
+import org.lamsfoundation.lams.tool.vote.VoteUtils;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteContent;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteQueUsr;
@@ -80,14 +79,15 @@
 					if ( displayOrder > max ) max = displayOrder;
 					String displayOrderAsString = new Long(displayOrder).toString();
 					defaultConditions.add(new BranchCondition(null, null, new Integer(1), OUTPUT_NAME_NOMINATION_SELECTION, 
-							nomination.getQuestion(), 
+							VoteUtils.stripHTML(nomination.getQuestion()), 
 							OutputType.OUTPUT_LONG.toString(),
 							displayOrderAsString, 
 							displayOrderAsString, 
 							null));
 				}
 				definition.setStartValue(new Long(min));
 				definition.setEndValue(new Long(max));
+				definition.setShowConditionNameOnly(Boolean.TRUE);
 
 				definitionMap.put(OUTPUT_NAME_NOMINATION_SELECTION, definition);