diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
index a6edb917..5fff1263 100644
--- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -66,6 +66,7 @@ import de.schildbach.pte.dto.QueryTripsResult;
 import de.schildbach.pte.dto.ResultHeader;
 import de.schildbach.pte.dto.StationDepartures;
 import de.schildbach.pte.dto.Stop;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 import de.schildbach.pte.dto.Trip;
 import de.schildbach.pte.exception.InvalidDataException;
 import de.schildbach.pte.exception.ParserException;
@@ -243,7 +244,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 			uri.append('&').append(additionalQueryParameter);
 	}
 
-	protected List<Location> jsonStopfinderRequest(final Location constraint) throws IOException
+	protected SuggestLocationsResult jsonStopfinderRequest(final Location constraint) throws IOException
 	{
 		final StringBuilder parameters = stopfinderRequestParameters(constraint, "JSON");
 
@@ -255,10 +256,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		// System.out.println(parameters);
 
 		final CharSequence page = ParserUtils.scrape(uri.toString(), httpPost ? parameters.substring(1) : null, UTF_8, null);
+		final ResultHeader header = new ResultHeader(SERVER_PRODUCT);
 
 		try
 		{
-			final List<Location> results = new ArrayList<Location>();
+			final List<Location> locations = new ArrayList<Location>();
 
 			final JSONObject head = new JSONObject(page.toString());
 			final JSONObject stopFinder = head.optJSONObject("stopFinder");
@@ -274,8 +276,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 				{
 					final JSONObject stop = points.getJSONObject("point");
 					final Location location = parseJsonStop(stop);
-					results.add(location);
-					return results;
+					locations.add(location);
+					return new SuggestLocationsResult(header, locations);
 				}
 
 				stops = stopFinder.getJSONArray("points");
@@ -287,10 +289,10 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 			{
 				final JSONObject stop = stops.optJSONObject(i);
 				final Location location = parseJsonStop(stop);
-				results.add(location);
+				locations.add(location);
 			}
 
-			return results;
+			return new SuggestLocationsResult(header, locations);
 		}
 		catch (final JSONException x)
 		{
@@ -357,7 +359,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		return parameters;
 	}
 
-	protected List<Location> xmlStopfinderRequest(final Location constraint) throws IOException
+	protected SuggestLocationsResult xmlStopfinderRequest(final Location constraint) throws IOException
 	{
 		final StringBuilder parameters = stopfinderRequestParameters(constraint, "XML");
 
@@ -378,9 +380,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 
 			final XmlPullParser pp = parserFactory.newPullParser();
 			pp.setInput(is, null);
-			enterItdRequest(pp);
+			final ResultHeader header = enterItdRequest(pp);
 
-			final List<Location> results = new ArrayList<Location>();
+			final List<Location> locations = new ArrayList<Location>();
 
 			XmlPullUtil.enter(pp, "itdStopFinderRequest");
 
@@ -402,7 +404,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 			if ("identified".equals(nameState) || "list".equals(nameState))
 			{
 				while (XmlPullUtil.test(pp, "odvNameElem"))
-					results.add(processOdvNameElem(pp, null));
+					locations.add(processOdvNameElem(pp, null));
 			}
 			else if ("notidentified".equals(nameState))
 			{
@@ -419,7 +421,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 
 			XmlPullUtil.exit(pp, "itdStopFinderRequest");
 
-			return results;
+			return new SuggestLocationsResult(header, locations);
 		}
 		catch (final XmlPullParserException x)
 		{
@@ -483,7 +485,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		}
 	}
 
-	protected List<Location> mobileStopfinderRequest(final Location constraint) throws IOException
+	protected SuggestLocationsResult mobileStopfinderRequest(final Location constraint) throws IOException
 	{
 		final StringBuilder parameters = stopfinderRequestParameters(constraint, "XML");
 
@@ -504,7 +506,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 
 			final XmlPullParser pp = parserFactory.newPullParser();
 			pp.setInput(is, null);
-			enterEfa(pp);
+			final ResultHeader header = enterEfa(pp);
 
 			final List<LocationAndQuality> locations = new ArrayList<LocationAndQuality>();
 
@@ -571,7 +573,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 			for (final LocationAndQuality location : locations)
 				results.add(location.location);
 
-			return results;
+			return new SuggestLocationsResult(header, results);
 		}
 		catch (final XmlPullParserException x)
 		{
@@ -744,7 +746,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		}
 	}
 
-	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
+	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		return jsonStopfinderRequest(new Location(LocationType.ANY, null, null, constraint.toString()));
 	}
diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
index 4394b909..c216c9ab 100644
--- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -64,6 +64,7 @@ import de.schildbach.pte.dto.QueryTripsResult;
 import de.schildbach.pte.dto.ResultHeader;
 import de.schildbach.pte.dto.StationDepartures;
 import de.schildbach.pte.dto.Stop;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 import de.schildbach.pte.dto.Trip;
 import de.schildbach.pte.exception.ParserException;
 import de.schildbach.pte.exception.SessionExpiredException;
@@ -316,7 +317,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 			return new Position(platformText);
 	}
 
-	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
+	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		final StringBuilder uri = new StringBuilder(getStopEndpoint);
 		uri.append(jsonGetStopsParameters(constraint));
@@ -339,7 +340,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 	private static final Pattern P_AJAX_GET_STOPS_JSON = Pattern.compile("SLs\\.sls\\s*=\\s*(.*?);\\s*SLs\\.showSuggestion\\(\\);", Pattern.DOTALL);
 	private static final Pattern P_AJAX_GET_STOPS_ID = Pattern.compile(".*?@L=0*(\\d+)@.*?");
 
-	protected final List<Location> jsonGetStops(final String uri) throws IOException
+	protected final SuggestLocationsResult jsonGetStops(final String uri) throws IOException
 	{
 		final CharSequence page = ParserUtils.scrape(uri, null, jsonGetStopsEncoding, null);
 
@@ -347,7 +348,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 		if (mJson.matches())
 		{
 			final String json = mJson.group(1);
-			final List<Location> results = new ArrayList<Location>();
+			final List<Location> locations = new ArrayList<Location>();
 
 			try
 			{
@@ -371,16 +372,16 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 						if (type == 1) // station
 						{
 							final String[] placeAndName = splitPlaceAndName(value);
-							results.add(new Location(LocationType.STATION, localId, lat, lon, placeAndName[0], placeAndName[1]));
+							locations.add(new Location(LocationType.STATION, localId, lat, lon, placeAndName[0], placeAndName[1]));
 						}
 						else if (type == 2) // address
 						{
 							final String[] placeAndName = splitPlaceAndName(value);
-							results.add(new Location(LocationType.ADDRESS, null, lat, lon, placeAndName[0], placeAndName[1]));
+							locations.add(new Location(LocationType.ADDRESS, null, lat, lon, placeAndName[0], placeAndName[1]));
 						}
 						else if (type == 4) // poi
 						{
-							results.add(new Location(LocationType.POI, localId, lat, lon, null, value));
+							locations.add(new Location(LocationType.POI, localId, lat, lon, null, value));
 						}
 						else if (type == 71) // strange (VBN)
 						{
@@ -401,7 +402,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 					}
 				}
 
-				return results;
+				return new SuggestLocationsResult(new ResultHeader(SERVER_PRODUCT), locations);
 			}
 			catch (final JSONException x)
 			{
@@ -752,32 +753,32 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 
 		if (!from.isIdentified())
 		{
-			final List<Location> autocompletes = autocompleteStations(from.name);
-			if (autocompletes.isEmpty())
+			final List<Location> locations = suggestLocations(from.name).locations;
+			if (locations.isEmpty())
 				return new QueryTripsResult(header, QueryTripsResult.Status.NO_TRIPS); // TODO
-			if (autocompletes.size() > 1)
-				return new QueryTripsResult(header, autocompletes, null, null);
-			from = autocompletes.get(0);
+			if (locations.size() > 1)
+				return new QueryTripsResult(header, locations, null, null);
+			from = locations.get(0);
 		}
 
 		if (via != null && !via.isIdentified())
 		{
-			final List<Location> autocompletes = autocompleteStations(via.name);
-			if (autocompletes.isEmpty())
+			final List<Location> locations = suggestLocations(via.name).locations;
+			if (locations.isEmpty())
 				return new QueryTripsResult(header, QueryTripsResult.Status.NO_TRIPS); // TODO
-			if (autocompletes.size() > 1)
-				return new QueryTripsResult(header, null, autocompletes, null);
-			via = autocompletes.get(0);
+			if (locations.size() > 1)
+				return new QueryTripsResult(header, null, locations, null);
+			via = locations.get(0);
 		}
 
 		if (!to.isIdentified())
 		{
-			final List<Location> autocompletes = autocompleteStations(to.name);
-			if (autocompletes.isEmpty())
+			final List<Location> locations = suggestLocations(to.name).locations;
+			if (locations.isEmpty())
 				return new QueryTripsResult(header, QueryTripsResult.Status.NO_TRIPS); // TODO
-			if (autocompletes.size() > 1)
-				return new QueryTripsResult(header, null, null, autocompletes);
-			to = autocompletes.get(0);
+			if (locations.size() > 1)
+				return new QueryTripsResult(header, null, null, locations);
+			to = locations.get(0);
 		}
 
 		final Calendar c = new GregorianCalendar(timeZone());
@@ -1371,32 +1372,32 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 
 		if (!from.isIdentified())
 		{
-			final List<Location> autocompletes = autocompleteStations(from.name);
-			if (autocompletes.isEmpty())
+			final List<Location> locations = suggestLocations(from.name).locations;
+			if (locations.isEmpty())
 				return new QueryTripsResult(header, QueryTripsResult.Status.NO_TRIPS); // TODO
-			if (autocompletes.size() > 1)
-				return new QueryTripsResult(header, autocompletes, null, null);
-			from = autocompletes.get(0);
+			if (locations.size() > 1)
+				return new QueryTripsResult(header, locations, null, null);
+			from = locations.get(0);
 		}
 
 		if (via != null && !via.isIdentified())
 		{
-			final List<Location> autocompletes = autocompleteStations(via.name);
-			if (autocompletes.isEmpty())
+			final List<Location> locations = suggestLocations(via.name).locations;
+			if (locations.isEmpty())
 				return new QueryTripsResult(header, QueryTripsResult.Status.NO_TRIPS); // TODO
-			if (autocompletes.size() > 1)
-				return new QueryTripsResult(header, null, autocompletes, null);
-			via = autocompletes.get(0);
+			if (locations.size() > 1)
+				return new QueryTripsResult(header, null, locations, null);
+			via = locations.get(0);
 		}
 
 		if (!to.isIdentified())
 		{
-			final List<Location> autocompletes = autocompleteStations(to.name);
-			if (autocompletes.isEmpty())
+			final List<Location> locations = suggestLocations(to.name).locations;
+			if (locations.isEmpty())
 				return new QueryTripsResult(header, QueryTripsResult.Status.NO_TRIPS); // TODO
-			if (autocompletes.size() > 1)
-				return new QueryTripsResult(header, null, null, autocompletes);
-			to = autocompletes.get(0);
+			if (locations.size() > 1)
+				return new QueryTripsResult(header, null, null, locations);
+			to = locations.get(0);
 		}
 
 		final StringBuilder uri = new StringBuilder(queryEndpoint);
diff --git a/enabler/src/de/schildbach/pte/AbstractTsiProvider.java b/enabler/src/de/schildbach/pte/AbstractTsiProvider.java
index fd696344..29ed0ca7 100644
--- a/enabler/src/de/schildbach/pte/AbstractTsiProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractTsiProvider.java
@@ -48,6 +48,7 @@ import de.schildbach.pte.dto.QueryTripsContext;
 import de.schildbach.pte.dto.QueryTripsResult;
 import de.schildbach.pte.dto.ResultHeader;
 import de.schildbach.pte.dto.Stop;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 import de.schildbach.pte.dto.Trip;
 import de.schildbach.pte.exception.ParserException;
 import de.schildbach.pte.util.ParserUtils;
@@ -185,7 +186,7 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider
 				apiBase + (stopFinderEndpoint != null ? stopFinderEndpoint : DEFAULT_STOPFINDER_ENDPOINT));
 	}
 
-	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
+	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		final StringBuilder parameters = buildCommonRequestParams("SearchTripPoint", "json");
 		parameters.append("&MaxItems=").append(50); // XXX good value?
@@ -197,13 +198,13 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider
 		final CharSequence page = ParserUtils.scrape(uri.toString(), null, UTF_8, null, 3);
 		try
 		{
-			final List<Location> stations = new ArrayList<Location>();
+			final List<Location> locations = new ArrayList<Location>();
 			final JSONObject head = new JSONObject(page.toString());
 
 			int status = head.getInt("StatusCode");
 
 			if (status != 200)
-				return stations;
+				return new SuggestLocationsResult(HEADER, SuggestLocationsResult.Status.SERVICE_DOWN);
 
 			JSONArray dataArray = head.getJSONArray("Data");
 			for (int i = 0; i < dataArray.length(); i++)
@@ -213,10 +214,10 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider
 
 				if (location.isIdentified()) // make sure the location is really identified
 					// some addresses may not contain coordinates, we ignore them
-					stations.add(location);
+					locations.add(location);
 			}
 
-			return stations;
+			return new SuggestLocationsResult(HEADER, locations);
 		}
 		catch (final JSONException x)
 		{
@@ -266,11 +267,11 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider
 		if (location.isIdentified())
 			return Collections.singletonList(location);
 
-		final List<Location> result = autocompleteStations(location.uniqueShortName());
-		if (result == null)
+		final List<Location> locations = suggestLocations(location.uniqueShortName()).locations;
+		if (locations == null)
 			return new ArrayList<Location>(0);
 
-		return result;
+		return locations;
 	}
 
 	private NearbyStationsResult jsonCoordRequest(final int lat, final int lon, final int maxDistance, final int maxStations) throws IOException
diff --git a/enabler/src/de/schildbach/pte/AtcProvider.java b/enabler/src/de/schildbach/pte/AtcProvider.java
index cae32977..8cee64e7 100644
--- a/enabler/src/de/schildbach/pte/AtcProvider.java
+++ b/enabler/src/de/schildbach/pte/AtcProvider.java
@@ -18,10 +18,10 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
-import java.util.List;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -44,14 +44,14 @@ public class AtcProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
 	}
 
 	@Override
-	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
+	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		return xmlStopfinderRequest(new Location(LocationType.STATION, null, null, constraint.toString()));
 	}
diff --git a/enabler/src/de/schildbach/pte/AvvProvider.java b/enabler/src/de/schildbach/pte/AvvProvider.java
index 4731748b..c0604358 100644
--- a/enabler/src/de/schildbach/pte/AvvProvider.java
+++ b/enabler/src/de/schildbach/pte/AvvProvider.java
@@ -46,7 +46,7 @@ public class AvvProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/BahnProvider.java b/enabler/src/de/schildbach/pte/BahnProvider.java
index ef4d0735..52d5b13a 100644
--- a/enabler/src/de/schildbach/pte/BahnProvider.java
+++ b/enabler/src/de/schildbach/pte/BahnProvider.java
@@ -49,7 +49,7 @@ public final class BahnProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.NEARBY_STATIONS || capability == Capability.DEPARTURES || capability == Capability.AUTOCOMPLETE_ONE_LINE
+			if (capability == Capability.NEARBY_STATIONS || capability == Capability.DEPARTURES || capability == Capability.SUGGEST_LOCATIONS
 					|| capability == Capability.TRIPS)
 				return true;
 
diff --git a/enabler/src/de/schildbach/pte/BayernProvider.java b/enabler/src/de/schildbach/pte/BayernProvider.java
index 93acdf28..90dfffab 100644
--- a/enabler/src/de/schildbach/pte/BayernProvider.java
+++ b/enabler/src/de/schildbach/pte/BayernProvider.java
@@ -20,7 +20,6 @@ package de.schildbach.pte;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Date;
-import java.util.List;
 import java.util.Set;
 
 import de.schildbach.pte.dto.Location;
@@ -30,6 +29,7 @@ import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsContext;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -59,7 +59,7 @@ public class BayernProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
@@ -125,7 +125,7 @@ public class BayernProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
+	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		return mobileStopfinderRequest(new Location(LocationType.ANY, null, null, constraint.toString()));
 	}
diff --git a/enabler/src/de/schildbach/pte/BsvagProvider.java b/enabler/src/de/schildbach/pte/BsvagProvider.java
index 623a06e4..009a1812 100644
--- a/enabler/src/de/schildbach/pte/BsvagProvider.java
+++ b/enabler/src/de/schildbach/pte/BsvagProvider.java
@@ -46,7 +46,7 @@ public class BsvagProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/BvbProvider.java b/enabler/src/de/schildbach/pte/BvbProvider.java
index 25fc041c..e2487980 100644
--- a/enabler/src/de/schildbach/pte/BvbProvider.java
+++ b/enabler/src/de/schildbach/pte/BvbProvider.java
@@ -18,10 +18,10 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
-import java.util.List;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -44,14 +44,14 @@ public class BvbProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
 	}
 
 	@Override
-	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
+	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		return xmlStopfinderRequest(new Location(LocationType.STATION, null, null, constraint.toString()));
 	}
diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java
index 3195de93..aa17853d 100644
--- a/enabler/src/de/schildbach/pte/BvgProvider.java
+++ b/enabler/src/de/schildbach/pte/BvgProvider.java
@@ -76,7 +76,7 @@ public final class BvgProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.NEARBY_STATIONS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.NEARBY_STATIONS)
 				return false;
 
 		return true;
diff --git a/enabler/src/de/schildbach/pte/DingProvider.java b/enabler/src/de/schildbach/pte/DingProvider.java
index 3cddb2c3..d8c7c123 100644
--- a/enabler/src/de/schildbach/pte/DingProvider.java
+++ b/enabler/src/de/schildbach/pte/DingProvider.java
@@ -38,7 +38,7 @@ public class DingProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/DsbProvider.java b/enabler/src/de/schildbach/pte/DsbProvider.java
index 249a895a..48c75292 100644
--- a/enabler/src/de/schildbach/pte/DsbProvider.java
+++ b/enabler/src/de/schildbach/pte/DsbProvider.java
@@ -50,7 +50,7 @@ public class DsbProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/DubProvider.java b/enabler/src/de/schildbach/pte/DubProvider.java
index ede23121..57cd3bdd 100644
--- a/enabler/src/de/schildbach/pte/DubProvider.java
+++ b/enabler/src/de/schildbach/pte/DubProvider.java
@@ -18,11 +18,11 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.TimeZone;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -54,14 +54,14 @@ public class DubProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
 	}
 
 	@Override
-	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
+	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		return xmlStopfinderRequest(new Location(LocationType.STATION, null, null, constraint.toString()));
 	}
diff --git a/enabler/src/de/schildbach/pte/EireannProvider.java b/enabler/src/de/schildbach/pte/EireannProvider.java
index a21d7cc3..53411328 100644
--- a/enabler/src/de/schildbach/pte/EireannProvider.java
+++ b/enabler/src/de/schildbach/pte/EireannProvider.java
@@ -56,7 +56,7 @@ public class EireannProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/GvhProvider.java b/enabler/src/de/schildbach/pte/GvhProvider.java
index fe469efd..910ffba9 100644
--- a/enabler/src/de/schildbach/pte/GvhProvider.java
+++ b/enabler/src/de/schildbach/pte/GvhProvider.java
@@ -46,7 +46,7 @@ public class GvhProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/IvbProvider.java b/enabler/src/de/schildbach/pte/IvbProvider.java
index 7c3f1b7d..abc1d9a5 100644
--- a/enabler/src/de/schildbach/pte/IvbProvider.java
+++ b/enabler/src/de/schildbach/pte/IvbProvider.java
@@ -40,7 +40,7 @@ public class IvbProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/JetProvider.java b/enabler/src/de/schildbach/pte/JetProvider.java
index 0db30acf..b5e4783e 100644
--- a/enabler/src/de/schildbach/pte/JetProvider.java
+++ b/enabler/src/de/schildbach/pte/JetProvider.java
@@ -51,7 +51,7 @@ public class JetProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/KvvProvider.java b/enabler/src/de/schildbach/pte/KvvProvider.java
index 5226ed73..ab7bbfdd 100644
--- a/enabler/src/de/schildbach/pte/KvvProvider.java
+++ b/enabler/src/de/schildbach/pte/KvvProvider.java
@@ -53,7 +53,7 @@ public class KvvProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/LinzProvider.java b/enabler/src/de/schildbach/pte/LinzProvider.java
index f161ca8d..6846d75e 100644
--- a/enabler/src/de/schildbach/pte/LinzProvider.java
+++ b/enabler/src/de/schildbach/pte/LinzProvider.java
@@ -46,7 +46,7 @@ public class LinzProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/MetProvider.java b/enabler/src/de/schildbach/pte/MetProvider.java
index 9971adb2..279ed334 100644
--- a/enabler/src/de/schildbach/pte/MetProvider.java
+++ b/enabler/src/de/schildbach/pte/MetProvider.java
@@ -55,7 +55,7 @@ public class MetProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/MvgProvider.java b/enabler/src/de/schildbach/pte/MvgProvider.java
index 3deba4c7..987a6adf 100644
--- a/enabler/src/de/schildbach/pte/MvgProvider.java
+++ b/enabler/src/de/schildbach/pte/MvgProvider.java
@@ -38,7 +38,7 @@ public class MvgProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/MvvProvider.java b/enabler/src/de/schildbach/pte/MvvProvider.java
index 347f5a50..4cad1c62 100644
--- a/enabler/src/de/schildbach/pte/MvvProvider.java
+++ b/enabler/src/de/schildbach/pte/MvvProvider.java
@@ -52,7 +52,7 @@ public class MvvProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/NaldoProvider.java b/enabler/src/de/schildbach/pte/NaldoProvider.java
index cd1b7688..4b78e5c3 100644
--- a/enabler/src/de/schildbach/pte/NaldoProvider.java
+++ b/enabler/src/de/schildbach/pte/NaldoProvider.java
@@ -18,10 +18,10 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
-import java.util.List;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -44,7 +44,7 @@ public class NaldoProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
@@ -64,7 +64,7 @@ public class NaldoProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
+	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		return xmlStopfinderRequest(new Location(LocationType.STATION, null, null, constraint.toString()));
 	}
diff --git a/enabler/src/de/schildbach/pte/NasaProvider.java b/enabler/src/de/schildbach/pte/NasaProvider.java
index 465e926c..fc7ee059 100644
--- a/enabler/src/de/schildbach/pte/NasaProvider.java
+++ b/enabler/src/de/schildbach/pte/NasaProvider.java
@@ -49,7 +49,7 @@ public class NasaProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/NetworkProvider.java b/enabler/src/de/schildbach/pte/NetworkProvider.java
index 86a1b328..0005ab2c 100644
--- a/enabler/src/de/schildbach/pte/NetworkProvider.java
+++ b/enabler/src/de/schildbach/pte/NetworkProvider.java
@@ -20,7 +20,6 @@ package de.schildbach.pte;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Date;
-import java.util.List;
 import java.util.Set;
 
 import de.schildbach.pte.dto.Location;
@@ -31,6 +30,7 @@ import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsContext;
 import de.schildbach.pte.dto.QueryTripsResult;
 import de.schildbach.pte.dto.Style;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * Interface to be implemented by providers of transportation networks.
@@ -41,8 +41,8 @@ public interface NetworkProvider
 {
 	public enum Capability
 	{
-		/* can autocomplete locations */
-		AUTOCOMPLETE_ONE_LINE,
+		/* can suggest locations */
+		SUGGEST_LOCATIONS,
 		/* can determine nearby stations */
 		NEARBY_STATIONS,
 		/* can query for departures */
@@ -99,14 +99,14 @@ public interface NetworkProvider
 	QueryDeparturesResult queryDepartures(String stationId, int maxDepartures, boolean equivs) throws IOException;
 
 	/**
-	 * Meant for auto-completion of station names, like in an {@link android.widget.AutoCompleteTextView}
+	 * Meant for auto-completion of location names, like in an {@link android.widget.AutoCompleteTextView}
 	 * 
 	 * @param constraint
 	 *            input by user so far
-	 * @return auto-complete suggestions
+	 * @return location suggestions
 	 * @throws IOException
 	 */
-	List<Location> autocompleteStations(CharSequence constraint) throws IOException;
+	SuggestLocationsResult suggestLocations(CharSequence constraint) throws IOException;
 
 	/**
 	 * Typical products for a network
diff --git a/enabler/src/de/schildbach/pte/NriProvider.java b/enabler/src/de/schildbach/pte/NriProvider.java
index b5ae0f96..f0df7fe0 100644
--- a/enabler/src/de/schildbach/pte/NriProvider.java
+++ b/enabler/src/de/schildbach/pte/NriProvider.java
@@ -53,7 +53,7 @@ public class NriProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/NsProvider.java b/enabler/src/de/schildbach/pte/NsProvider.java
index 3fcc29fb..2ef690ef 100644
--- a/enabler/src/de/schildbach/pte/NsProvider.java
+++ b/enabler/src/de/schildbach/pte/NsProvider.java
@@ -47,7 +47,7 @@ public class NsProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/NvbwProvider.java b/enabler/src/de/schildbach/pte/NvbwProvider.java
index c71ffef8..9bce6d5b 100644
--- a/enabler/src/de/schildbach/pte/NvbwProvider.java
+++ b/enabler/src/de/schildbach/pte/NvbwProvider.java
@@ -41,7 +41,7 @@ public class NvbwProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/NvvProvider.java b/enabler/src/de/schildbach/pte/NvvProvider.java
index f4609bf0..b168904b 100644
--- a/enabler/src/de/schildbach/pte/NvvProvider.java
+++ b/enabler/src/de/schildbach/pte/NvvProvider.java
@@ -47,7 +47,7 @@ public class NvvProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/OebbProvider.java b/enabler/src/de/schildbach/pte/OebbProvider.java
index cc113bdf..143f15a0 100644
--- a/enabler/src/de/schildbach/pte/OebbProvider.java
+++ b/enabler/src/de/schildbach/pte/OebbProvider.java
@@ -50,7 +50,7 @@ public class OebbProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.NEARBY_STATIONS || capability == Capability.DEPARTURES || capability == Capability.AUTOCOMPLETE_ONE_LINE
+			if (capability == Capability.NEARBY_STATIONS || capability == Capability.DEPARTURES || capability == Capability.SUGGEST_LOCATIONS
 					|| capability == Capability.TRIPS)
 				return true;
 
diff --git a/enabler/src/de/schildbach/pte/PacaProvider.java b/enabler/src/de/schildbach/pte/PacaProvider.java
index 25793360..b4f96671 100644
--- a/enabler/src/de/schildbach/pte/PacaProvider.java
+++ b/enabler/src/de/schildbach/pte/PacaProvider.java
@@ -39,7 +39,7 @@ public class PacaProvider extends AbstractTsiProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/PlProvider.java b/enabler/src/de/schildbach/pte/PlProvider.java
index b3851e8d..b222e070 100644
--- a/enabler/src/de/schildbach/pte/PlProvider.java
+++ b/enabler/src/de/schildbach/pte/PlProvider.java
@@ -51,7 +51,7 @@ public class PlProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/RtProvider.java b/enabler/src/de/schildbach/pte/RtProvider.java
index e401dd6f..98db41ab 100644
--- a/enabler/src/de/schildbach/pte/RtProvider.java
+++ b/enabler/src/de/schildbach/pte/RtProvider.java
@@ -47,7 +47,7 @@ public class RtProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/SbbProvider.java b/enabler/src/de/schildbach/pte/SbbProvider.java
index 11bd3bf0..0c46fd75 100644
--- a/enabler/src/de/schildbach/pte/SbbProvider.java
+++ b/enabler/src/de/schildbach/pte/SbbProvider.java
@@ -47,7 +47,7 @@ public class SbbProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/SeProvider.java b/enabler/src/de/schildbach/pte/SeProvider.java
index 750e12b6..e67e1d8d 100644
--- a/enabler/src/de/schildbach/pte/SeProvider.java
+++ b/enabler/src/de/schildbach/pte/SeProvider.java
@@ -57,7 +57,7 @@ public class SeProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/SeptaProvider.java b/enabler/src/de/schildbach/pte/SeptaProvider.java
index 153ad883..4bc4a7fc 100644
--- a/enabler/src/de/schildbach/pte/SeptaProvider.java
+++ b/enabler/src/de/schildbach/pte/SeptaProvider.java
@@ -75,7 +75,7 @@ public class SeptaProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/SfProvider.java b/enabler/src/de/schildbach/pte/SfProvider.java
index 89767f37..1e722f2d 100644
--- a/enabler/src/de/schildbach/pte/SfProvider.java
+++ b/enabler/src/de/schildbach/pte/SfProvider.java
@@ -54,7 +54,7 @@ public class SfProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/ShProvider.java b/enabler/src/de/schildbach/pte/ShProvider.java
index 603c910e..ab542d12 100644
--- a/enabler/src/de/schildbach/pte/ShProvider.java
+++ b/enabler/src/de/schildbach/pte/ShProvider.java
@@ -62,7 +62,7 @@ public class ShProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/SncbProvider.java b/enabler/src/de/schildbach/pte/SncbProvider.java
index 03bf258a..dce010a7 100644
--- a/enabler/src/de/schildbach/pte/SncbProvider.java
+++ b/enabler/src/de/schildbach/pte/SncbProvider.java
@@ -50,7 +50,7 @@ public class SncbProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/StockholmProvider.java b/enabler/src/de/schildbach/pte/StockholmProvider.java
index c3a9e336..3e896beb 100644
--- a/enabler/src/de/schildbach/pte/StockholmProvider.java
+++ b/enabler/src/de/schildbach/pte/StockholmProvider.java
@@ -56,7 +56,7 @@ public class StockholmProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/StvProvider.java b/enabler/src/de/schildbach/pte/StvProvider.java
index d26eebce..c4c8b2f0 100644
--- a/enabler/src/de/schildbach/pte/StvProvider.java
+++ b/enabler/src/de/schildbach/pte/StvProvider.java
@@ -40,7 +40,7 @@ public class StvProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/SvvProvider.java b/enabler/src/de/schildbach/pte/SvvProvider.java
index 8b4af383..507c7cbf 100644
--- a/enabler/src/de/schildbach/pte/SvvProvider.java
+++ b/enabler/src/de/schildbach/pte/SvvProvider.java
@@ -38,7 +38,7 @@ public class SvvProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/SydneyProvider.java b/enabler/src/de/schildbach/pte/SydneyProvider.java
index 3e736382..47472bc6 100644
--- a/enabler/src/de/schildbach/pte/SydneyProvider.java
+++ b/enabler/src/de/schildbach/pte/SydneyProvider.java
@@ -48,7 +48,7 @@ public class SydneyProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/TfiProvider.java b/enabler/src/de/schildbach/pte/TfiProvider.java
index a7ede4b3..cff3444c 100644
--- a/enabler/src/de/schildbach/pte/TfiProvider.java
+++ b/enabler/src/de/schildbach/pte/TfiProvider.java
@@ -49,7 +49,7 @@ public class TfiProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/TflProvider.java b/enabler/src/de/schildbach/pte/TflProvider.java
index 96194304..0b08d841 100644
--- a/enabler/src/de/schildbach/pte/TflProvider.java
+++ b/enabler/src/de/schildbach/pte/TflProvider.java
@@ -53,7 +53,7 @@ public class TflProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/TlemProvider.java b/enabler/src/de/schildbach/pte/TlemProvider.java
index 1970b239..51b92640 100644
--- a/enabler/src/de/schildbach/pte/TlemProvider.java
+++ b/enabler/src/de/schildbach/pte/TlemProvider.java
@@ -19,12 +19,12 @@ package de.schildbach.pte;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.List;
 import java.util.TimeZone;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.Product;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -56,7 +56,7 @@ public class TlemProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
@@ -76,7 +76,7 @@ public class TlemProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
+	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		return xmlStopfinderRequest(new Location(LocationType.ANY, null, null, constraint.toString()));
 	}
diff --git a/enabler/src/de/schildbach/pte/TlswProvider.java b/enabler/src/de/schildbach/pte/TlswProvider.java
index 590e604d..24300e2c 100644
--- a/enabler/src/de/schildbach/pte/TlswProvider.java
+++ b/enabler/src/de/schildbach/pte/TlswProvider.java
@@ -19,12 +19,12 @@ package de.schildbach.pte;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.List;
 import java.util.TimeZone;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.Product;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -55,14 +55,14 @@ public class TlswProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
 	}
 
 	@Override
-	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
+	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		return xmlStopfinderRequest(new Location(LocationType.ANY, null, null, constraint.toString()));
 	}
diff --git a/enabler/src/de/schildbach/pte/TlwmProvider.java b/enabler/src/de/schildbach/pte/TlwmProvider.java
index 717fa744..0110c6df 100644
--- a/enabler/src/de/schildbach/pte/TlwmProvider.java
+++ b/enabler/src/de/schildbach/pte/TlwmProvider.java
@@ -51,7 +51,7 @@ public class TlwmProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/VagfrProvider.java b/enabler/src/de/schildbach/pte/VagfrProvider.java
index dde8447c..15349615 100644
--- a/enabler/src/de/schildbach/pte/VagfrProvider.java
+++ b/enabler/src/de/schildbach/pte/VagfrProvider.java
@@ -47,7 +47,7 @@ public class VagfrProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/VbbProvider.java b/enabler/src/de/schildbach/pte/VbbProvider.java
index 6bd214c9..d11eccc2 100644
--- a/enabler/src/de/schildbach/pte/VbbProvider.java
+++ b/enabler/src/de/schildbach/pte/VbbProvider.java
@@ -60,7 +60,7 @@ public class VbbProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.DEPARTURES || capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.TRIPS)
+			if (capability == Capability.DEPARTURES || capability == Capability.SUGGEST_LOCATIONS || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/VblProvider.java b/enabler/src/de/schildbach/pte/VblProvider.java
index 7f76a341..17a86ca6 100644
--- a/enabler/src/de/schildbach/pte/VblProvider.java
+++ b/enabler/src/de/schildbach/pte/VblProvider.java
@@ -40,7 +40,7 @@ public class VblProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java
index b45d17a0..b3e8d349 100644
--- a/enabler/src/de/schildbach/pte/VbnProvider.java
+++ b/enabler/src/de/schildbach/pte/VbnProvider.java
@@ -46,7 +46,7 @@ public class VbnProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.NEARBY_STATIONS || capability == Capability.DEPARTURES || capability == Capability.AUTOCOMPLETE_ONE_LINE
+			if (capability == Capability.NEARBY_STATIONS || capability == Capability.DEPARTURES || capability == Capability.SUGGEST_LOCATIONS
 					|| capability == Capability.TRIPS)
 				return true;
 
diff --git a/enabler/src/de/schildbach/pte/VgnProvider.java b/enabler/src/de/schildbach/pte/VgnProvider.java
index c3fe9157..938f7fe0 100644
--- a/enabler/src/de/schildbach/pte/VgnProvider.java
+++ b/enabler/src/de/schildbach/pte/VgnProvider.java
@@ -46,7 +46,7 @@ public class VgnProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/VgsProvider.java b/enabler/src/de/schildbach/pte/VgsProvider.java
index fcf1711f..06a5023e 100644
--- a/enabler/src/de/schildbach/pte/VgsProvider.java
+++ b/enabler/src/de/schildbach/pte/VgsProvider.java
@@ -45,7 +45,7 @@ public class VgsProvider extends AbstractHafasProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/VmobilProvider.java b/enabler/src/de/schildbach/pte/VmobilProvider.java
index 760b85c5..98777174 100644
--- a/enabler/src/de/schildbach/pte/VmobilProvider.java
+++ b/enabler/src/de/schildbach/pte/VmobilProvider.java
@@ -40,7 +40,7 @@ public class VmobilProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/VmsProvider.java b/enabler/src/de/schildbach/pte/VmsProvider.java
index 92967dc5..13638a43 100644
--- a/enabler/src/de/schildbach/pte/VmsProvider.java
+++ b/enabler/src/de/schildbach/pte/VmsProvider.java
@@ -18,10 +18,10 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
-import java.util.List;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -44,7 +44,7 @@ public class VmsProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
@@ -68,7 +68,7 @@ public class VmsProvider extends AbstractEfaProvider
 	}
 
 	@Override
-	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
+	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		return xmlStopfinderRequest(new Location(LocationType.ANY, null, null, constraint.toString()));
 	}
diff --git a/enabler/src/de/schildbach/pte/VmvProvider.java b/enabler/src/de/schildbach/pte/VmvProvider.java
index 6fb4e328..e0207061 100644
--- a/enabler/src/de/schildbach/pte/VmvProvider.java
+++ b/enabler/src/de/schildbach/pte/VmvProvider.java
@@ -19,13 +19,13 @@ package de.schildbach.pte;
 
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.Style;
 import de.schildbach.pte.dto.Style.Shape;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -51,14 +51,14 @@ public class VmvProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
 	}
 
 	@Override
-	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
+	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		return xmlStopfinderRequest(new Location(LocationType.STATION, null, null, constraint.toString()));
 	}
diff --git a/enabler/src/de/schildbach/pte/VorProvider.java b/enabler/src/de/schildbach/pte/VorProvider.java
index 5cd5ef30..84cc4544 100644
--- a/enabler/src/de/schildbach/pte/VorProvider.java
+++ b/enabler/src/de/schildbach/pte/VorProvider.java
@@ -51,7 +51,7 @@ public class VorProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/VrnProvider.java b/enabler/src/de/schildbach/pte/VrnProvider.java
index 26fbdc59..6df77350 100644
--- a/enabler/src/de/schildbach/pte/VrnProvider.java
+++ b/enabler/src/de/schildbach/pte/VrnProvider.java
@@ -38,7 +38,7 @@ public class VrnProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/VrrProvider.java b/enabler/src/de/schildbach/pte/VrrProvider.java
index e2558823..1f190e06 100644
--- a/enabler/src/de/schildbach/pte/VrrProvider.java
+++ b/enabler/src/de/schildbach/pte/VrrProvider.java
@@ -48,7 +48,7 @@ public class VrrProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/VrtProvider.java b/enabler/src/de/schildbach/pte/VrtProvider.java
index 6b66b986..ea784264 100644
--- a/enabler/src/de/schildbach/pte/VrtProvider.java
+++ b/enabler/src/de/schildbach/pte/VrtProvider.java
@@ -18,10 +18,10 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
-import java.util.List;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -44,14 +44,14 @@ public class VrtProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
 	}
 
 	@Override
-	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
+	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		return xmlStopfinderRequest(new Location(LocationType.ANY, null, null, constraint.toString()));
 	}
diff --git a/enabler/src/de/schildbach/pte/VvmProvider.java b/enabler/src/de/schildbach/pte/VvmProvider.java
index 704be054..b05a6581 100644
--- a/enabler/src/de/schildbach/pte/VvmProvider.java
+++ b/enabler/src/de/schildbach/pte/VvmProvider.java
@@ -18,10 +18,10 @@
 package de.schildbach.pte;
 
 import java.io.IOException;
-import java.util.List;
 
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -46,14 +46,14 @@ public class VvmProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
 	}
 
 	@Override
-	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
+	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		return xmlStopfinderRequest(new Location(LocationType.ANY, null, null, constraint.toString()));
 	}
diff --git a/enabler/src/de/schildbach/pte/VvoProvider.java b/enabler/src/de/schildbach/pte/VvoProvider.java
index 2ffaeb60..c564ae78 100644
--- a/enabler/src/de/schildbach/pte/VvoProvider.java
+++ b/enabler/src/de/schildbach/pte/VvoProvider.java
@@ -47,7 +47,7 @@ public class VvoProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/VvsProvider.java b/enabler/src/de/schildbach/pte/VvsProvider.java
index 30ae112e..41727e90 100644
--- a/enabler/src/de/schildbach/pte/VvsProvider.java
+++ b/enabler/src/de/schildbach/pte/VvsProvider.java
@@ -47,7 +47,7 @@ public class VvsProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/VvtProvider.java b/enabler/src/de/schildbach/pte/VvtProvider.java
index d0f65cc4..eec830a8 100644
--- a/enabler/src/de/schildbach/pte/VvtProvider.java
+++ b/enabler/src/de/schildbach/pte/VvtProvider.java
@@ -40,7 +40,7 @@ public class VvtProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/VvvProvider.java b/enabler/src/de/schildbach/pte/VvvProvider.java
index 406a05be..7acc992e 100644
--- a/enabler/src/de/schildbach/pte/VvvProvider.java
+++ b/enabler/src/de/schildbach/pte/VvvProvider.java
@@ -40,7 +40,7 @@ public class VvvProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/WienProvider.java b/enabler/src/de/schildbach/pte/WienProvider.java
index 2481b181..aa940a86 100644
--- a/enabler/src/de/schildbach/pte/WienProvider.java
+++ b/enabler/src/de/schildbach/pte/WienProvider.java
@@ -47,7 +47,7 @@ public class WienProvider extends AbstractEfaProvider
 	public boolean hasCapabilities(final Capability... capabilities)
 	{
 		for (final Capability capability : capabilities)
-			if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
+			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
 				return true;
 
 		return false;
diff --git a/enabler/src/de/schildbach/pte/dto/SuggestLocationsResult.java b/enabler/src/de/schildbach/pte/dto/SuggestLocationsResult.java
new file mode 100644
index 00000000..df2684e2
--- /dev/null
+++ b/enabler/src/de/schildbach/pte/dto/SuggestLocationsResult.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Andreas Schildbach
+ */
+public final class SuggestLocationsResult implements Serializable
+{
+	public enum Status
+	{
+		OK, SERVICE_DOWN
+	}
+
+	public final ResultHeader header;
+	public final Status status;
+	public final List<Location> locations;
+
+	public SuggestLocationsResult(final ResultHeader header, final List<Location> locations)
+	{
+		this.header = header;
+		this.status = Status.OK;
+		this.locations = locations;
+	}
+
+	public SuggestLocationsResult(final ResultHeader header, final Status status)
+	{
+		this.header = header;
+		this.status = status;
+		this.locations = null;
+	}
+
+	@Override
+	public String toString()
+	{
+		final StringBuilder builder = new StringBuilder(getClass().getName());
+		builder.append("[").append(this.status);
+		builder.append(" ").append(locations);
+		builder.append("]");
+		return builder.toString();
+	}
+}
diff --git a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java
index edebc91a..57d31cfa 100644
--- a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Date;
-import java.util.List;
 
 import de.schildbach.pte.NetworkProvider;
 import de.schildbach.pte.NetworkProvider.Accessibility;
@@ -31,6 +30,7 @@ import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsContext;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -59,11 +59,11 @@ public abstract class AbstractProviderLiveTest
 		// System.out.println(departure);
 	}
 
-	protected final void print(final List<Location> autocompletes)
+	protected final void print(final SuggestLocationsResult result)
 	{
-		System.out.print(autocompletes.size() + " ");
-		for (final Location autocomplete : autocompletes)
-			System.out.print(autocomplete + " ");
+		System.out.print(result.locations.size() + " ");
+		for (final Location location : result.locations)
+			System.out.print(location + " ");
 		System.out.println();
 	}
 
diff --git a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java
index 8b57d999..36c7251f 100644
--- a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java
@@ -18,7 +18,6 @@
 package de.schildbach.pte.live;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -31,6 +30,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -68,19 +68,19 @@ public class AtcProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("ponte");
+		final SuggestLocationsResult result = provider.suggestLocations("ponte");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grünwink");
+		final SuggestLocationsResult result = provider.suggestLocations("grünwink");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java
index 6ec9fd48..5400efd7 100644
--- a/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/AvvProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,19 +70,19 @@ public class AvvProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grünwink");
+		final SuggestLocationsResult result = provider.suggestLocations("grünwink");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java
index 376aceba..a152e8a3 100644
--- a/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/BahnProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -69,31 +69,31 @@ public class BahnProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Güntzelstr. (U)");
+		final SuggestLocationsResult result = provider.suggestLocations("Güntzelstr. (U)");
 
-		print(autocompletes);
+		print(result);
 
-		assertEquals("Güntzelstr. (U), Berlin", autocompletes.get(0).name);
+		assertEquals("Güntzelstr. (U), Berlin", result.locations.get(0).name);
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Landungsbr");
+		final SuggestLocationsResult result = provider.suggestLocations("Landungsbr");
 
-		print(autocompletes);
+		print(result);
 
-		assertEquals("Hamburg Landungsbrücken", autocompletes.get(0).name);
+		assertEquals("Hamburg Landungsbrücken", result.locations.get(0).name);
 	}
 
 	@Test
-	public void autocompleteIdentified() throws Exception
+	public void suggestLocationsIdentified() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Berlin");
+		final SuggestLocationsResult result = provider.suggestLocations("Berlin");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java
index 3865da35..f9e9a271 100644
--- a/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/BayernProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -74,40 +74,40 @@ public class BayernProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Marien");
+		final SuggestLocationsResult result = provider.suggestLocations("Marien");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteAddress() throws Exception
+	public void suggestLocationsAddress() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("München, Friedenstraße 2");
+		final SuggestLocationsResult result = provider.suggestLocations("München, Friedenstraße 2");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteLocal() throws Exception
+	public void suggestLocationsLocal() throws Exception
 	{
-		final List<Location> autocompleteRegensburg = provider.autocompleteStations("Regensburg");
-		assertEquals("80001083", autocompleteRegensburg.iterator().next().id);
+		final SuggestLocationsResult regensburgResult = provider.suggestLocations("Regensburg");
+		assertEquals("80001083", regensburgResult.locations.iterator().next().id);
 
-		final List<Location> autocompleteMunich = provider.autocompleteStations("München");
-		assertEquals("80000689", autocompleteMunich.iterator().next().id);
+		final SuggestLocationsResult munichResult = provider.suggestLocations("München");
+		assertEquals("80000689", munichResult.locations.iterator().next().id);
 
-		final List<Location> autocompleteNuremberg = provider.autocompleteStations("Nürnberg");
-		assertEquals("80001020", autocompleteNuremberg.iterator().next().id);
+		final SuggestLocationsResult nurembergResult = provider.suggestLocations("Nürnberg");
+		assertEquals("80001020", nurembergResult.locations.iterator().next().id);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java
index 2c1457aa..8157fd6d 100644
--- a/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/BsvagProviderLiveTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -36,6 +35,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -72,27 +72,27 @@ public class BsvagProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kurf");
+		final SuggestLocationsResult result = provider.suggestLocations("Kurf");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteCoverage() throws Exception
+	public void suggestLocationsCoverage() throws Exception
 	{
-		final List<Location> braunschweigAutocompletes = provider.autocompleteStations("Braunschweig Rhönweg");
-		print(braunschweigAutocompletes);
-		assertThat(braunschweigAutocompletes, hasItem(new Location(LocationType.STATION, "26000351")));
+		final SuggestLocationsResult braunschweigResult = provider.suggestLocations("Braunschweig Rhönweg");
+		print(braunschweigResult);
+		assertThat(braunschweigResult.locations, hasItem(new Location(LocationType.STATION, "26000351")));
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java
index 9d7dd8b7..d37dac8e 100644
--- a/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/BvbProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,19 +70,19 @@ public class BvbProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Haupt");
+		final SuggestLocationsResult result = provider.suggestLocations("Haupt");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java
index a28c3cae..5b1fd3b0 100644
--- a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -91,31 +91,31 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Güntzelstr.");
+		final SuggestLocationsResult result = provider.suggestLocations("Güntzelstr.");
 
-		print(autocompletes);
+		print(result);
 
-		Assert.assertEquals("Güntzelstr. (U)", autocompletes.get(0).name);
+		Assert.assertEquals("Güntzelstr. (U)", result.locations.get(0).name);
 	}
 
 	@Test
-	public void autocompleteAddress() throws Exception
+	public void suggestLocationsAddress() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Sophienstr. 24");
+		final SuggestLocationsResult result = provider.suggestLocations("Sophienstr. 24");
 
-		print(autocompletes);
+		print(result);
 
-		Assert.assertEquals("Sophienstr. 24", autocompletes.get(0).name);
+		Assert.assertEquals("Sophienstr. 24", result.locations.get(0).name);
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("nol");
+		final SuggestLocationsResult result = provider.suggestLocations("nol");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java
index 1673bcc5..d84e9635 100644
--- a/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/DingProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,19 +70,19 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java
index 7e61b687..259ee6bd 100644
--- a/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/DsbProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -77,11 +77,11 @@ public class DsbProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Airport");
+		final SuggestLocationsResult result = provider.suggestLocations("Airport");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java
index fc7bd2bd..4984a499 100644
--- a/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/DubProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -61,11 +61,11 @@ public class DubProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Airport");
+		final SuggestLocationsResult result = provider.suggestLocations("Airport");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java
index ee81d265..9219b883 100644
--- a/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/EireannProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -77,27 +77,27 @@ public class EireannProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Dublin");
+		final SuggestLocationsResult result = provider.suggestLocations("Dublin");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Busáras");
+		final SuggestLocationsResult result = provider.suggestLocations("Busáras");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteAddress() throws Exception
+	public void suggestLocationsAddress() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Dorfstrasse 10, Dällikon, Schweiz");
+		final SuggestLocationsResult result = provider.suggestLocations("Dorfstrasse 10, Dällikon, Schweiz");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java
index 30b94ea4..440e3160 100644
--- a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,43 +70,43 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteIdentified() throws Exception
+	public void suggestLocationsIdentified() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Hannover, Hannoversche Straße");
+		final SuggestLocationsResult result = provider.suggestLocations("Hannover, Hannoversche Straße");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteCity() throws Exception
+	public void suggestLocationsCity() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Hannover");
+		final SuggestLocationsResult result = provider.suggestLocations("Hannover");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> results = provider.autocompleteStations("Hannover");
+		final SuggestLocationsResult result = provider.suggestLocations("Hannover");
 
-		System.out.println(results.size() + "  " + results);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java
index 763d9ffa..c8dee152 100644
--- a/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -77,11 +77,11 @@ public class InvgProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Flughafen");
+		final SuggestLocationsResult result = provider.suggestLocations("Flughafen");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java
index 53c104d3..6fdf0454 100644
--- a/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/IvbProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,19 +70,19 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java
index 9745aa59..6b5530e9 100644
--- a/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -82,11 +82,11 @@ public class JetProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autoComplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("הנשיא - מוזיאון האיסלם, ירושלים");
+		final SuggestLocationsResult result = provider.suggestLocations("הנשיא - מוזיאון האיסלם, ירושלים");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java
index 5f7b8f54..1313f2a5 100644
--- a/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/KvvProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,19 +70,19 @@ public class KvvProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grünwink");
+		final SuggestLocationsResult result = provider.suggestLocations("grünwink");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java
index ac330dbc..63e6274f 100644
--- a/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/LinzProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -69,35 +69,35 @@ public class LinzProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Friedhof");
+		final SuggestLocationsResult result = provider.suggestLocations("Friedhof");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteIdentified() throws Exception
+	public void suggestLocationsIdentified() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Leonding, Haag");
+		final SuggestLocationsResult result = provider.suggestLocations("Leonding, Haag");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteCity() throws Exception
+	public void suggestLocationsCity() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Leonding");
+		final SuggestLocationsResult result = provider.suggestLocations("Leonding");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java
index 4ebcd0e9..f8dc9653 100644
--- a/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/LuProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -77,11 +77,11 @@ public class LuProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Aéroport");
+		final SuggestLocationsResult result = provider.suggestLocations("Aéroport");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java
index b3de6699..e1fd5f6e 100644
--- a/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/MetProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,11 +70,11 @@ public class MetProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java
index 1349dd54..60ee4e9a 100644
--- a/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/MvgProviderLiveTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -36,6 +35,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -72,39 +72,39 @@ public class MvgProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Schützenhalle");
+		final SuggestLocationsResult result = provider.suggestLocations("Schützenhalle");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteCoverage() throws Exception
+	public void suggestLocationsCoverage() throws Exception
 	{
-		final List<Location> luedenscheidAutocompletes = provider.autocompleteStations("Lüdenscheid Freibad");
-		print(luedenscheidAutocompletes);
-		assertThat(luedenscheidAutocompletes, hasItem(new Location(LocationType.STATION, "24200153")));
+		final SuggestLocationsResult luedenscheidResult = provider.suggestLocations("Lüdenscheid Freibad");
+		print(luedenscheidResult);
+		assertThat(luedenscheidResult.locations, hasItem(new Location(LocationType.STATION, "24200153")));
 
-		final List<Location> iserlohnAutocompletes = provider.autocompleteStations("Iserlohn Rathaus");
-		print(iserlohnAutocompletes);
-		assertThat(iserlohnAutocompletes, hasItem(new Location(LocationType.STATION, "24200764")));
+		final SuggestLocationsResult iserlohnResult = provider.suggestLocations("Iserlohn Rathaus");
+		print(iserlohnResult);
+		assertThat(iserlohnResult.locations, hasItem(new Location(LocationType.STATION, "24200764")));
 
-		final List<Location> plettenbergAutocompletes = provider.autocompleteStations("Plettenberg Friedhof");
-		print(plettenbergAutocompletes);
-		assertThat(plettenbergAutocompletes, hasItem(new Location(LocationType.STATION, "24202864")));
+		final SuggestLocationsResult plettenbergResult = provider.suggestLocations("Plettenberg Friedhof");
+		print(plettenbergResult);
+		assertThat(plettenbergResult.locations, hasItem(new Location(LocationType.STATION, "24202864")));
 
-		final List<Location> mendenAutocompletes = provider.autocompleteStations("Menden Am Gillfeld");
-		print(mendenAutocompletes);
-		assertThat(mendenAutocompletes, hasItem(new Location(LocationType.STATION, "24202193")));
+		final SuggestLocationsResult mendenResult = provider.suggestLocations("Menden Am Gillfeld");
+		print(mendenResult);
+		assertThat(mendenResult.locations, hasItem(new Location(LocationType.STATION, "24202193")));
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java
index 0515e902..f34d6fb6 100644
--- a/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/MvvProviderLiveTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -35,6 +34,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -80,35 +80,35 @@ public class MvvProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Marien");
+		final SuggestLocationsResult result = provider.suggestLocations("Marien");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteLocal() throws Exception
+	public void suggestLocationsLocal() throws Exception
 	{
-		final List<Location> autocompletesFraunhoferStr = provider.autocompleteStations("fraunhofer");
-		assertThat(autocompletesFraunhoferStr, hasItem(new Location(LocationType.STATION, "1000150")));
+		final SuggestLocationsResult fraunhoferStrResult = provider.suggestLocations("fraunhofer");
+		assertThat(fraunhoferStrResult.locations, hasItem(new Location(LocationType.STATION, "1000150")));
 
-		final List<Location> autocompletesHirschgarten = provider.autocompleteStations("Hirschgarten");
-		assertEquals("München", autocompletesHirschgarten.get(0).place);
+		final SuggestLocationsResult hirschgartenResult = provider.suggestLocations("Hirschgarten");
+		assertEquals("München", hirschgartenResult.locations.get(0).place);
 
-		final List<Location> autocompletesOstbahnhof = provider.autocompleteStations("Ostbahnhof");
-		assertEquals("München", autocompletesOstbahnhof.get(0).place);
+		final SuggestLocationsResult ostbahnhofResult = provider.suggestLocations("Ostbahnhof");
+		assertEquals("München", ostbahnhofResult.locations.get(0).place);
 
-		final List<Location> autocompletesMarienplatz = provider.autocompleteStations("Marienplatz");
-		assertEquals("München", autocompletesMarienplatz.get(0).place);
+		final SuggestLocationsResult marienplatzResult = provider.suggestLocations("Marienplatz");
+		assertEquals("München", marienplatzResult.locations.get(0).place);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java
index e40b1dcb..daf541a2 100644
--- a/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NaldoProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,19 +70,19 @@ public class NaldoProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kurf");
+		final SuggestLocationsResult result = provider.suggestLocations("Kurf");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grünwink");
+		final SuggestLocationsResult result = provider.suggestLocations("grünwink");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java
index 821d9b6a..f33aade4 100644
--- a/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NasaProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -80,19 +80,19 @@ public class NasaProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Flughafen");
+		final SuggestLocationsResult result = provider.suggestLocations("Flughafen");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Höhle");
+		final SuggestLocationsResult result = provider.suggestLocations("Höhle");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java
index 22341524..dbbddfda 100644
--- a/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NriProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -77,19 +77,19 @@ public class NriProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Oslo");
+		final SuggestLocationsResult result = provider.suggestLocations("Oslo");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Skøyen");
+		final SuggestLocationsResult result = provider.suggestLocations("Skøyen");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java
index 1ae5a518..409b310d 100644
--- a/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NsProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -32,6 +31,7 @@ import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -76,19 +76,19 @@ public class NsProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Brussel S");
+		final SuggestLocationsResult result = provider.suggestLocations("Brussel S");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Brüssel");
+		final SuggestLocationsResult result = provider.suggestLocations("Brüssel");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java
index 9f30525b..c0d8d69d 100644
--- a/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NvbwProviderLiveTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -36,6 +35,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -72,35 +72,35 @@ public class NvbwProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteCoverage() throws Exception
+	public void suggestLocationsCoverage() throws Exception
 	{
-		final List<Location> freiburgAutocompletes = provider.autocompleteStations("Freiburg Hauptbahnhof");
-		print(freiburgAutocompletes);
-		assertThat(freiburgAutocompletes, hasItem(new Location(LocationType.STATION, "6906508")));
+		final SuggestLocationsResult freiburgResult = provider.suggestLocations("Freiburg Hauptbahnhof");
+		print(freiburgResult);
+		assertThat(freiburgResult.locations, hasItem(new Location(LocationType.STATION, "6906508")));
 
-		final List<Location> baselAutocompletes = provider.autocompleteStations("Basel");
-		print(baselAutocompletes);
-		assertThat(baselAutocompletes, hasItem(new Location(LocationType.STATION, "51000007")));
+		final SuggestLocationsResult baselResult = provider.suggestLocations("Basel");
+		print(baselResult);
+		assertThat(baselResult.locations, hasItem(new Location(LocationType.STATION, "51000007")));
 
-		final List<Location> constanceAutocompletes = provider.autocompleteStations("Konstanz");
-		print(constanceAutocompletes);
-		assertThat(constanceAutocompletes, hasItem(new Location(LocationType.STATION, "8706554")));
+		final SuggestLocationsResult constanceResult = provider.suggestLocations("Konstanz");
+		print(constanceResult);
+		assertThat(constanceResult.locations, hasItem(new Location(LocationType.STATION, "8706554")));
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java
index ba2ff3c6..9671e1c5 100644
--- a/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/NvvProviderLiveTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -35,6 +34,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -95,27 +95,27 @@ public class NvvProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Flughafen");
+		final SuggestLocationsResult result = provider.suggestLocations("Flughafen");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteIdentified() throws Exception
+	public void suggestLocationsIdentified() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kassel Wilhelmshöhe");
+		final SuggestLocationsResult result = provider.suggestLocations("Kassel Wilhelmshöhe");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("könig");
+		final SuggestLocationsResult result = provider.suggestLocations("könig");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java
index bd2cf88f..06e308f0 100644
--- a/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/OebbProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -82,20 +82,20 @@ public class OebbProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Wien");
+		final SuggestLocationsResult result = provider.suggestLocations("Wien");
 
-		print(autocompletes);
-		assertTrue(autocompletes.size() > 0);
+		print(result);
+		assertTrue(result.locations.size() > 0);
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Obirhöhle");
+		final SuggestLocationsResult result = provider.suggestLocations("Obirhöhle");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/PacaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/PacaProviderLiveTest.java
index 7061e7be..66d60841 100644
--- a/enabler/test/de/schildbach/pte/live/PacaProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/PacaProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -32,6 +31,7 @@ import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Kjell Braden <afflux@pentabarf.de>
@@ -44,27 +44,27 @@ public class PacaProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("aeroport");
+		final SuggestLocationsResult result = provider.suggestLocations("aeroport");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteIdentified() throws Exception
+	public void suggestLocationsIdentified() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("EGANAUDE, Biot");
+		final SuggestLocationsResult result = provider.suggestLocations("EGANAUDE, Biot");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Aéroport");
+		final SuggestLocationsResult result = provider.suggestLocations("Aéroport");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java
index 1ab74839..449d765e 100644
--- a/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -77,19 +77,19 @@ public class PlProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Warszawa");
+		final SuggestLocationsResult result = provider.suggestLocations("Warszawa");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Służewiec");
+		final SuggestLocationsResult result = provider.suggestLocations("Służewiec");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java
index eaabad14..fb435644 100644
--- a/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/RtProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -77,27 +77,27 @@ public class RtProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("haupt");
+		final SuggestLocationsResult result = provider.suggestLocations("haupt");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteAddress() throws Exception
+	public void suggestLocationsAddress() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Dorfstrasse 10, Dällikon, Schweiz");
+		final SuggestLocationsResult result = provider.suggestLocations("Dorfstrasse 10, Dällikon, Schweiz");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteEncoding() throws Exception
+	public void suggestLocationsEncoding() throws Exception
 	{
-		List<Location> autocompletes = provider.autocompleteStations("Dorfstrasse 1, Schäftland");
-		assertEquals("Schöftland, Dorfstrasse", autocompletes.get(0).name);
-		print(autocompletes);
+		final SuggestLocationsResult result = provider.suggestLocations("Dorfstrasse 1, Schäftland");
+		assertEquals("Schöftland, Dorfstrasse", result.locations.get(0).name);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java
index 579720a5..58853f44 100644
--- a/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SbbProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -77,27 +77,27 @@ public class SbbProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("haupt");
+		final SuggestLocationsResult result = provider.suggestLocations("haupt");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Höhle");
+		final SuggestLocationsResult result = provider.suggestLocations("Höhle");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteAddress() throws Exception
+	public void suggestLocationsAddress() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Dorfstrasse 10, Dällikon, Schweiz");
+		final SuggestLocationsResult result = provider.suggestLocations("Dorfstrasse 10, Dällikon, Schweiz");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java
index 44712ea5..8a1486bf 100644
--- a/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -77,19 +77,19 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Airport");
+		final SuggestLocationsResult result = provider.suggestLocations("Airport");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Luleå");
+		final SuggestLocationsResult result = provider.suggestLocations("Luleå");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java
index 8a82df38..e035c54c 100644
--- a/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SeptaProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -77,11 +77,11 @@ public class SeptaProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Airport");
+		final SuggestLocationsResult result = provider.suggestLocations("Airport");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java
index fdada473..28f8c0a0 100644
--- a/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SfProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,11 +70,11 @@ public class SfProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java
index e8b72e0f..4d16dec3 100644
--- a/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/ShProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -77,27 +77,27 @@ public class ShProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Lübeck");
+		final SuggestLocationsResult result = provider.suggestLocations("Lübeck");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Achterüm");
+		final SuggestLocationsResult result = provider.suggestLocations("Achterüm");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithoutCoordinatesInResult() throws Exception
+	public void suggestLocationsWithoutCoordinatesInResult() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("aachen");
+		final SuggestLocationsResult result = provider.suggestLocations("aachen");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java
index 606e99e7..647066c6 100644
--- a/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SncbProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -77,27 +77,27 @@ public class SncbProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Brussel S");
+		final SuggestLocationsResult result = provider.suggestLocations("Brussel S");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Brüssel");
+		final SuggestLocationsResult result = provider.suggestLocations("Brüssel");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteAddress() throws Exception
+	public void suggestLocationsAddress() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Rue Paul Janson 9, 1030 Bruxelles");
+		final SuggestLocationsResult result = provider.suggestLocations("Rue Paul Janson 9, 1030 Bruxelles");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java
index 8ebaf314..6660e54e 100644
--- a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -77,19 +77,19 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Luleå Airport");
+		final SuggestLocationsResult result = provider.suggestLocations("Luleå Airport");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("östra");
+		final SuggestLocationsResult result = provider.suggestLocations("östra");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java
index 1b1f4093..307bc735 100644
--- a/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/StvProviderLiveTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -36,6 +35,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -72,43 +72,43 @@ public class StvProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteCoverage() throws Exception
+	public void suggestLocationsCoverage() throws Exception
 	{
-		final List<Location> grazAutocompletes = provider.autocompleteStations("Graz Brauhaus");
-		print(grazAutocompletes);
-		assertThat(grazAutocompletes, hasItem(new Location(LocationType.STATION, "63203044")));
+		final SuggestLocationsResult grazResult = provider.suggestLocations("Graz Brauhaus");
+		print(grazResult);
+		assertThat(grazResult.locations, hasItem(new Location(LocationType.STATION, "63203044")));
 
-		final List<Location> leobenAutocompletes = provider.autocompleteStations("Leoben Blockhäuser");
-		print(leobenAutocompletes);
-		assertThat(leobenAutocompletes, hasItem(new Location(LocationType.STATION, "63206224")));
+		final SuggestLocationsResult leobenResult = provider.suggestLocations("Leoben Blockhäuser");
+		print(leobenResult);
+		assertThat(leobenResult.locations, hasItem(new Location(LocationType.STATION, "63206224")));
 
-		final List<Location> bruckAutocompletes = provider.autocompleteStations("Bruck Hauptplatz");
-		print(bruckAutocompletes);
-		assertThat(bruckAutocompletes, hasItem(new Location(LocationType.STATION, "63202063")));
+		final SuggestLocationsResult bruckResult = provider.suggestLocations("Bruck Hauptplatz");
+		print(bruckResult);
+		assertThat(bruckResult.locations, hasItem(new Location(LocationType.STATION, "63202063")));
 
-		final List<Location> kindbergAutocompletes = provider.autocompleteStations("Kindberg Friedhof");
-		print(kindbergAutocompletes);
-		assertThat(kindbergAutocompletes, hasItem(new Location(LocationType.STATION, "63208877")));
+		final SuggestLocationsResult kindbergResult = provider.suggestLocations("Kindberg Friedhof");
+		print(kindbergResult);
+		assertThat(kindbergResult.locations, hasItem(new Location(LocationType.STATION, "63208877")));
 
-		final List<Location> mariborAutocompletes = provider.autocompleteStations("Maribor Dravograjska Sokolska");
-		print(mariborAutocompletes);
-		assertThat(mariborAutocompletes, hasItem(new Location(LocationType.STATION, "63300136")));
+		final SuggestLocationsResult mariborResult = provider.suggestLocations("Maribor Dravograjska Sokolska");
+		print(mariborResult);
+		assertThat(mariborResult.locations, hasItem(new Location(LocationType.STATION, "63300136")));
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java
index b9811a84..568a94f9 100644
--- a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -36,6 +35,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -72,31 +72,31 @@ public class SvvProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteCoverage() throws Exception
+	public void suggestLocationsCoverage() throws Exception
 	{
-		final List<Location> salzburgAutocompletes = provider.autocompleteStations("Salzburg Süd");
-		print(salzburgAutocompletes);
-		assertThat(salzburgAutocompletes, hasItem(new Location(LocationType.STATION, "60650458")));
+		final SuggestLocationsResult salzburgResult = provider.suggestLocations("Salzburg Süd");
+		print(salzburgResult);
+		assertThat(salzburgResult.locations, hasItem(new Location(LocationType.STATION, "60650458")));
 
-		final List<Location> strasswalchenAutocompletes = provider.autocompleteStations("Straßwalchen West");
-		print(strasswalchenAutocompletes);
-		assertThat(strasswalchenAutocompletes, hasItem(new Location(LocationType.STATION, "60656483")));
+		final SuggestLocationsResult strasswalchenResult = provider.suggestLocations("Straßwalchen West");
+		print(strasswalchenResult);
+		assertThat(strasswalchenResult.locations, hasItem(new Location(LocationType.STATION, "60656483")));
 
-		final List<Location> schwarzachAutocompletes = provider.autocompleteStations("Schwarzach Abtsdorf");
-		print(schwarzachAutocompletes);
-		assertThat(schwarzachAutocompletes, hasItem(new Location(LocationType.STATION, "60656614")));
+		final SuggestLocationsResult schwarzachResult = provider.suggestLocations("Schwarzach Abtsdorf");
+		print(schwarzachResult);
+		assertThat(schwarzachResult.locations, hasItem(new Location(LocationType.STATION, "60656614")));
 
-		final List<Location> trimmelkamAutocompletes = provider.autocompleteStations("Trimmelkam");
-		print(trimmelkamAutocompletes);
-		assertThat(trimmelkamAutocompletes, hasItem(new Location(LocationType.STATION, "60640776")));
+		final SuggestLocationsResult trimmelkamResult = provider.suggestLocations("Trimmelkam");
+		print(trimmelkamResult);
+		assertThat(trimmelkamResult.locations, hasItem(new Location(LocationType.STATION, "60640776")));
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java
index 6a68cf5f..3a0c6ae1 100644
--- a/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/SydneyProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,19 +70,19 @@ public class SydneyProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Town Hall Station");
+		final SuggestLocationsResult result = provider.suggestLocations("Town Hall Station");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java
index 04e29025..6b363c4c 100644
--- a/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/TfiProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,11 +70,11 @@ public class TfiProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Lower O'Connell Street");
+		final SuggestLocationsResult result = provider.suggestLocations("Lower O'Connell Street");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java
index f66a1aea..1a87b51c 100644
--- a/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/TflProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,11 +70,11 @@ public class TflProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java
index e5b7c909..b8b12f8c 100644
--- a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,11 +70,11 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java
index 6404c3ec..64fcbb46 100644
--- a/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/TlswProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,11 +70,11 @@ public class TlswProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java
index 148fc5c1..15e5a8e7 100644
--- a/enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,11 +70,11 @@ public class TlwmProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Birming");
+		final SuggestLocationsResult result = provider.suggestLocations("Birming");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java
index 7236a5e2..6db7fc2b 100644
--- a/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VagfrProviderLiveTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -36,6 +35,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -72,19 +72,19 @@ public class VagfrProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kurf");
+		final SuggestLocationsResult result = provider.suggestLocations("Kurf");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteCoverage() throws Exception
+	public void suggestLocationsCoverage() throws Exception
 	{
-		final List<Location> freiburgAutocompletes = provider.autocompleteStations("Betzenhauser Torplatz");
-		print(freiburgAutocompletes);
-		assertThat(freiburgAutocompletes, hasItem(new Location(LocationType.STATION, "6930503")));
+		final SuggestLocationsResult freiburgResult = provider.suggestLocations("Betzenhauser Torplatz");
+		print(freiburgResult);
+		assertThat(freiburgResult.locations, hasItem(new Location(LocationType.STATION, "6930503")));
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java
index f58a990d..a41a01bf 100644
--- a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -87,31 +87,31 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Güntzelstr.");
+		final SuggestLocationsResult result = provider.suggestLocations("Güntzelstr.");
 
-		print(autocompletes);
+		print(result);
 
-		Assert.assertEquals("Güntzelstr. (U)", autocompletes.get(0).name);
+		Assert.assertEquals("Güntzelstr. (U)", result.locations.get(0).name);
 	}
 
 	@Test
-	public void autocompleteAddress() throws Exception
+	public void suggestLocationsAddress() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Sophienstr. 24");
+		final SuggestLocationsResult result = provider.suggestLocations("Sophienstr. 24");
 
-		print(autocompletes);
+		print(result);
 
-		Assert.assertEquals("Sophienstr. 24", autocompletes.get(0).name);
+		Assert.assertEquals("Sophienstr. 24", result.locations.get(0).name);
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("nol");
+		final SuggestLocationsResult result = provider.suggestLocations("nol");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java
index 3a8ede48..f1fec8e5 100644
--- a/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VblProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,19 +70,19 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java
index 27fff519..764c5004 100644
--- a/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VbnProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -77,21 +77,21 @@ public class VbnProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Coppengrave");
+		final SuggestLocationsResult result = provider.suggestLocations("Coppengrave");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteUmlaut() throws Exception
+	public void suggestLocationsUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Göttingen Hauptbahnhof");
+		final SuggestLocationsResult result = provider.suggestLocations("Göttingen Hauptbahnhof");
 
-		print(autocompletes);
+		print(result);
 
-		assertEquals("Göttingen", autocompletes.get(0).place);
+		assertEquals("Göttingen", result.locations.get(0).place);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java
index 1f2ffd89..a864226e 100644
--- a/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VgnProviderLiveTest.java
@@ -18,7 +18,6 @@
 package de.schildbach.pte.live;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -31,6 +30,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -67,19 +67,19 @@ public class VgnProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java
index 2e4cd5c9..4cbde50c 100644
--- a/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -61,11 +61,11 @@ public class VgsProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Flughafen");
+		final SuggestLocationsResult result = provider.suggestLocations("Flughafen");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java
index 86090193..ac5b8e47 100644
--- a/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VmobilProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,19 +70,19 @@ public class VmobilProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java
index a286a3d7..b48819aa 100644
--- a/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VmsProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,11 +70,11 @@ public class VmsProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java
index f55d3bf2..cbe84201 100644
--- a/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VmvProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,11 +70,11 @@ public class VmvProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java
index 1d301a54..2161974a 100644
--- a/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VorProviderLiveTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -36,6 +35,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -72,31 +72,31 @@ public class VorProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteCoverage() throws Exception
+	public void suggestLocationsCoverage() throws Exception
 	{
-		final List<Location> huetteldorfAutocompletes = provider.autocompleteStations("Hütteldorf");
-		print(huetteldorfAutocompletes);
-		assertThat(huetteldorfAutocompletes, hasItem(new Location(LocationType.STATION, "60200560")));
+		final SuggestLocationsResult huetteldorfResult = provider.suggestLocations("Hütteldorf");
+		print(huetteldorfResult);
+		assertThat(huetteldorfResult.locations, hasItem(new Location(LocationType.STATION, "60200560")));
 
-		final List<Location> wienerNeustadtAutocompletes = provider.autocompleteStations("Wiener Neustadt Nord");
-		print(wienerNeustadtAutocompletes);
-		assertThat(wienerNeustadtAutocompletes, hasItem(new Location(LocationType.STATION, "60205223")));
+		final SuggestLocationsResult wienerNeustadtResult = provider.suggestLocations("Wiener Neustadt Nord");
+		print(wienerNeustadtResult);
+		assertThat(wienerNeustadtResult.locations, hasItem(new Location(LocationType.STATION, "60205223")));
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java
index 59fb4e39..44fedaf4 100644
--- a/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VrnProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,43 +70,43 @@ public class VrnProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteIdentified() throws Exception
+	public void suggestLocationsIdentified() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Bremen, KUR");
+		final SuggestLocationsResult result = provider.suggestLocations("Bremen, KUR");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteLocality() throws Exception
+	public void suggestLocationsLocality() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Bremen");
+		final SuggestLocationsResult result = provider.suggestLocations("Bremen");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteCity() throws Exception
+	public void suggestLocationsCity() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Mannheim");
+		final SuggestLocationsResult result = provider.suggestLocations("Mannheim");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java
index fcb813fa..a6125fed 100644
--- a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -36,6 +35,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -84,63 +84,63 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 
-		final List<Location> autocompletes2 = provider.autocompleteStations("Paderborn Hbf");
+		final SuggestLocationsResult paderbornResult = provider.suggestLocations("Paderborn Hbf");
 
-		print(autocompletes2);
+		print(paderbornResult);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteIdentified() throws Exception
+	public void suggestLocationsIdentified() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Düsseldorf, Am Frohnhof");
+		final SuggestLocationsResult result = provider.suggestLocations("Düsseldorf, Am Frohnhof");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteCoverage() throws Exception
+	public void suggestLocationsCoverage() throws Exception
 	{
-		final List<Location> cologneAutocompletes = provider.autocompleteStations("Köln Ebertplatz");
-		print(cologneAutocompletes);
-		assertThat(cologneAutocompletes, hasItem(new Location(LocationType.STATION, "22000035")));
+		final SuggestLocationsResult cologneResult = provider.suggestLocations("Köln Ebertplatz");
+		print(cologneResult);
+		assertThat(cologneResult.locations, hasItem(new Location(LocationType.STATION, "22000035")));
 
-		final List<Location> dortmundAutocompletes = provider.autocompleteStations("Dortmund Zugstraße");
-		print(dortmundAutocompletes);
-		assertThat(dortmundAutocompletes, hasItem(new Location(LocationType.STATION, "20000524")));
+		final SuggestLocationsResult dortmundResult = provider.suggestLocations("Dortmund Zugstraße");
+		print(dortmundResult);
+		assertThat(dortmundResult.locations, hasItem(new Location(LocationType.STATION, "20000524")));
 
-		final List<Location> duesseldorfAutocompletes = provider.autocompleteStations("Düsseldorf Sternstraße");
-		print(duesseldorfAutocompletes);
-		assertThat(duesseldorfAutocompletes, hasItem(new Location(LocationType.STATION, "20018017")));
+		final SuggestLocationsResult duesseldorfResult = provider.suggestLocations("Düsseldorf Sternstraße");
+		print(duesseldorfResult);
+		assertThat(duesseldorfResult.locations, hasItem(new Location(LocationType.STATION, "20018017")));
 
-		final List<Location> muensterAutocompletes = provider.autocompleteStations("Münster Vennheideweg");
-		print(muensterAutocompletes);
-		assertThat(muensterAutocompletes, hasItem(new Location(LocationType.STATION, "24047291")));
+		final SuggestLocationsResult muensterResult = provider.suggestLocations("Münster Vennheideweg");
+		print(muensterResult);
+		assertThat(muensterResult.locations, hasItem(new Location(LocationType.STATION, "24047291")));
 
-		final List<Location> aachenAutocompletes = provider.autocompleteStations("Aachen Elisenbrunnen");
-		print(aachenAutocompletes);
-		assertThat(aachenAutocompletes, hasItem(new Location(LocationType.STATION, "21001029")));
+		final SuggestLocationsResult aachenResult = provider.suggestLocations("Aachen Elisenbrunnen");
+		print(aachenResult);
+		assertThat(aachenResult.locations, hasItem(new Location(LocationType.STATION, "21001029")));
 	}
 
 	@Test
-	public void autocompleteCity() throws Exception
+	public void suggestLocationsCity() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Düsseldorf");
+		final SuggestLocationsResult result = provider.suggestLocations("Düsseldorf");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java
index 15082c00..fdba98a9 100644
--- a/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VrtProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,11 +70,11 @@ public class VrtProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java
index 470443f2..0dc24b40 100644
--- a/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VvmProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,19 +70,19 @@ public class VvmProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java
index 02826e54..2d54c6df 100644
--- a/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VvoProviderLiveTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -36,6 +35,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -72,27 +72,27 @@ public class VvoProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Hülßestraße");
+		final SuggestLocationsResult result = provider.suggestLocations("Hülßestraße");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteCoverage() throws Exception
+	public void suggestLocationsCoverage() throws Exception
 	{
-		final List<Location> dresdenAutocompletes = provider.autocompleteStations("Dresden Postplatz");
-		print(dresdenAutocompletes);
-		assertThat(dresdenAutocompletes, hasItem(new Location(LocationType.STATION, "33000037")));
+		final SuggestLocationsResult dresdenResult = provider.suggestLocations("Dresden Postplatz");
+		print(dresdenResult);
+		assertThat(dresdenResult.locations, hasItem(new Location(LocationType.STATION, "33000037")));
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java
index 6bc49983..1cbffa86 100644
--- a/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VvsProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,19 +70,19 @@ public class VvsProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java
index 25d3c7f3..23d9452a 100644
--- a/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VvtProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,19 +70,19 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java
index a9b4208e..ae68433f 100644
--- a/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VvvProviderLiveTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -34,6 +33,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -70,19 +70,19 @@ public class VvvProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kirchweidach, Kirchweidach");
+		final SuggestLocationsResult result = provider.suggestLocations("Kirchweidach, Kirchweidach");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java
index bf8823a3..8fdb74ca 100644
--- a/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/WienProviderLiveTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -36,6 +35,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -72,31 +72,31 @@ public class WienProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocompleteIncomplete() throws Exception
+	public void suggestLocationsIncomplete() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Kur");
+		final SuggestLocationsResult result = provider.suggestLocations("Kur");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteWithUmlaut() throws Exception
+	public void suggestLocationsWithUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("grün");
+		final SuggestLocationsResult result = provider.suggestLocations("grün");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
-	public void autocompleteCoverage() throws Exception
+	public void suggestLocationsCoverage() throws Exception
 	{
-		final List<Location> huetteldorfAutocompletes = provider.autocompleteStations("Wien Hütteldorf");
-		print(huetteldorfAutocompletes);
-		assertThat(huetteldorfAutocompletes, hasItem(new Location(LocationType.STATION, "60200560")));
+		final SuggestLocationsResult huetteldorfResult = provider.suggestLocations("Wien Hütteldorf");
+		print(huetteldorfResult);
+		assertThat(huetteldorfResult.locations, hasItem(new Location(LocationType.STATION, "60200560")));
 
-		final List<Location> wienerNeustadtAutocompletes = provider.autocompleteStations("Wiener Neustadt Nord");
-		print(wienerNeustadtAutocompletes);
-		assertThat(wienerNeustadtAutocompletes, hasItem(new Location(LocationType.STATION, "60205223")));
+		final SuggestLocationsResult wienerNeustadtResult = provider.suggestLocations("Wiener Neustadt Nord");
+		print(wienerNeustadtResult);
+		assertThat(wienerNeustadtResult.locations, hasItem(new Location(LocationType.STATION, "60205223")));
 	}
 
 	@Test
diff --git a/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java
index 8891e260..3e153534 100644
--- a/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/ZvvProviderLiveTest.java
@@ -20,7 +20,6 @@ package de.schildbach.pte.live;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Test;
 
@@ -33,6 +32,7 @@ import de.schildbach.pte.dto.NearbyStationsResult;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -77,11 +77,11 @@ public class ZvvProviderLiveTest extends AbstractProviderLiveTest
 	}
 
 	@Test
-	public void autocomplete() throws Exception
+	public void suggestLocations() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Flughafen");
+		final SuggestLocationsResult result = provider.suggestLocations("Flughafen");
 
-		print(autocompletes);
+		print(result);
 	}
 
 	@Test
diff --git a/service/src/main/java/de/schildbach/pte/service/LocationController.java b/service/src/main/java/de/schildbach/pte/service/LocationController.java
index b5f90f35..16d2f755 100644
--- a/service/src/main/java/de/schildbach/pte/service/LocationController.java
+++ b/service/src/main/java/de/schildbach/pte/service/LocationController.java
@@ -18,7 +18,6 @@
 package de.schildbach.pte.service;
 
 import java.io.IOException;
-import java.util.List;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,6 +29,7 @@ import de.schildbach.pte.RtProvider;
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
 import de.schildbach.pte.dto.NearbyStationsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
 
 /**
  * @author Andreas Schildbach
@@ -41,9 +41,9 @@ public class LocationController
 
 	@RequestMapping(value = "/location/suggest", method = RequestMethod.GET)
 	@ResponseBody
-	public List<Location> autocomplete(@RequestParam("q") final String query) throws IOException
+	public SuggestLocationsResult suggest(@RequestParam("q") final String query) throws IOException
 	{
-		return provider.autocompleteStations(query);
+		return provider.suggestLocations(query);
 	}
 
 	@RequestMapping(value = "/location/nearby", method = RequestMethod.GET)