diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java
index 1b0019d5..9cfbbf84 100644
--- a/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -1636,7 +1636,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 
 	protected static final String locationValue(final Location location)
 	{
-		if ((location.type == LocationType.STATION || location.type == LocationType.POI) && location.id != 0)
+		if ((location.type == LocationType.STATION || location.type == LocationType.POI) && location.hasId())
 			return Integer.toString(location.id);
 		else
 			return location.name;
diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java
index c9600bf5..0628559d 100644
--- a/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -564,7 +564,7 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 
 	private static final String location(final Location location)
 	{
-		if (location.type == LocationType.STATION && location.id != 0)
+		if (location.type == LocationType.STATION && location.hasId())
 			return "<Station externalId=\"" + location.id + "\" />";
 		if (location.type == LocationType.POI && location.hasLocation())
 			return "<Poi type=\"WGS84\" x=\"" + location.lon + "\" y=\"" + location.lat + "\" />";
@@ -582,7 +582,7 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 			builder.append("@X=" + location.lon + "@Y=" + location.lat);
 		if (location.name != null)
 			builder.append("@G=" + location.name);
-		if (location.type == LocationType.STATION && location.id != 0)
+		if (location.type == LocationType.STATION && location.hasId())
 			builder.append("@L=").append(location.id);
 		return builder.toString();
 	}
diff --git a/src/de/schildbach/pte/VmvProvider.java b/src/de/schildbach/pte/VmvProvider.java
index c95551e3..1dc3d589 100644
--- a/src/de/schildbach/pte/VmvProvider.java
+++ b/src/de/schildbach/pte/VmvProvider.java
@@ -119,7 +119,7 @@ public class VmvProvider extends AbstractEfaProvider
 	@Override
 	protected void appendLocation(final StringBuilder uri, final Location location, final String paramSuffix)
 	{
-		if (location.type == LocationType.POI && location.id != 0)
+		if (location.type == LocationType.POI && location.hasId())
 		{
 			uri.append("&type_").append(paramSuffix).append("=poiID");
 			uri.append("&name_").append(paramSuffix).append("=").append(location.id);
diff --git a/src/de/schildbach/pte/VvsProvider.java b/src/de/schildbach/pte/VvsProvider.java
index 3fc86757..cf90df0f 100644
--- a/src/de/schildbach/pte/VvsProvider.java
+++ b/src/de/schildbach/pte/VvsProvider.java
@@ -14,6 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 package de.schildbach.pte;
 
 import java.text.DateFormat;
@@ -31,7 +32,7 @@ public class VvsProvider extends AbstractEfaProvider
 {
 	public static final NetworkId NETWORK_ID = NetworkId.VVS;
 	public static final String OLD_NETWORK_ID = "mobil.vvs.de";
-	private static final String API_BASE = "http://mobil.vvs.de/mobile/";
+	private static final String API_BASE = "http://mobil.vvs.de/mobile/"; // http://www2.vvs.de/vvs/
 
 	public NetworkId id()
 	{
@@ -119,7 +120,7 @@ public class VvsProvider extends AbstractEfaProvider
 	@Override
 	protected void appendLocation(final StringBuilder uri, final Location location, final String paramSuffix)
 	{
-		if (location.type == LocationType.POI && location.id != 0)
+		if (location.type == LocationType.POI && location.hasId())
 		{
 			uri.append("&type_").append(paramSuffix).append("=poiID");
 			uri.append("&name_").append(paramSuffix).append("=").append(location.id);
diff --git a/src/de/schildbach/pte/dto/Location.java b/src/de/schildbach/pte/dto/Location.java
index f884b976..2a748c3b 100644
--- a/src/de/schildbach/pte/dto/Location.java
+++ b/src/de/schildbach/pte/dto/Location.java
@@ -70,6 +70,11 @@ public final class Location implements Serializable
 		this.name = null;
 	}
 
+	public final boolean hasId()
+	{
+		return id != 0;
+	}
+
 	public final boolean hasLocation()
 	{
 		return lat != 0 || lon != 0;