Index: /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java
===================================================================
--- /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java (revision 274)
+++ /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java (revision 277)
@@ -79,4 +79,5 @@
         QueryPathGenerator qpg = (QueryPathGenerator)session.getAttribute("qpg");
         SortedSet<String> sortedClasses = null;
+        String classURI = request.getParameter("class");
                 
         if ( qpg == null ){
@@ -85,22 +86,26 @@
         if ( ep == null ){
             JsonBuilderFactory jbfactory = Json.createBuilderFactory(null);
-
-            String[] eplist = qpg.getFactory().getEndpointURIList();
             TreeSet<String> classes = new TreeSet<String>();
-            for ( int i = 0; i < eplist.length; i++ ){
-                try{
-                    qpg.setSPARQLendpoint(eplist[i]);
-                    SClass[] cls = qpg.getClasses(null);
-                    qpg.setClassLabels(cls); // HENKO TODO
-                    for (int j = 0; j < cls.length; j++ ){
-                        classes.add(qpg.getClassLabel(cls[j].getClassURI()).concat("\t")
+
+            if ( classURI == null ){
+                String[] eplist = qpg.getFactory().getEndpointURIList();
+                for ( int i = 0; i < eplist.length; i++ ){
+                    try{
+                        qpg.setSPARQLendpoint(eplist[i]);
+                        SClass[] cls = qpg.getClasses(null);
+                        qpg.setClassLabels(cls); // HENKO TODO
+                        for (int j = 0; j < cls.length; j++ ){
+                             classes.add(qpg.getClassLabel(cls[j].getClassURI()).concat("\t")
                                 .concat(cls[j].getClassURI()).concat("\t")
                                 .concat(new Integer(cls[j].getNumOfInstances()).toString())
                                 .concat("\t").concat(eplist[i]));
+                        }
+                    }catch(Exception e){
+                        e.printStackTrace();
+                        System.err.println(e);
                     }
-                }catch(Exception e){
-                    e.printStackTrace();
-                    System.err.println(e);
                 }
+            }else{ // classURI
+                return; // TODO
             }
             JsonArray ja = getJsonArrayFromClasses(jbfactory, classes);
@@ -108,5 +113,4 @@
             return;
         }
-        String classURI = request.getParameter("class");
         qpg.setSPARQLendpoint(ep);
         SClass[] classes = null;