diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java
index e13ca35b..507f3dd0 100644
--- a/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -703,7 +703,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 					XmlPullUtil.skipRestOfTree(pp);
 				}
 
-				return new QueryDeparturesResult(locationId, location, departures);
+				return new QueryDeparturesResult(new Location(LocationType.STATION, locationId, 0, 0, location), departures);
 			}
 			else if ("notidentified".equals(nameState))
 			{
diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java
index 8ab50001..5dc51f62 100644
--- a/src/de/schildbach/pte/BahnProvider.java
+++ b/src/de/schildbach/pte/BahnProvider.java
@@ -516,7 +516,7 @@ public final class BahnProvider implements NetworkProvider
 			}
 		}
 
-		return new QueryDeparturesResult(Integer.parseInt(stationId), null, departures);
+		return new QueryDeparturesResult(new Location(LocationType.STATION, Integer.parseInt(stationId), 0, 0, null), departures);
 	}
 
 	private static final Pattern P_NORMALIZE_LINE_NUMBER = Pattern.compile("\\d{2,5}");
diff --git a/src/de/schildbach/pte/BvgProvider.java b/src/de/schildbach/pte/BvgProvider.java
index 89e78143..3416862f 100644
--- a/src/de/schildbach/pte/BvgProvider.java
+++ b/src/de/schildbach/pte/BvgProvider.java
@@ -531,7 +531,7 @@ public final class BvgProvider implements NetworkProvider
 				}
 			}
 
-			return new QueryDeparturesResult(Integer.parseInt(stationId), location, departures);
+			return new QueryDeparturesResult(new Location(LocationType.STATION, Integer.parseInt(stationId), 0, 0, location), departures);
 		}
 		else
 		{
diff --git a/src/de/schildbach/pte/NasaProvider.java b/src/de/schildbach/pte/NasaProvider.java
index 72b90924..bb9572f3 100644
--- a/src/de/schildbach/pte/NasaProvider.java
+++ b/src/de/schildbach/pte/NasaProvider.java
@@ -31,6 +31,7 @@ import java.util.regex.Pattern;
 import de.schildbach.pte.dto.Departure;
 import de.schildbach.pte.dto.GetConnectionDetailsResult;
 import de.schildbach.pte.dto.Location;
+import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.QueryConnectionsResult;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryDeparturesResult.Status;
@@ -206,7 +207,7 @@ public class NasaProvider extends AbstractHafasProvider
 					}
 				}
 
-				return new QueryDeparturesResult(Integer.parseInt(stationId), location, departures);
+				return new QueryDeparturesResult(new Location(LocationType.STATION, Integer.parseInt(stationId), 0, 0, location), departures);
 			}
 			else
 			{
diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java
index a95a9323..0f4cd9ae 100644
--- a/src/de/schildbach/pte/OebbProvider.java
+++ b/src/de/schildbach/pte/OebbProvider.java
@@ -565,7 +565,7 @@ public class OebbProvider extends AbstractHafasProvider
 				}
 			}
 
-			return new QueryDeparturesResult(locationId, location, departures);
+			return new QueryDeparturesResult(new Location(LocationType.STATION, locationId, 0, 0, location), departures);
 		}
 		catch (final JSONException x)
 		{
diff --git a/src/de/schildbach/pte/RmvProvider.java b/src/de/schildbach/pte/RmvProvider.java
index 4bc1844a..f5eb9995 100644
--- a/src/de/schildbach/pte/RmvProvider.java
+++ b/src/de/schildbach/pte/RmvProvider.java
@@ -545,7 +545,7 @@ public class RmvProvider extends AbstractHafasProvider
 					}
 				}
 
-				return new QueryDeparturesResult(locationId, location, departures);
+				return new QueryDeparturesResult(new Location(LocationType.STATION, locationId, 0, 0, location), departures);
 			}
 			else
 			{
diff --git a/src/de/schildbach/pte/SbbProvider.java b/src/de/schildbach/pte/SbbProvider.java
index 1f5676dc..8f43cbe5 100644
--- a/src/de/schildbach/pte/SbbProvider.java
+++ b/src/de/schildbach/pte/SbbProvider.java
@@ -27,6 +27,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.Location;
+import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryDeparturesResult.Status;
 import de.schildbach.pte.util.ParserUtils;
@@ -170,7 +172,7 @@ public class SbbProvider extends AbstractHafasProvider
 					}
 				}
 
-				return new QueryDeparturesResult(locationId, location, departures);
+				return new QueryDeparturesResult(new Location(LocationType.STATION, locationId, 0, 0, location), departures);
 			}
 			else
 			{
diff --git a/src/de/schildbach/pte/SncbProvider.java b/src/de/schildbach/pte/SncbProvider.java
index 1f919c99..62e8b651 100644
--- a/src/de/schildbach/pte/SncbProvider.java
+++ b/src/de/schildbach/pte/SncbProvider.java
@@ -27,6 +27,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.Location;
+import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryDeparturesResult.Status;
 import de.schildbach.pte.util.ParserUtils;
@@ -154,7 +156,7 @@ public class SncbProvider extends AbstractHafasProvider
 					}
 				}
 
-				return new QueryDeparturesResult(Integer.parseInt(stationId), location, departures);
+				return new QueryDeparturesResult(new Location(LocationType.STATION, Integer.parseInt(stationId), 0, 0, location), departures);
 			}
 			else
 			{
diff --git a/src/de/schildbach/pte/VgsProvider.java b/src/de/schildbach/pte/VgsProvider.java
index 571aab9e..80b13798 100644
--- a/src/de/schildbach/pte/VgsProvider.java
+++ b/src/de/schildbach/pte/VgsProvider.java
@@ -31,6 +31,7 @@ import java.util.regex.Pattern;
 import de.schildbach.pte.dto.Departure;
 import de.schildbach.pte.dto.GetConnectionDetailsResult;
 import de.schildbach.pte.dto.Location;
+import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.QueryConnectionsResult;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryDeparturesResult.Status;
@@ -206,7 +207,7 @@ public class VgsProvider extends AbstractHafasProvider
 					}
 				}
 
-				return new QueryDeparturesResult(Integer.parseInt(stationId), location, departures);
+				return new QueryDeparturesResult(new Location(LocationType.STATION, Integer.parseInt(stationId), 0, 0, location), departures);
 			}
 			else
 			{
diff --git a/src/de/schildbach/pte/dto/QueryDeparturesResult.java b/src/de/schildbach/pte/dto/QueryDeparturesResult.java
index f2b687d7..3fc30fef 100644
--- a/src/de/schildbach/pte/dto/QueryDeparturesResult.java
+++ b/src/de/schildbach/pte/dto/QueryDeparturesResult.java
@@ -30,14 +30,12 @@ public final class QueryDeparturesResult
 	}
 
 	public final Status status;
-	public final int locationId;
-	public final String location;
+	public final Location location;
 	public final List<Departure> departures;
 
-	public QueryDeparturesResult(final int locationId, final String location, final List<Departure> departures)
+	public QueryDeparturesResult(final Location location, final List<Departure> departures)
 	{
 		this.status = Status.OK;
-		this.locationId = locationId;
 		this.location = location;
 		this.departures = departures;
 	}
@@ -45,8 +43,7 @@ public final class QueryDeparturesResult
 	public QueryDeparturesResult(final Status status, final int locationId)
 	{
 		this.status = status;
-		this.locationId = locationId;
-		this.location = null;
+		this.location = new Location(LocationType.STATION, locationId, 0, 0, null);
 		this.departures = null;
 	}
 }