Index: SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/OWLClassGraph.java
===================================================================
--- SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/OWLClassGraph.java (revision 177)
+++ SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/OWLClassGraph.java (revision 197)
@@ -44,11 +44,16 @@
     public OWLClassGraph(String startClass, String endClass){
         super();
+        
+        // start & end
         this.startClass = startClass;
-        addNode(startClass);
         this.endClass = endClass;
-        addNode(endClass);
+        
+        // parameters
         nsteps = 3;
         limit = 1000;
         prunecut = 100;
+        
+        // constructing subgraph
+        
     }
 
@@ -229,4 +234,11 @@
     }
     */
+      
+   private void setGraph(RDFSchemaAnalyzer rdfsa, boolean countLink){
+       // BFS
+       
+       
+       //ClassLink[] classLinks = rdfsa.getNextClass(null, crrlp.classLink.getLinkedClassURI(), limit, countLinks);
+   }
     
 }
Index: SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/QueryPathGenerator.java
===================================================================
--- SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/QueryPathGenerator.java (revision 177)
+++ SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/QueryPathGenerator.java (revision 197)
@@ -18,5 +18,6 @@
     private RDFSchemaAnalyzer analyzer = null;
     //private OWLClassGraph graph;
-
+    //private PathMatrix matrix = null;
+    
     private static final String CDIR = "cdata";
     
@@ -84,5 +85,5 @@
         }
         try {
-            return analyzer.getOWLClasses(null, keywords, null, false);
+            return analyzer.getOWLClasses(null, keywords, null, true);
         }catch(Exception e){
             System.err.println(e);
Index: SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/endpointMetadata/MetadataFile.java
===================================================================
--- SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/endpointMetadata/MetadataFile.java (revision 192)
+++ SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/endpointMetadata/MetadataFile.java (revision 197)
@@ -324,7 +324,4 @@
 	}
 	
-	
-	
-	
 	private void readFile(File file) throws Exception{
 		System.out.println("readfile: " + file.getAbsolutePath());
Index: SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java
===================================================================
--- SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java (revision 196)
+++ SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java (revision 197)
@@ -83,7 +83,27 @@
         for (int i = 0 ; i < classes.length; i++ ){
             JsonObjectBuilder job = jbfactory.createObjectBuilder();
-            job.add("uri", classes[i].getClassURI());
-            job.add("display", classes[i].getClassURI());
-            //jab.add(classes[i].getClassURI());
+            String uri = classes[i].getClassURI();
+            job.add("uri", uri);
+            Label[] labels = classes[i].getLabels();
+            String label = null;
+            for ( int j = 0 ; j < labels.length; j++ ){
+                if ( labels[j].getLanguage() == null ){
+                    label = labels[j].getLabel(); break;
+                }else if ( labels[j].getLanguage().equals("en") ){
+                    label = labels[j].getLabel(); break;
+                }
+            }
+            if ( label == null ){
+                String[] uris = uri.split("/");
+                String tmplabel = uris[uris.length-1];
+                String[] tmplabel2 = tmplabel.split("#");
+                label = tmplabel2[tmplabel2.length-1];
+            }
+            
+            StringBuilder displaybuilder = new StringBuilder(label);
+            displaybuilder.append(" (");
+            displaybuilder.append(classes[i].getNumOfInstances());
+            displaybuilder.append(")");
+            job.add("display", displaybuilder.toString());
             jab.add(job);
         }