diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java
index e2c1df90b..f2c686657 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java
@@ -9,18 +9,16 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
 import com.hp.hpl.jena.query.QuerySolution;
 import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.query.ResultSetFactory;
 import com.hp.hpl.jena.rdf.model.Literal;
 import com.hp.hpl.jena.rdf.model.RDFNode;
 import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.shared.Lock;
-import com.hp.hpl.jena.sparql.resultset.ResultSetMem;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 
 /** 
  * Utilities for executing queries and working with query results. 
@@ -115,31 +113,21 @@ public class QueryUtils {
     }
     
     public static ResultSet getQueryResults(String queryStr, VitroRequest vreq) {
-        return getQueryResults(queryStr, vreq.getDataset());
+        return getQueryResults(queryStr, vreq.getRDFService());
     }
 
     public static ResultSet getLanguageNeutralQueryResults(String queryStr, VitroRequest vreq) {
-    	return getQueryResults(queryStr, vreq.getUnfilteredDataset());
+    	return getQueryResults(queryStr, vreq.getUnfilteredRDFService());
     }
 
     /** Already have the dataset, so process the query and return the results. */
-	private static ResultSet getQueryResults(String queryStr, Dataset dataset) {
-		dataset.getLock().enterCriticalSection(Lock.READ);
-        QueryExecution qexec = null;
-        ResultSet results = null;
-        try {
-            qexec = QueryExecutionFactory.create(queryStr, dataset);                    
-            results = new ResultSetMem(qexec.execSelect());
-        } catch (Exception e) {
-            log.error(e, e);
-        } finally {
-            dataset.getLock().leaveCriticalSection();
-            if (qexec != null) {
-                qexec.close();
-            }
-        } 
-        
-        return results;
+	private static ResultSet getQueryResults(String queryStr, RDFService rdfService) {
+	    try {
+            return ResultSetFactory.fromJSON(
+                    rdfService.sparqlSelectQuery(queryStr, RDFService.ResultFormat.JSON));
+	    } catch (RDFServiceException e) {
+	        throw new RuntimeException(e);
+	    }
 	}
 
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
index 3ecb8c289..a53e3f65e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
@@ -105,10 +105,7 @@ public class EditConfigurationUtils {
    
     
     public static ObjectProperty getObjectProperty(VitroRequest vreq) {
-    	//gets the predicate uri from the request
-    	String predicateUri = getPredicateUri(vreq);
-    	String rangeUri = getRangeUri(vreq);
-    	return getObjectPropertyForPredicate(vreq, predicateUri, rangeUri);
+    	return getObjectPropertyForPredicate(vreq, getPredicateUri(vreq));
     }
     
     public static DataProperty getDataProperty(VitroRequest vreq) {
@@ -116,17 +113,18 @@ public class EditConfigurationUtils {
     	return getDataPropertyForPredicate(vreq, predicateUri);
     }
     
-    public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq, String predicateUri) {
-        return getObjectPropertyForPredicate(vreq, predicateUri, null);
+    public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq, 
+            String predicateUri) {
+        String domainUri = getDomainUri(vreq);
+        String rangeUri = getRangeUri(vreq);
+        return getObjectPropertyForPredicate(vreq, predicateUri, domainUri, rangeUri);
     }
     
-    public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq, String predicateUri, String rangeUri) {
+    public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq, 
+            String predicateUri, String domainUri, String rangeUri) {
     	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
-    	ObjectProperty objectProp = wdf.getObjectPropertyDao().getObjectPropertyByURI(predicateUri);
-    	if (rangeUri != null) {
-    	    objectProp.setRangeVClassURI(rangeUri);
-    	    // TODO implement this in the DAO?
-    	}
+    	ObjectProperty objectProp = wdf.getObjectPropertyDao().getObjectPropertyByURIs(
+    	        predicateUri, domainUri, rangeUri);
     	return objectProp;
     }