Index: /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java
===================================================================
--- /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java (revision 277)
+++ /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java (revision 285)
@@ -9,5 +9,4 @@
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.math.BigDecimal;
 import java.util.*;
 import javax.json.*;
@@ -94,5 +93,5 @@
                         qpg.setSPARQLendpoint(eplist[i]);
                         SClass[] cls = qpg.getClasses(null);
-                        qpg.setClassLabels(cls); // HENKO TODO
+                        qpg.setClassLabels(cls); 
                         for (int j = 0; j < cls.length; j++ ){
                              classes.add(qpg.getClassLabel(cls[j].getClassURI()).concat("\t")
@@ -107,5 +106,6 @@
                 }
             }else{ // classURI
-                return; // TODO
+                Map<String, String> epclist = new HashMap<String, String>();
+                // KOKO TODO TODO 
             }
             JsonArray ja = getJsonArrayFromClasses(jbfactory, classes);
@@ -116,5 +116,5 @@
         SClass[] classes = null;
         if ( classURI != null ){
-            qpg.setOWLClassGraph(classURI);
+            qpg.setOWLClassGraph(classURI); //koko part? chk?
             classes = qpg.getReachableClasses();
         }else{
Index: /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/EPServlet.java
===================================================================
--- /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/EPServlet.java (revision 228)
+++ /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/EPServlet.java (revision 285)
@@ -7,6 +7,6 @@
 package org.biohackathon.SPARQLBuilder.www;
 
-import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.*;
+import java.math.BigDecimal;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
@@ -80,21 +80,53 @@
         response.setHeader("Access-Control-Max-Age", "-1");        
 	PrintWriter out = response.getWriter();
-
+     
+        String ds = request.getParameter("ds");
+   
         String[] elist = qpg.getFactory().getEndpointURIList();
         SortedSet<String> sortedelist = new TreeSet<String>();
         for (int i = 0; i < elist.length; i++ ){
             sortedelist.add(elist[i]);
-        }        
+        }
         JsonBuilderFactory jbfactory = Json.createBuilderFactory(null);
         JsonArrayBuilder jab = jbfactory.createArrayBuilder();
-        Iterator<String> eit = sortedelist.iterator();
-        while( eit.hasNext() ){
-            jab.add(eit.next());            
+        if ( ds == null ){
+            Iterator<String> eit = sortedelist.iterator();
+            while( eit.hasNext() ){
+                jab.add(eit.next());            
+            }
+            JsonArray ja = jab.build();
+	    out.print(ja);
+        }else{
+            File dsf = new File("dstable.txt");
+            HashMap<String, String> demap = new HashMap<String, String>();
+            try{
+                BufferedReader br = new BufferedReader(new FileReader(dsf));
+                String buf;
+                while ( (buf = br.readLine()) != null ){
+                    String[] data = buf.split(",");
+                    if (data.length != 2 ){ continue; }
+                    demap.put(data[0],data[1]);
+                }
+            }catch(IOException e){
+                e.printStackTrace();
+            }
+            Iterator<String> eit = sortedelist.iterator();
+            while( eit.hasNext() ){
+                JsonObjectBuilder job = jbfactory.createObjectBuilder();
+                String duri = eit.next();
+                String euri = duri;
+                String ep = demap.get(duri);
+                if ( ep != null ){
+                    euri = ep;
+                }
+                job.add("label", duri);
+                job.add("uri", euri);
+                jab.add(job);            
+            }
+            JsonArray ja = jab.build();
+	    out.print(ja);           
         }
-        JsonArray ja = jab.build();
-	out.print(ja);
         session.setAttribute("qpg", qpg);
     }
-
     /**
      * Handles the HTTP <code>POST</code> method.
Index: /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/DSServlet.java
===================================================================
--- /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/DSServlet.java (revision 265)
+++ /SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/DSServlet.java (revision 285)
@@ -6,6 +6,5 @@
 package org.biohackathon.SPARQLBuilder.www;
 
-import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.*;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
@@ -97,4 +96,10 @@
     private String getDSList(){
         StringBuilder sb = new StringBuilder();
+        File dsf = new File("dstable.txt");
+        try{
+            BufferedReader br = new BufferedReader(new FileReader(dsf));
+        }catch(IOException e){
+            e.printStackTrace();
+        }      
         
         return sb.toString();