--- android/TrainInfo/src/dk/thoerup/traininfo/provider/OfflineStationProvider.java	2012/04/11 16:47:27	1794
+++ android/TrainInfo/src/dk/thoerup/traininfo/provider/OfflineStationProvider.java	2012/04/11 17:45:34	1795
@@ -189,20 +189,22 @@
 		name = name.toLowerCase();
 		StationBean tmpStations = new StationBean();
 		for (StationEntry entry : stations.entries) {
-			if (entry.nameLower.startsWith(name) || entry.nameInternational.startsWith(name) ) {
+			if (entry.nameLower.startsWith(name) || entry.nameInternational.startsWith(name) || aliasNameMatch(name,entry) ) {
 				tmpStations.entries.add(entry);
-			} else {				
-				for(String alias : entry.getAliases()) {
-					if (alias.startsWith(name)) {
-						tmpStations.entries.add(entry);
-						break; 
-					}
-				}				
-			}
+			} 
 		}
 		logElapsedTime(start, "name");				
 		return tmpStations;
 	}
+	
+	private boolean aliasNameMatch(String name, StationEntry station) {
+		for(String alias : station.getAliases()) {
+			if (alias.startsWith(name)) {
+				return true;
+			}
+		}
+		return false;
+	}
 
 	@Override
 	public StationBean lookupStationsByIds(String ids) {