diff --git a/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java b/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java
index 62ab654b8852d4c13baa0b5a59c6e633dd2ee40e..6b8f59a86004f38c5df2772acd6a0a15ef3918ea 100644
--- a/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java
+++ b/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java
@@ -124,7 +124,7 @@ public class ServiceIsochrone extends AbstractService {
 				final IsogaDatabase db = new IsogaDatabase(config, mode);
 				truncateTables(config);
 				final Query query = new Query(direction, speed, dMaxInMinutes * 60, date, true, dataset, mode);
-				query.setLocations(locationsFromQueryPoints(qPoints, new IsogaConfig(dataset)));
+				query.setLocations(locationsFromQueryPoints(qPoints, config));
 				Isochrone isochrone;
 				if (algorithm.equals("MrneX")) {
 					isochrone = new MrneX(query, Integer.MAX_VALUE);
diff --git a/src/main/java/it/unibz/inf/isoga/util/DSetConfig.java b/src/main/java/it/unibz/inf/isoga/util/DSetConfig.java
index 974edb296e9c92fa2c4ea6406972db0626a71c7c..55bbb24a219807d783b5494cc78fd998ccce9f19 100644
--- a/src/main/java/it/unibz/inf/isoga/util/DSetConfig.java
+++ b/src/main/java/it/unibz/inf/isoga/util/DSetConfig.java
@@ -155,8 +155,16 @@ public final class DSetConfig implements Cloneable {
 		return edgeTableEntry;
 	}
 
-	public String[] getLayers() {
-		return new String[] {edgeLayer, vertexLayer, areaBufferLayer};
+	public Collection<String> getLayers() {
+		// CHECKSTYLE:OFF MagicNumber
+		final Collection<String> result = new ArrayList<String>(3);
+		// CHECKSTYLE:ON MagicNumber
+
+		result.add(edgeLayer);
+		result.add(vertexLayer);
+		result.add(areaBufferLayer);
+
+		return result;
 	}
 
 	public BBox getServerExtent() {
diff --git a/src/main/java/it/unibz/inf/isoga/util/IsogaConfig.java b/src/main/java/it/unibz/inf/isoga/util/IsogaConfig.java
index 48ae5d3975230bcbcd972e329a5c2c7f2fc2ee6f..e3fcf3cb7791cc397ffec644ac478b70386c27fc 100644
--- a/src/main/java/it/unibz/inf/isoga/util/IsogaConfig.java
+++ b/src/main/java/it/unibz/inf/isoga/util/IsogaConfig.java
@@ -68,7 +68,7 @@ public class IsogaConfig extends Config {
 	protected void appendPropertiesFromStream(final InputStream inputStream) {
 		super.appendPropertiesFromStream(inputStream);
 
-		destinationEdgeTableEntry = getTableEntry("tbl.isoLinks", "idx.isoLinks", TableType.EDGE);
+		destinationEdgeTableEntry = getTableEntry(getProperty("tbl.isoLinks"), getProperty("idx.isoLinks"), TableType.EDGE);
 		destinationAreaBufferTableEntry = getTableEntry(getProperty("tbl.isoAreaBuffer"), getProperty("idx.isoAreaBuffer"), TableType.COVERAGE);
 		destinationVertexAnnotatedTableEntry = getTableEntry(getProperty("tbl.isoNodesAnnotations"));
 		destinationVertexTableEntry = getTableEntry(getProperty("tbl.isoNodes"), getProperty("idx.isoNodes"), TableType.VERTEX);