diff --git a/productMods/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl b/productMods/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
index 87f04025..5303fba9 100644
--- a/productMods/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
+++ b/productMods/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
@@ -7,6 +7,15 @@
 	<#assign rangeOptionsExist = true/>
 </#if>
 <#assign objectTypes = editConfiguration.pageData.objectTypes />
+<#assign objectTypesSize = objectTypes?length />
+<#assign objectTypesExist = false />
+<#assign multipleTypes = false />
+<#if (objectTypesSize > 1)>
+	<#assign objectTypesExist = true />
+</#if>
+<#if objectTypes?contains(",")>
+	<#assign multipleTypes = true/>
+</#if>
 <#assign sparqlForAcFilter = editConfiguration.pageData.sparqlForAcFilter />
 <#assign editMode = editConfiguration.pageData.editMode />
 <#assign propertyNameForDisplay = "" />
@@ -88,12 +97,18 @@
 
 
 <#assign sparqlQueryUrl = "${urls.base}/ajax/sparqlQuery" >
-
-    <script type="text/javascript">
+<#--Passing in object types only if there are any types returned, otherwise
+the parameter should not be passed at all to the solr search.
+Also multiple types parameter set to true only if more than one type returned-->
+    <script type="text/javascript">	
     var customFormData  = {
         acUrl: '${urls.base}/autocomplete?tokenize=true',
+        <#if objectTypesExist = true>
         acType: '${objectTypes}',
+        </#if>
+        <#if multipleTypes = true>
         acMultipleTypes: 'true',
+        </#if>
         submitButtonTextType: 'simple',
         editMode: '${editMode}',
         typeName:'${propertyNameForDisplay}',
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteObjectPropertyFormGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteObjectPropertyFormGenerator.java
index 11ce332d..3f83500e 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteObjectPropertyFormGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteObjectPropertyFormGenerator.java
@@ -59,9 +59,18 @@ public class AutocompleteObjectPropertyFormGenerator extends DefaultObjectProper
         for(VClass v: vclasses) {
         	types.add(v.getURI());
         }
+        //if types array contains only owl:Thing, the search will not return any results
+        //In this case, return an empty array
+        if(isOWLThing(types)) {
+        	return new ArrayList<String>();
+        }
         return types;
 	}
 	
+	private boolean isOWLThing(List<String> types) {
+		return(types.size() == 1 && types.get(0).equals(VitroVocabulary.OWL_THING));
+	}
+
 	public EditMode getEditMode(VitroRequest vreq) {
 		//In this case, the original jsp didn't rely on FrontEndEditingUtils
 		//but instead relied on whether or not the object Uri existed