Index: /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/PLServlet.java
===================================================================
--- /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/PLServlet.java (revision 251)
+++ /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/PLServlet.java (revision 256)
@@ -83,11 +83,5 @@
         SClass[] classes = qpg.getClasses(null);
         Path[] paths = null;
-        //if ( ask == null ){
-        //    paths = qpg.getPaths(st, en, false);
-        //}else if ( ask.equalsIgnoreCase("true")){
-            paths = qpg.getPaths(st, en, true);            
-        //}else{
-        //    paths = qpg.getPaths(st, en, false);            
-        //}
+        paths = qpg.getPaths(st, en, true);            
             
         String jsonstr = "[";
@@ -99,10 +93,12 @@
                 continue;
             }
-            jsonstr += paths[i].toJSONString3(classes);
+            jsonstr += paths[i].toJSONString4(qpg);
 	}
 	jsonstr += "]";
         // For debug
+        /*
         System.out.println("JSON:");
         System.out.println(jsonstr);
+        */
         out.print(jsonstr);
     }
Index: /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java
===================================================================
--- /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java (revision 250)
+++ /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java (revision 256)
@@ -74,4 +74,7 @@
 	PrintWriter out = response.getWriter();
         String ep = request.getParameter("ep");
+        //
+        
+        
         String classURI = request.getParameter("class");
         HttpSession session = request.getSession();
@@ -88,6 +91,8 @@
         
         SClass[] classes = qpg.getClasses(null);
+        qpg.setClassLabels(classes);
         for (int i = 0 ; i < classes.length; i++ ){
             String uri = classes[i].getClassURI();
+            /*
             //if ( ocg.getNumberOfEdge(uri) == 0 ){
             //    continue;
@@ -108,4 +113,7 @@
             }
             if ( label == null ){
+                qpg.getClassLabelfromExternal(uri);
+            }            
+            if ( label == null ){
                 String[] uris = uri.split("/");
                 String tmplabel = uris[uris.length-1];
@@ -113,4 +121,6 @@
                 label = tmplabel2[tmplabel2.length-1];
             }
+            */
+            String label = qpg.getClassLabel(uri);
             StringBuilder classbuilder = new StringBuilder(label);
             classbuilder.append("  ");