diff --git a/src/MapAct.scala b/src/MapAct.scala
index 432181d..d9a147d 100644
--- a/src/MapAct.scala
+++ b/src/MapAct.scala
@@ -1,6 +1,7 @@
 package org.aprsdroid.app
 
 import _root_.android.content.{BroadcastReceiver, Context, Intent, IntentFilter}
+import _root_.android.database.Cursor
 import _root_.android.graphics.drawable.{Drawable, BitmapDrawable}
 import _root_.android.graphics.{Canvas, Paint, Path, Point, Rect, Typeface}
 import _root_.android.os.{Bundle, Handler}
@@ -249,32 +250,44 @@ class StationOverlay(icons : Drawable, context : MapAct, db : StorageDatabase) e
 		true
 	}
 
+	def fetchStaPositions(call : String, c : Cursor) : ArrayBuffer[GeoPoint] = {
+		import StorageDatabase.Position._
+		val m = new ArrayBuffer[GeoPoint]()
+		// skip forward to the right callsign
+		while (!c.isAfterLast() && c.getString(COLUMN_CALL) < call)
+			c.moveToNext()
+		// add every matching entry to arraybuffer
+		while (!c.isAfterLast() && c.getString(COLUMN_CALL) == call) {
+			val lat = c.getInt(COLUMN_LAT)
+			val lon = c.getInt(COLUMN_LON)
+			m.add(new GeoPoint(lat, lon))
+			c.moveToNext()
+		}
+		m
+	}
+
 	def load_stations(i : Intent) : ArrayList[Station] = {
+		import StorageDatabase.Station._
+
 		val s = new ArrayList[Station]()
 		val age_ts = (System.currentTimeMillis - context.prefs.getShowAge()).toString
 		val filter = if (context.showObjects) "TS > ? OR CALL=?" else "(ORIGIN IS NULL AND TS > ?) OR CALL=?"
 		val c = db.getStations(filter, Array(age_ts, context.targetcall), null)
 		c.moveToFirst()
-		var m = new ArrayBuffer[GeoPoint]()
+		val pos_c = db.getAllStaPositions(age_ts)
+		pos_c.moveToFirst()
 		while (!c.isAfterLast()) {
-			val call = c.getString(StorageDatabase.Station.COLUMN_MAP_CALL)
-			val lat = c.getInt(StorageDatabase.Station.COLUMN_MAP_LAT)
-			val lon = c.getInt(StorageDatabase.Station.COLUMN_MAP_LON)
-			val symbol = c.getString(StorageDatabase.Station.COLUMN_MAP_SYMBOL)
+			val call = c.getString(COLUMN_MAP_CALL)
+			val lat = c.getInt(COLUMN_MAP_LAT)
+			val lon = c.getInt(COLUMN_MAP_LON)
+			val symbol = c.getString(COLUMN_MAP_SYMBOL)
 			val p = new GeoPoint(lat, lon)
-			m.add(p)
-			// peek at the next row
-			c.moveToNext()
-			val next_call = if (!c.isAfterLast()) c.getString(StorageDatabase.Station.COLUMN_MAP_CALL) else null
-			c.moveToPrevious()
-			if (next_call != call) {
-				//Log.d(TAG, "end of call: " + call + " " + next_call + " " + m.size())
-				s.add(new Station(m, p, call, null, symbol))
-				m = new ArrayBuffer[GeoPoint]()
-			}
+			val m = fetchStaPositions(call, pos_c)
+			s.add(new Station(m, p, call, null, symbol))
 			c.moveToNext()
 		}
 		c.close()
+		pos_c.close()
 		Log.d(TAG, "total %d items".format(s.size()))
 		s
 	}
diff --git a/src/StorageDatabase.scala b/src/StorageDatabase.scala
index d42f7d6..173d1a1 100644
--- a/src/StorageDatabase.scala
+++ b/src/StorageDatabase.scala
@@ -105,6 +105,11 @@ object StorageDatabase {
 			%s TEXT, %s INTEGER, %s INTEGER)"""
 			.format(TABLE, _ID, TS,
 				CALL, LAT, LON)
+		lazy val COLUMNS = Array(_ID, TS, CALL, LAT, LON)
+		val COLUMN_TS		= 1
+		val COLUMN_CALL		= 2
+		val COLUMN_LAT		= 3
+		val COLUMN_LON		= 4
 	}
 
 	object Message {
@@ -271,16 +276,16 @@ class StorageDatabase(context : Context) extends
 			"call LIKE ?", Array(call),
 			null, null, "_ID DESC", "1")
 	}
-	def getStaPositions(call : String, limit : String) : Cursor = {
-		getReadableDatabase().query(Station.TABLE, Station.COLUMNS,
-			"call LIKE ? AND TS > ?", Array(call, limit),
-			null, null, "_ID DESC", null)
+	def getAllStaPositions(limit : String) : Cursor = {
+		getReadableDatabase().query(Position.TABLE, Position.COLUMNS,
+			"TS > ?", Array(limit),
+			null, null, "CALL, _ID", null)
 	}
 	def getAllSsids(call : String) : Cursor = {
 		val querycall = call.split("[- _]+")(0) + "%"
 		getReadableDatabase().query(Station.TABLE, Station.COLUMNS,
 			"call LIKE ? or origin LIKE ?", Array(querycall, querycall),
-			"call", null, null, null)
+			null, null, null, null)
 	}
 	def getNeighbors(mycall : String, lat : Int, lon : Int, ts : Long, limit : String) : Cursor = {
 		// calculate latitude correction