diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java
index f0065f26..a9d28f38 100644
--- a/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -159,7 +159,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 				String type = stop.getString("type");
 				if ("any".equals(type))
 					type = stop.getString("anyType");
-				final String name = stop.getString("object");
+				final String name = normalizeLocationName(stop.getString("object"));
 				final JSONObject ref = stop.getJSONObject("ref");
 				String place = ref.getString("place");
 				if (place != null && place.length() == 0)
@@ -183,8 +183,10 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 					results.add(new Location(LocationType.STATION, stop.getInt("stateless"), lat, lon, place, name));
 				else if ("poi".equals(type))
 					results.add(new Location(LocationType.POI, 0, lat, lon, place, name));
+				else if ("crossing".equals(type))
+					results.add(new Location(LocationType.ADDRESS, 0, lat, lon, place, name));
 				else if ("street".equals(type) || "address".equals(type) || "singlehouse".equals(type))
-					results.add(new Location(LocationType.ADDRESS, 0, lat, lon, place, stop.getString("name")));
+					results.add(new Location(LocationType.ADDRESS, 0, lat, lon, place, normalizeLocationName(stop.getString("name"))));
 				else
 					throw new IllegalArgumentException("unknown type: " + type + " on " + uri);
 			}
diff --git a/src/de/schildbach/pte/SfProvider.java b/src/de/schildbach/pte/SfProvider.java
index 9f029a6f..20830ece 100644
--- a/src/de/schildbach/pte/SfProvider.java
+++ b/src/de/schildbach/pte/SfProvider.java
@@ -73,7 +73,7 @@ public class SfProvider extends AbstractEfaProvider
 	@Override
 	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
 	{
-		return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString()));
+		return jsonStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString()));
 	}
 
 	@Override