diff --git a/productMods/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl b/productMods/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
index 1294d902..e7fce0eb 100644
--- a/productMods/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
+++ b/productMods/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
@@ -16,7 +16,7 @@
         <#assign disabledVal="disabled">
 <#else>
         <#assign titleVerb="Create">        
-        <#assign submitButtonText="Create Position">
+        <#assign submitButtonText="Position">
         <#assign disabledVal=""/>
 </#if>
 
@@ -39,13 +39,13 @@
         <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
         <p>
         <#if lvf.submissionErrorExists(editSubmission, "positionTitle")>
-            Please enter a value in the Position Title field.
+            Please enter a value in the Position Title field.<br />
         </#if> 
         <#if lvf.submissionErrorExists(editSubmission, "positionType")>
-            Please select a value in the Position Type field.
+            Please select a value in the Position Type field.<br />
         </#if>
         <#if lvf.submissionErrorExists(editSubmission, "personLabel")>
- 	        Please enter a value in the Person field.
+ 	        Please select an existing value or enter a new value in the Person field.
         </#if> 
         
         <#list submissionErrors?keys as errorFieldName>
@@ -55,14 +55,14 @@
         	    <#else>
         	        ${submissionErrors[errorFieldName]}
         	    </#if>
-        	    <br />
+        	    
         	<#elseif errorFieldName == "endField">
     	        <#if submissionErrors[errorFieldName]?contains("after")>
     	            The End Year must be later than the Start Year.
     	        <#else>
     	            ${submissionErrors[errorFieldName]}
     	        </#if>
-	        </#if>
+	        </#if><br />
         </#list>
         </p>
     </section>
@@ -92,9 +92,9 @@
                 </#list>
 	        </#if>
 	    </select>
-       
+       <select id="typeSelector" style="display:none"><option value="http://xmlns.com/foaf/0.1/Person" selected="selected">Person</option></select>
   	    <p>
-	        <label for="relatedIndLabel">Person</label>
+	        <label for="relatedIndLabel">Person ${requiredHint}</label>
 	        <#if editMode == "edit">
 	            <input class="acSelector" size="50"  type="text" id="relatedIndLabel" name="personLabel" value="${personLabelValue}" disabled="disabled" >
                 <input class="acLabelReceiver" type="hidden" id="existingPersonLabel" name="personLabel" value="${personLabelValue}" />
diff --git a/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl b/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl
index bd4c6d57..2a92ba4e 100644
--- a/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl
+++ b/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl
@@ -26,7 +26,7 @@
         <#assign disabledVal="disabled">
 <#else>
         <#assign formAction="Create">        
-        <#assign submitButtonText="Create Position">
+        <#assign submitButtonText="Position">
         <#assign disabledVal="">
 </#if>
 
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
index f18eeace..75e00d02 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
@@ -8,6 +8,7 @@ import javax.servlet.http.HttpSession;
 import com.hp.hpl.jena.vocabulary.XSD;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary.Precision;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
@@ -30,8 +31,9 @@ public class OrganizationHasPositionHistoryGenerator extends VivoBaseGenerator
 			+ "  ?position rdfs:label ?existingPositionTitle . }";
 
 	private static final String QUERY_EXISTING_POSITION_TYPE = ""
+            + "PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n"
 			+ "SELECT ?existingPositionType WHERE { \n"
-			+ "  ?position a ?existingPositionType . }";
+			+ "  ?position vitro:mostSpecificType ?existingPositionType . }";
 
 	private static final String QUERY_EXISTING_PERSON = ""
 			+ "PREFIX core: <http://vivoweb.org/ontology/core#> \n"