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 d109cce607ac741d148eaa08522a9f88fbc8a4bd..fd5923861c9e76c1153ec40afcaa34a3eb6ef97d 100644
--- a/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java
+++ b/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java
@@ -32,6 +32,7 @@ import org.json.JSONException;
  * @author Nikolaus Krismer
  */
 public class ServiceIsochrone extends AbstractService<RequestIsochrone, ResponseIsochrone> {
+	private static final int BUFFER_DISTANCE = 20;
 
 	// Constructor
 
@@ -79,16 +80,15 @@ public class ServiceIsochrone extends AbstractService<RequestIsochrone, Response
 			response.setBoundingBox(output.getBoundingBox(config));
 			response.setLog(new TimingLog(totalComputationTime, 0, timeMineX));
 		} else {
-			final long bufferDistance = 20;
 			final long start1 = System.currentTimeMillis();
 			final CoverageBuilder coverage = new CoverageBuilder(config, request.getMode());
 			final String coverageMode = request.getCoverageMode();
 			if (coverageMode.equalsIgnoreCase("EB")) {
-				coverage.createIsoAreaLBA(bufferDistance);
+				coverage.createIsoAreaLBA(BUFFER_DISTANCE);
 			} else if (coverageMode.equalsIgnoreCase("SB")) {
-				coverage.createIsoAreaSBA(request.getDmax(), bufferDistance, request.getSpeed());
+				coverage.createIsoAreaSBA(request.getDmax(), BUFFER_DISTANCE, request.getSpeed());
 			} else if (coverageMode.equalsIgnoreCase("CHB")) {
-				coverage.createIsoAreaCHBA(request.getDmax(), bufferDistance, request.getSpeed());
+				coverage.createIsoAreaCHBA(request.getDmax(), BUFFER_DISTANCE, request.getSpeed());
 			}
 
 			final long timeCoveraging = System.currentTimeMillis() - start1;
diff --git a/src/main/java/it/unibz/inf/isoga/web/ConfigurationContainer.java b/src/main/java/it/unibz/inf/isoga/web/ConfigurationContainer.java
index a09e0c4acabf8cd8b47c712a1b9b2708b8a5710b..ebcb794128770f75c5e21df8fc968fddbe85d4bc 100644
--- a/src/main/java/it/unibz/inf/isoga/web/ConfigurationContainer.java
+++ b/src/main/java/it/unibz/inf/isoga/web/ConfigurationContainer.java
@@ -106,8 +106,17 @@ public final class ConfigurationContainer {
 
 		final String dataSetStr = GLOBAL_CONFIG.getProperty("cfg.datasets");
 		final String[] dataSets = (dataSetStr == null) ? new String[0] : dataSetStr.split(",");
+		final Dataset[] allSets = Dataset.values();
 		for (final String dSet : dataSets) {
-			final Dataset dataSet = Dataset.valueOf(dSet.toUpperCase());
+			Dataset dataSet = null;
+			final String dSetUpper = dSet.toUpperCase();
+			for (Dataset availableSet : allSets) {
+				if (availableSet.name().equals(dSetUpper)) {
+					dataSet = availableSet;
+					break;
+				}
+			}
+
 			if (dataSet == null) {
 				LOGGER.warn("Invalid dataset \"" + dSet + "\" specified. It is not configured in the server enum!");
 				continue;