diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/service/Queries.java b/src/main/java/eu/omp/irap/vespa/epntapclient/service/Queries.java
index f708ac0..165e196 100644
--- a/src/main/java/eu/omp/irap/vespa/epntapclient/service/Queries.java
+++ b/src/main/java/eu/omp/irap/vespa/epntapclient/service/Queries.java
@@ -28,6 +28,8 @@ import eu.omp.irap.vespa.votable.utils.StringJoiner;
  * @author N. Jourdane
  */
 public final class Queries {
+	
+	public static  String RETURN_PARAMETERS = "target_name, target_class";
 
 	private static final String SELECT = "SELECT DISTINCT short_name, res_title, "
 			+ "table_name, schema_name, ivoid, access_url ";
@@ -113,7 +115,11 @@ public final class Queries {
 			}
 		}
 		String where = addJoin.isEmpty() ? "" : " WHERE " + addJoin;
-		return "SELECT TOP " + nbRow + " target_name, target_class FROM " + tableName + where;
+		
+		return "SELECT TOP " + nbRow + " "
+				+ RETURN_PARAMETERS
+				+ " "
+				+ "FROM " + tableName + where;
 	}
 
 }
--
libgit2 0.21.2