diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/IndividualListRdfController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/IndividualListRdfController.java
index 690291e70..a5416ef9b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/IndividualListRdfController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/IndividualListRdfController.java
@@ -34,8 +34,8 @@ public class IndividualListRdfController extends VitroHttpServlet {
     public void doGet (HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException {
     	    
     	// Make the query
-    	String classUri = (String) getServletContext().getAttribute("classuri");
-    	String queryStr = VitroLuceneTermNames.RDFTYPE + ":\"" + classUri + "\"";
+    	String vclassUri = req.getParameter("vclass");
+    	String queryStr = VitroLuceneTermNames.RDFTYPE + ":\"" + vclassUri + "\"";
     	SolrQuery query = new SolrQuery(queryStr);
     	query.setStart(0)
     	     .setRows(ENTITY_LIST_CONTROLLER_MAX_RESULTS)
@@ -67,7 +67,7 @@ public class IndividualListRdfController extends VitroHttpServlet {
         for (SolrDocument doc : docs) {
             String uri = doc.get(VitroLuceneTermNames.URI).toString();
             Resource resource = ResourceFactory.createResource(uri);
-            RDFNode node = (RDFNode) ResourceFactory.createResource(classUri);
+            RDFNode node = (RDFNode) ResourceFactory.createResource(vclassUri);
             model.add(resource, RDF.type, node);
         }
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java
index b2a3a8b0a..0c769f0af 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java
@@ -125,8 +125,8 @@ public class IndividualListController extends FreemarkerHttpServlet {
                     body.put("subtitle", vclass.getName());
                 }
                 body.put("title", title);  
-                body.put("rdfUrl", vreq.getContextPath()+"/listrdf/");
-                getServletContext().setAttribute("classuri", vclass.getURI());
+                body.put("rdfUrl", UrlBuilder.getUrl("/listrdf", "vclass", vclass.getURI()));
+
             }   
             
         } catch (HelpException help){
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SolrIndividualListController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SolrIndividualListController.java
index afcd951ff..5abb763ef 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SolrIndividualListController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SolrIndividualListController.java
@@ -120,8 +120,7 @@ public class SolrIndividualListController extends FreemarkerHttpServlet {
                     body.put("subtitle", vclass.getName());
                 }
                 body.put("title", title);  
-                body.put("rdfUrl", vreq.getContextPath() + "/listrdf/" + vclass.getLocalName() + ".rdf");
-                getServletContext().setAttribute("classuri", vclass.getURI());
+                body.put("rdfUrl", UrlBuilder.getUrl("/listrdf", "vclass", vclass.getURI()));                         
             }   
 
         } catch (HelpException help){