diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
index b068bdbe..cf4db982 100644
--- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -90,13 +90,14 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 
 	private final String additionalQueryParameter;
 	private boolean canAcceptPoiId = false;
-	private final boolean needsSpEncId;
+	private boolean needsSpEncId = false;
 	private boolean includeRegionId = true;
 	private Charset requestUrlEncoding = ISO_8859_1;
-	private String httpReferer;
+	private String httpReferer = null;
 	private boolean httpPost = false;
 	private boolean suppressPositions = false;
 	private boolean useRouteIndexAsConnectionId = true;
+
 	private final XmlPullParserFactory parserFactory;
 
 	private static class Context implements QueryConnectionsContext
@@ -132,21 +133,21 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 
 	public AbstractEfaProvider(final String apiBase, final String additionalQueryParameter)
 	{
-		this(apiBase, null, null, null, null, additionalQueryParameter, false);
+		this(apiBase, null, null, null, null, additionalQueryParameter);
 	}
 
 	public AbstractEfaProvider(final String apiBase, final String departureMonitorEndpoint, final String tripEndpoint,
-			final String stopFinderEndpoint, final String coordEndpoint, final String additionalQueryParameter, final boolean needsSpEncId)
+			final String stopFinderEndpoint, final String coordEndpoint, final String additionalQueryParameter)
 	{
 		this(apiBase + (departureMonitorEndpoint != null ? departureMonitorEndpoint : DEFAULT_DEPARTURE_MONITOR_ENDPOINT), //
 				apiBase + (tripEndpoint != null ? tripEndpoint : DEFAULT_TRIP_ENDPOINT), //
 				apiBase + (stopFinderEndpoint != null ? stopFinderEndpoint : DEFAULT_STOPFINDER_ENDPOINT), //
 				apiBase + (coordEndpoint != null ? coordEndpoint : DEFAULT_COORD_ENDPOINT), //
-				additionalQueryParameter, needsSpEncId);
+				additionalQueryParameter);
 	}
 
 	public AbstractEfaProvider(final String departureMonitorEndpoint, final String tripEndpoint, final String stopFinderEndpoint,
-			final String coordEndpoint, final String additionalQueryParameter, final boolean needsSpEncId)
+			final String coordEndpoint, final String additionalQueryParameter)
 	{
 		try
 		{
@@ -163,7 +164,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		this.coordEndpoint = coordEndpoint;
 
 		this.additionalQueryParameter = additionalQueryParameter;
-		this.needsSpEncId = needsSpEncId;
 	}
 
 	protected void setRequestUrlEncoding(final Charset requestUrlEncoding)
@@ -201,6 +201,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		this.canAcceptPoiId = canAcceptPoiId;
 	}
 
+	protected void setNeedsSpEncId(final boolean needsSpEncId)
+	{
+		this.needsSpEncId = needsSpEncId;
+	}
+
 	protected TimeZone timeZone()
 	{
 		return TimeZone.getTimeZone("Europe/Berlin");
diff --git a/enabler/src/de/schildbach/pte/VgnProvider.java b/enabler/src/de/schildbach/pte/VgnProvider.java
index 23bd7dcb..6694157c 100644
--- a/enabler/src/de/schildbach/pte/VgnProvider.java
+++ b/enabler/src/de/schildbach/pte/VgnProvider.java
@@ -33,7 +33,7 @@ public class VgnProvider extends AbstractEfaProvider
 
 	public VgnProvider(final String apiBase)
 	{
-		super(apiBase, DEPARTURE_MONITOR_ENDPOINT, TRIP_ENDPOINT, null, null, null, false);
+		super(apiBase, DEPARTURE_MONITOR_ENDPOINT, TRIP_ENDPOINT, null, null, null);
 	}
 
 	public NetworkId id()
diff --git a/enabler/src/de/schildbach/pte/VrrProvider.java b/enabler/src/de/schildbach/pte/VrrProvider.java
index b0e70028..5cb98b89 100644
--- a/enabler/src/de/schildbach/pte/VrrProvider.java
+++ b/enabler/src/de/schildbach/pte/VrrProvider.java
@@ -36,7 +36,9 @@ public class VrrProvider extends AbstractEfaProvider
 
 	public VrrProvider()
 	{
-		super(API_BASE, null, null, null, null, null, true);
+		super(API_BASE, null);
+
+		setNeedsSpEncId(true);
 	}
 
 	public NetworkId id()
diff --git a/enabler/src/de/schildbach/pte/VvmProvider.java b/enabler/src/de/schildbach/pte/VvmProvider.java
index 6456a2ac..0c461b02 100644
--- a/enabler/src/de/schildbach/pte/VvmProvider.java
+++ b/enabler/src/de/schildbach/pte/VvmProvider.java
@@ -33,7 +33,9 @@ public class VvmProvider extends AbstractEfaProvider
 
 	public VvmProvider()
 	{
-		super(API_BASE, null, null, null, null, null, true);
+		super(API_BASE, null);
+
+		setNeedsSpEncId(true);
 	}
 
 	public NetworkId id()