Index: BH13SPARQLBuilder/src/hozo/sparql/gui/SparqlBuilderPanel.java
===================================================================
--- BH13SPARQLBuilder/src/hozo/sparql/gui/SparqlBuilderPanel.java (revision 33)
+++ BH13SPARQLBuilder/src/hozo/sparql/gui/SparqlBuilderPanel.java (revision 40)
@@ -358,4 +358,5 @@
 			
 			selStr.append("?c").append(i).append(" ");
+			selStr.append("?l").append(i).append(" ");
 			
 			if(i == classLinks.size())
@@ -369,4 +370,7 @@
 			append(">").
 			append(".\n");
+			
+			whereStr.append("OPTIONAL{\n?c"+i+" rdfs:label ?l"+i+".}\n");
+
 						
 			if(direction == Direction.forward)
@@ -392,4 +396,5 @@
 		
 		selStr.append("?c").append(i).append(" \n");
+		selStr.append("?l").append(i).append(" \n");
 		whereStr.append("?c").append(i).append(" rdf:type ").
 		    append("<").
@@ -397,7 +402,12 @@
 		    append(">").
 			append(".\n");
-	
-					
-		queryStr.append(selStr).append(whereStr).append("} LIMIT 100\n");;
+		whereStr.append("OPTIONAL{\n?c"+i+" rdfs:label ?l"+i+".}\n");
+	
+					
+		queryStr.append(selStr).append(whereStr);
+		
+		queryStr.append("}");
+		//OPTIONAL
+		queryStr.append("LIMIT 100\n");;
 		
 		//System.out.println(queryStr);
Index: BH13SPARQLBuilder/src/hozo/maptool/MapFactory.java
===================================================================
--- BH13SPARQLBuilder/src/hozo/maptool/MapFactory.java (revision 37)
+++ BH13SPARQLBuilder/src/hozo/maptool/MapFactory.java (revision 40)
@@ -127,5 +127,6 @@
 		for(ClassLink link : links){
 			String next_class = link.getLinkedClassURI();
-			System.out.println("==>"+next_class);
+			System.out.println("="+link.getNumOfLinks()+"=>"+next_class);
+			
 			/*
 			String next_class_lbl ="";
@@ -149,5 +150,5 @@
 			node.addChild(next_node);
 			node = next_node;
-			String prop = link.getPropertyURI();
+			String prop = getTempLabel(link.getPropertyURI());
 			
 			if(link.getDirection().equals(Direction.reverse)){