diff --git a/productMods/edit/forms/personHasEducationalTraining.jsp b/productMods/edit/forms/personHasEducationalTraining.jsp
index 86c3aa96..37b5075c 100644
--- a/productMods/edit/forms/personHasEducationalTraining.jsp
+++ b/productMods/edit/forms/personHasEducationalTraining.jsp
@@ -192,10 +192,14 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision)
     }
 </v:jsonset>
 
+<%-- Limit type to subclasses of foaf:Organization. Otherwise, sometimes owl:Thing or another
+type is returned and we don't get a match to the select element options. --%>
 <v:jsonset var="orgTypeQuery" >      
+    PREFIX rdfs: <${rdfs}>   
     SELECT ?existingOrgType WHERE {
         ?edTraining <${trainingAtOrg}> ?existingOrg .
         ?existingOrg a ?existingOrgType .
+        ?existingOrgType rdfs:subClassOf <${orgClass}> .
     }
 </v:jsonset>
 
diff --git a/productMods/edit/forms/personHasPositionHistory.jsp b/productMods/edit/forms/personHasPositionHistory.jsp
index 79cb0e60..d49c19bb 100644
--- a/productMods/edit/forms/personHasPositionHistory.jsp
+++ b/productMods/edit/forms/personHasPositionHistory.jsp
@@ -152,11 +152,15 @@
     }
 </v:jsonset>
 
-<v:jsonset var="orgTypeQuery" >      
+<%-- Limit type to subclasses of foaf:Organization. Otherwise, sometimes owl:Thing or another
+type is returned and we don't get a match to the select element options. --%>
+<v:jsonset var="orgTypeQuery" > 
+    PREFIX rdfs: <${rdfs}>   
     SELECT ?existingOrgType WHERE {
         ?position <${positionInOrgPred}> ?existingOrg .
         ?existingOrg a ?existingOrgType .
-    }
+        # ?existingOrgType rdfs:subClassOf <${orgClass}> .
+    } 
 </v:jsonset>
 
 <v:jsonset var="positionTitleQuery" >