Index: lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml
===================================================================
diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -r25187e73d76504fc9d29a21440750230e35f00fb
--- lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml	(.../VoteContent.hbm.xml)	(revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c)
+++ lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml	(.../VoteContent.hbm.xml)	(revision 25187e73d76504fc9d29a21440750230e35f00fb)
@@ -167,19 +167,19 @@
         length="1"        
    />
    
+  
    <property
-        name="dataFlowObjectUsed"
-        type="boolean"
+        name="maxExternalInputs"
+        type="java.lang.Short"
         access="property"
-        column="data_flow_object_used"
-        length="1"        
+        column="max_external_inputs"
    />
    
    <property
-        name="maxInputs"
+        name="externalInputsAdded"
         type="java.lang.Short"
         access="property"
-        column="max_inputs"
+        column="external_inputs_added"
    />
 
     	 <set
Index: lams_tool_vote/db/sql/create_lams_tool_vote.sql
===================================================================
diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -r25187e73d76504fc9d29a21440750230e35f00fb
--- lams_tool_vote/db/sql/create_lams_tool_vote.sql	(.../create_lams_tool_vote.sql)	(revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c)
+++ lams_tool_vote/db/sql/create_lams_tool_vote.sql	(.../create_lams_tool_vote.sql)	(revision 25187e73d76504fc9d29a21440750230e35f00fb)
@@ -19,8 +19,8 @@
      , reflectionSubject TEXT
      , show_results TINYINT(1) NOT NULL DEFAULT 1
 	 , assigned_data_flow_object TINYINT(1)
-	 , data_flow_object_used TINYINT(1) DEFAULT 0
-	 , max_inputs SMALLINT
+     , external_inputs_added SMALLINT DEFAULT 0
+	 , max_external_inputs SMALLINT
      , PRIMARY KEY (uid)
 )TYPE=InnoDB;
 
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20090726_updateFrom23.sql
===================================================================
diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -r25187e73d76504fc9d29a21440750230e35f00fb
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20090726_updateFrom23.sql	(.../patch20090726_updateFrom23.sql)	(revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20090726_updateFrom23.sql	(.../patch20090726_updateFrom23.sql)	(revision 25187e73d76504fc9d29a21440750230e35f00fb)
@@ -5,8 +5,8 @@
 
 ----------------------Put all sql statements below here-------------------------
 
-ALTER TABLE tl_lavote11_content ADD COLUMN data_flow_object_used TINYINT(1) DEFAULT 0,
-								ADD COLUMN max_inputs SMALLINT,
+ALTER TABLE tl_lavote11_content ADD COLUMN external_inputs_added SMALLINT DEFAULT 0,	
+								ADD COLUMN max_external_inputs SMALLINT,
 								ADD COLUMN assigned_data_flow_object TINYINT(1);
 
 ----------------------Put all sql statements above here-------------------------
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java
===================================================================
diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -r25187e73d76504fc9d29a21440750230e35f00fb
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java	(.../VoteContent.java)	(revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java	(.../VoteContent.java)	(revision 25187e73d76504fc9d29a21440750230e35f00fb)
@@ -112,16 +112,18 @@
     private Boolean assignedDataFlowObject;
 
     /** persistent field */
-    private Short maxInputs;
+    private Short maxExternalInputs;
 
-    private Boolean dataFlowObjectUsed;
+    /** persistent field */
+    private Short externalInputsAdded;
 
     /** full constructor */
     public VoteContent(Long voteContentId, String content, String title, String instructions, boolean defineLater,
 	    boolean runOffline, Date creationDate, Date updateDate, boolean allowText, boolean reflect,
 	    String reflectionSubject, String maxNominationCount, long createdBy, boolean lockOnFinish,
 	    boolean contentInUse, String offlineInstructions, String onlineInstructions, boolean showResults,
-	    Short maxInputs, Set voteQueContents, Set voteSessions, Set voteAttachments) {
+	    Short maxExternalInputs, Short externalInputsAdded, Set voteQueContents, Set voteSessions,
+	    Set voteAttachments) {
 	this.voteContentId = voteContentId;
 	this.content = content;
 	this.title = title;
@@ -143,7 +145,8 @@
 	this.voteQueContents = voteQueContents;
 	this.voteSessions = voteSessions;
 	this.voteAttachments = voteAttachments;
-	this.maxInputs = maxInputs;
+	this.maxExternalInputs = maxExternalInputs;
+	this.externalInputsAdded = externalInputsAdded;
     }
 
     /** default constructor */
@@ -175,8 +178,8 @@
 		.getInstructions(), vote.isDefineLater(), vote.isRunOffline(), vote.getCreationDate(), vote
 		.getUpdateDate(), vote.isAllowText(), vote.isReflect(), vote.getReflectionSubject(), vote
 		.getMaxNominationCount(), vote.getCreatedBy(), vote.isLockOnFinish(), vote.isContentInUse(), vote
-		.getOfflineInstructions(), vote.getOnlineInstructions(), vote.isShowResults(), vote.getMaxInputs(),
-		new TreeSet(), new TreeSet(), new TreeSet());
+		.getOfflineInstructions(), vote.getOnlineInstructions(), vote.isShowResults(), vote
+		.getMaxExternalInputs(), vote.getExternalInputsAdded(), new TreeSet(), new TreeSet(), new TreeSet());
 	newContent.setVoteQueContents(vote.deepCopyMcQueContent(newContent));
 	newContent.setVoteAttachments(vote.deepCopyMcAttachments(toolContentHandler, newContent));
 	newContent.setAssignedDataFlowObject(vote.getAssignedDataFlowObject());
@@ -501,19 +504,19 @@
 	this.assignedDataFlowObject = assignedDataFlowObject;
     }
 
-    public Short getMaxInputs() {
-	return maxInputs;
+    public Short getMaxExternalInputs() {
+	return maxExternalInputs;
     }
 
-    public void setMaxInputs(Short maxInputs) {
-	this.maxInputs = maxInputs;
+    public void setMaxExternalInputs(Short maxInputs) {
+	maxExternalInputs = maxInputs;
     }
 
-    public Boolean getDataFlowObjectUsed() {
-	return dataFlowObjectUsed;
+    public Short getExternalInputsAdded() {
+	return externalInputsAdded;
     }
 
-    public void setDataFlowObjectUsed(Boolean dataFlowObjectUsed) {
-	this.dataFlowObjectUsed = dataFlowObjectUsed;
+    public void setExternalInputsAdded(Short externalInputsAdded) {
+	this.externalInputsAdded = externalInputsAdded;
     }
 }
\ No newline at end of file
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java
===================================================================
diff -u -rd2477516d8148b43bc007b7cff9f0ef01813fca1 -r25187e73d76504fc9d29a21440750230e35f00fb
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision d2477516d8148b43bc007b7cff9f0ef01813fca1)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 25187e73d76504fc9d29a21440750230e35f00fb)
@@ -765,7 +765,7 @@
 	    voteContent.setMaxNominationCount(maxNomcount);
 	    voteContent.setOnlineInstructions(richTextOnlineInstructions);
 	    voteContent.setOfflineInstructions(richTextOfflineInstructions);
-	    voteContent.setMaxInputs(maxInputsShort);
+	    voteContent.setMaxExternalInputs(maxInputsShort);
 	}
 
 	voteContent.setAssignedDataFlowObject(assignedDataFlowObject != null);
@@ -1343,7 +1343,7 @@
 
 	    voteContent.setReflectionSubject(reflectionSubject);
 
-	    voteContent.setMaxInputs(maxInputsShort);
+	    voteContent.setMaxExternalInputs(maxInputsShort);
 	}
 
 	if (newContent) {
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java
===================================================================
diff -u -r37b49e5e78d2b57936d98e68f6057539472b7725 -r25187e73d76504fc9d29a21440750230e35f00fb
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java	(.../LearningUtil.java)	(revision 37b49e5e78d2b57936d98e68f6057539472b7725)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java	(.../LearningUtil.java)	(revision 25187e73d76504fc9d29a21440750230e35f00fb)
@@ -73,14 +73,15 @@
 	    VoteContent voteContent, Collection<String> checkedOptions) {
 	Map mapQuestionsContent = new TreeMap(new VoteComparator());
 	Set<VoteQueContent> nominations = voteContent.getVoteQueContents();
+	// should we add nominations from data flow from other activities?
 	if (Boolean.TRUE.equals(voteContent.getAssignedDataFlowObject())
-		&& !Boolean.TRUE.equals(voteContent.getDataFlowObjectUsed())) {
+		&& (voteContent.getMaxExternalInputs() == null || voteContent.getExternalInputsAdded() == null || voteContent
+			.getExternalInputsAdded() < voteContent.getMaxExternalInputs())) {
 	    // If we are using tool input, we need to get it now and
 	    // create questions. Once they are created, they will be not altered, no matter if another learner gets to
 	    // this point and the tool input changed
 	    createQuestionsFromToolInput(voteContent, voteService);
 	    nominations = voteContent.getVoteQueContents();
-	    voteContent.setDataFlowObjectUsed(true);
 	}
 
 	Iterator<VoteQueContent> contentIterator = nominations.iterator();
@@ -328,16 +329,17 @@
 		.intValue());
 
 	Object value = toolInput.getValue().getComplex();
+	short inputsAdded = voteContent.getExternalInputsAdded() == null ? 0 : voteContent.getExternalInputsAdded();
+	Short maxInputs = voteContent.getMaxExternalInputs();
+	Set<VoteQueContent> existingNominations = voteContent.getVoteQueContents();
 	// The input is an array (users) of arrays of strings (their answers)
 	if (value instanceof String[][]) {
 	    if (value != null) {
 		String[][] usersAndAnswers = (String[][]) value;
 		int nominationIndex = voteContent.getVoteQueContents().size() + 1;
-		Short maxInputs = voteContent.getMaxInputs();
-		short inputCount = 0;
 		for (String[] userAnswers : usersAndAnswers) {
 		    if (userAnswers != null) {
-			if (maxInputs != null && maxInputs > 0 && inputCount >= maxInputs) {
+			if (maxInputs != null && inputsAdded >= maxInputs) {
 			    // if we reached the maximum number of inputs, i.e. number of students that will be taken
 			    // into account
 			    break;
@@ -349,14 +351,16 @@
 				nomination.setDisplayOrder(nominationIndex);
 				nomination.setMcContent(voteContent);
 				nomination.setQuestion(questionText);
-				voteService.saveOrUpdateVoteQueContent(nomination);
-				voteContent.getVoteQueContents().add(nomination);
-				nominationIndex++;
-				anyAnswersAdded = true;
+				if (!nominationExists(nomination, existingNominations)) {
+				    voteService.saveOrUpdateVoteQueContent(nomination);
+				    voteContent.getVoteQueContents().add(nomination);
+				    nominationIndex++;
+				    anyAnswersAdded = true;
+				}
 			    }
 			}
 			if (anyAnswersAdded) {
-			    inputCount++;
+			    inputsAdded++;
 			}
 		    }
 		}
@@ -365,10 +369,8 @@
 	    // the input is a list of strings (questions, for example)
 	    int nominationIndex = voteContent.getVoteQueContents().size() + 1;
 	    String[] userAnswers = (String[]) value;
-	    Short maxInputs = voteContent.getMaxInputs();
-	    short inputCount = 0;
 	    for (String questionText : userAnswers) {
-		if (maxInputs != null && maxInputs > 0 && inputCount >= maxInputs) {
+		if (maxInputs != null && inputsAdded >= maxInputs) {
 		    // if we reached the maximum number of inputs, i.e. number of students that will be taken
 		    // into account
 		    break;
@@ -379,10 +381,12 @@
 		    nomination.setDisplayOrder(nominationIndex);
 		    nomination.setMcContent(voteContent);
 		    nomination.setQuestion(questionText);
-		    voteService.saveOrUpdateVoteQueContent(nomination);
-		    voteContent.getVoteQueContents().add(nomination);
-		    nominationIndex++;
-		    inputCount++;
+		    if (!nominationExists(nomination, existingNominations)) {
+			voteService.saveOrUpdateVoteQueContent(nomination);
+			voteContent.getVoteQueContents().add(nomination);
+			nominationIndex++;
+			inputsAdded++;
+		    }
 		}
 	    }
 	} else if (value instanceof String && !StringUtils.isBlank((String) value)) {
@@ -391,18 +395,18 @@
 	    nomination.setDisplayOrder(nominationIndex);
 	    nomination.setMcContent(voteContent);
 	    nomination.setQuestion((String) value);
-	    voteService.saveOrUpdateVoteQueContent(nomination);
-	    voteContent.getVoteQueContents().add(nomination);
+	    if (!nominationExists(nomination, existingNominations)) {
+		voteService.saveOrUpdateVoteQueContent(nomination);
+		voteContent.getVoteQueContents().add(nomination);
+	    }
 	}
 	if (value instanceof SimpleURL[][]) {
 	    if (value != null) {
 		SimpleURL[][] usersAndUrls = (SimpleURL[][]) value;
 		int nominationIndex = voteContent.getVoteQueContents().size() + 1;
-		Short maxInputs = voteContent.getMaxInputs();
-		short inputCount = 0;
 		for (SimpleURL[] userUrls : usersAndUrls) {
 		    if (userUrls != null) {
-			if (maxInputs != null && maxInputs > 0 && inputCount >= maxInputs) {
+			if (maxInputs != null && inputsAdded >= maxInputs) {
 			    // if we reached the maximum number of inputs, i.e. number of students that will be taken
 			    // into account
 			    break;
@@ -416,15 +420,16 @@
 
 				String link = "<a href=\"" + url.getUrl() + "\">" + url.getNameToDisplay() + "</a>";
 				nomination.setQuestion(link);
-
-				voteService.saveOrUpdateVoteQueContent(nomination);
-				voteContent.getVoteQueContents().add(nomination);
-				nominationIndex++;
-				anyAnswersAdded = true;
+				if (!nominationExists(nomination, existingNominations)) {
+				    voteService.saveOrUpdateVoteQueContent(nomination);
+				    voteContent.getVoteQueContents().add(nomination);
+				    nominationIndex++;
+				    anyAnswersAdded = true;
+				}
 			    }
 			}
 			if (anyAnswersAdded) {
-			    inputCount++;
+			    inputsAdded++;
 			}
 		    }
 		}
@@ -435,10 +440,8 @@
 	    // the input is a list of strings (questions, for example)
 	    int nominationIndex = voteContent.getVoteQueContents().size() + 1;
 	    SimpleURL[] userUrls = (SimpleURL[]) value;
-	    Short maxInputs = voteContent.getMaxInputs();
-	    short inputCount = 0;
 	    for (SimpleURL url : userUrls) {
-		if (maxInputs != null && maxInputs > 0 && inputCount >= maxInputs) {
+		if (maxInputs != null && inputsAdded >= maxInputs) {
 		    // if we reached the maximum number of inputs, i.e. number of students that will be taken
 		    // into account
 		    break;
@@ -450,11 +453,12 @@
 
 		    String link = "<a href=\"" + url.getUrl() + "\">" + url.getNameToDisplay() + "</a>";
 		    nomination.setQuestion(link);
-
-		    voteService.saveOrUpdateVoteQueContent(nomination);
-		    voteContent.getVoteQueContents().add(nomination);
-		    nominationIndex++;
-		    inputCount++;
+		    if (!nominationExists(nomination, existingNominations)) {
+			voteService.saveOrUpdateVoteQueContent(nomination);
+			voteContent.getVoteQueContents().add(nomination);
+			nominationIndex++;
+			inputsAdded++;
+		    }
 		}
 	    }
 	} else if (value instanceof SimpleURL) {
@@ -465,11 +469,26 @@
 	    SimpleURL url = (SimpleURL) value;
 	    String link = "<a href=\"" + url.getUrl() + "\">" + url.getNameToDisplay() + "</a>";
 	    nomination.setQuestion(link);
-
-	    nomination.setMcContent(voteContent);
-	    voteService.saveOrUpdateVoteQueContent(nomination);
-	    voteContent.getVoteQueContents().add(nomination);
+	    if (!nominationExists(nomination, existingNominations)) {
+		nomination.setMcContent(voteContent);
+		voteService.saveOrUpdateVoteQueContent(nomination);
+		voteContent.getVoteQueContents().add(nomination);
+	    }
 	}
+
+	voteContent.setExternalInputsAdded(inputsAdded);
+	voteService.saveVoteContent(voteContent);
     }
 
+    private static boolean nominationExists(VoteQueContent nomination, Set<VoteQueContent> existingNominations) {
+	if (existingNominations != null && nomination != null) {
+	    for (VoteQueContent existingNomination : existingNominations) {
+		if (existingNomination.getQuestion() != null
+			&& existingNomination.getQuestion().equals(nomination.getQuestion())) {
+		    return true;
+		}
+	    }
+	}
+	return false;
+    }
 }
\ No newline at end of file
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java
===================================================================
diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -r25187e73d76504fc9d29a21440750230e35f00fb
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java	(.../VoteStarterAction.java)	(revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java	(.../VoteStarterAction.java)	(revision 25187e73d76504fc9d29a21440750230e35f00fb)
@@ -548,7 +548,7 @@
 	voteAuthoringForm.setOfflineInstructions(voteContent.getOfflineInstructions());
 	voteAuthoringForm.setOnlineInstructions(voteContent.getOnlineInstructions());
 
-	Short maxInputs = voteContent.getMaxInputs();
+	Short maxInputs = voteContent.getMaxExternalInputs();
 	if (maxInputs == null) {
 	    maxInputs = 0;
 	}